From f03f1349b118ea72fa2c503d3a457cb8d2e21aca Mon Sep 17 00:00:00 2001 From: MohammedAbdi Date: Thu, 18 Apr 2024 12:40:37 -0400 Subject: [PATCH 1/2] update operator description and specify version Signed-off-by: MohammedAbdi --- Makefile | 2 +- VERSION | 2 +- .../susql-operator.clusterserviceversion.yaml | 19 +++++++------------ config/manager/kustomization.yaml | 2 +- .../susql-operator.clusterserviceversion.yaml | 1 + 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index b2f12a0..988553e 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-susql-operator-bundle:v$(VERSION) # OPERATOR_IMG define the image:tag used for the operator # You can use it as an arg. (E.g make operator-build OPERATOR_IMG=:) -OPERATOR_IMG ?= $(IMAGE_TAG_BASE):latest +OPERATOR_IMG ?= $(IMAGE_TAG_BASE):$(VERSION) # ADDITIONAL_TAGS ?= # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command diff --git a/VERSION b/VERSION index 81340c7..bbdeab6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.4 +0.0.5 diff --git a/bundle/manifests/susql-operator.clusterserviceversion.yaml b/bundle/manifests/susql-operator.clusterserviceversion.yaml index 58eb38e..bd40d0e 100644 --- a/bundle/manifests/susql-operator.clusterserviceversion.yaml +++ b/bundle/manifests/susql-operator.clusterserviceversion.yaml @@ -22,13 +22,14 @@ metadata: ] capabilities: Basic Install categories: Monitoring - containerImage: quay.io/sustainable_computing_io/susql_operator:latest - createdAt: "2024-04-05T17:50:51Z" + containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.5 + createdAt: "2024-04-18T16:36:33Z" + description: 'Aggregates energy data from pods tagged with SusQL labels ' operators.operatorframework.io/builder: operator-sdk-v1.34.1 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/sustainable-computing-io/susql-operator support: https://github.com/sustainable-computing-io/susql-operator/issues - name: susql-operator.v0.0.4 + name: susql-operator.v0.0.5 namespace: placeholder spec: apiservicedefinitions: {} @@ -186,11 +187,6 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 - --leader-elect - - --kepler-prometheus-url=$(KEPLER-PROMETHEUS-URL) - - --kepler-metric-name=$(KEPLER-METRIC-NAME) - - --susql-prometheus-database-url=$(SUSQL-PROMETHEUS-DATABASE-URL) - - --susql-prometheus-metrics-url=$(SUSQL-PROMETHEUS-METRICS-URL) - - --sampling-rate=$(SAMPLING-RATE) command: - /manager env: @@ -199,13 +195,12 @@ spec: - name: KEPLER-METRIC-NAME value: kepler_container_joules_total - name: SUSQL-PROMETHEUS-DATABASE-URL -# value: http://prometheus-susql.default.svc.cluster.local:9090 - value: https://thanos-querier.openshift-monitoring.svc.cluster.local:9091 + value: http://prometheus-susql.default.svc.cluster.local:9090 - name: SUSQL-PROMETHEUS-METRICS-URL value: http://0.0.0.0:8082 - name: SAMPLING-RATE value: "2" - image: quay.io/sustainable_computing_io/susql_operator:latest + image: quay.io/sustainable_computing_io/susql_operator:0.0.5 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -301,4 +296,4 @@ spec: provider: name: SusQL Operator Contributors url: https://github.com/sustainable-computing-io/susql-operator - version: 0.0.4 + version: 0.0.5 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 4b9cd7b..4431f91 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/sustainable_computing_io/susql_operator - newTag: 0.0.4 + newTag: 0.0.5 diff --git a/config/manifests/bases/susql-operator.clusterserviceversion.yaml b/config/manifests/bases/susql-operator.clusterserviceversion.yaml index e3be765..e2597b7 100644 --- a/config/manifests/bases/susql-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/susql-operator.clusterserviceversion.yaml @@ -6,6 +6,7 @@ metadata: capabilities: Basic Install categories: Monitoring containerImage: + description: 'Aggregates energy data from pods tagged with SusQL labels ' repository: https://github.com/sustainable-computing-io/susql-operator support: https://github.com/sustainable-computing-io/susql-operator/issues name: susql-operator.v0.0.0 From 633eb05e05ebc3c60fa54aa089004737b0faff34 Mon Sep 17 00:00:00 2001 From: MohammedAbdi Date: Thu, 18 Apr 2024 12:43:29 -0400 Subject: [PATCH 2/2] add args Signed-off-by: MohammedAbdi --- .../manifests/susql-operator.clusterserviceversion.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bundle/manifests/susql-operator.clusterserviceversion.yaml b/bundle/manifests/susql-operator.clusterserviceversion.yaml index bd40d0e..7a14e06 100644 --- a/bundle/manifests/susql-operator.clusterserviceversion.yaml +++ b/bundle/manifests/susql-operator.clusterserviceversion.yaml @@ -187,6 +187,11 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 - --leader-elect + - --kepler-prometheus-url=$(KEPLER-PROMETHEUS-URL) + - --kepler-metric-name=$(KEPLER-METRIC-NAME) + - --susql-prometheus-database-url=$(SUSQL-PROMETHEUS-DATABASE-URL) + - --susql-prometheus-metrics-url=$(SUSQL-PROMETHEUS-METRICS-URL) + - --sampling-rate=$(SAMPLING-RATE) command: - /manager env: @@ -195,7 +200,8 @@ spec: - name: KEPLER-METRIC-NAME value: kepler_container_joules_total - name: SUSQL-PROMETHEUS-DATABASE-URL - value: http://prometheus-susql.default.svc.cluster.local:9090 + # value: http://prometheus-susql.default.svc.cluster.local:9090 + value: https://thanos-querier.openshift-monitoring.svc.cluster.local:9091 - name: SUSQL-PROMETHEUS-METRICS-URL value: http://0.0.0.0:8082 - name: SAMPLING-RATE