From 0c3c60125f9f11b380b69d234a272a4ea78275c7 Mon Sep 17 00:00:00 2001 From: Scott Trent Date: Tue, 30 Apr 2024 16:29:37 +0900 Subject: [PATCH] refactor config info Signed-off-by: Scott Trent --- VERSION | 2 +- .../susql-operator.clusterserviceversion.yaml | 21 ++++++++++++------- config/default/manager_auth_proxy_patch.yaml | 10 --------- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 9 ++++++++ 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/VERSION b/VERSION index 43b2961..9789c4c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.13 +0.0.14 diff --git a/bundle/manifests/susql-operator.clusterserviceversion.yaml b/bundle/manifests/susql-operator.clusterserviceversion.yaml index bfa690d..dd86636 100644 --- a/bundle/manifests/susql-operator.clusterserviceversion.yaml +++ b/bundle/manifests/susql-operator.clusterserviceversion.yaml @@ -22,14 +22,14 @@ metadata: ] capabilities: Basic Install categories: Monitoring - containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.13 - createdAt: "2024-04-30T05:50:24Z" + containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.14 + createdAt: "2024-04-30T07:27:57Z" 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.13 + name: susql-operator.v0.0.14 namespace: placeholder spec: apiservicedefinitions: {} @@ -196,14 +196,14 @@ spec: drop: - ALL - args: - - --health-probe-bind-address=:8081 - - --metrics-bind-address=127.0.0.1:9999 - --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) + - --health-probe-bind-address=:8081 + - --metrics-bind-address=127.0.0.1:9999 command: - /manager env: @@ -217,7 +217,7 @@ spec: value: http://0.0.0.0:8082 - name: SAMPLING-RATE value: "2" - image: quay.io/sustainable_computing_io/susql_operator:0.0.13 + image: quay.io/sustainable_computing_io/susql_operator:0.0.14 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -226,6 +226,13 @@ spec: initialDelaySeconds: 15 periodSeconds: 20 name: manager + ports: + - containerPort: 8082 + name: metric + protocol: TCP + - containerPort: 9999 + name: autometric + protocol: TCP readinessProbe: httpGet: path: /readyz @@ -314,4 +321,4 @@ spec: provider: name: SusQL Operator Contributors url: https://github.com/sustainable-computing-io/susql-operator - version: 0.0.13 + version: 0.0.14 diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index d0a6b5d..d8ad988 100644 --- a/config/default/manager_auth_proxy_patch.yaml +++ b/config/default/manager_auth_proxy_patch.yaml @@ -32,13 +32,3 @@ spec: requests: cpu: 5m memory: 64Mi - - name: manager - args: - - "--health-probe-bind-address=:8081" - - "--metrics-bind-address=127.0.0.1:9999" - - "--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)" diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 1050211..35bbadf 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.13 + newTag: 0.0.14 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 4165eee..a1017d1 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -88,6 +88,8 @@ spec: - --susql-prometheus-database-url=$(SUSQL-PROMETHEUS-DATABASE-URL) - --susql-prometheus-metrics-url=$(SUSQL-PROMETHEUS-METRICS-URL) - --sampling-rate=$(SAMPLING-RATE) + - --health-probe-bind-address=:8081 + - --metrics-bind-address=127.0.0.1:9999 image: '' imagePullPolicy: IfNotPresent name: manager @@ -110,6 +112,13 @@ spec: periodSeconds: 10 # TODO(user): Configure the resources accordingly based on the project requirements. # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + ports: + - containerPort: 8082 + protocol: TCP + name: metric + - containerPort: 9999 + protocol: TCP + name: autometric resources: limits: cpu: 500m