From 8adb220c437889ebbee07ce9c7b4e05f1d33ff3d Mon Sep 17 00:00:00 2001 From: Scott Trent Date: Tue, 23 Apr 2024 11:16:10 +0900 Subject: [PATCH] place operator-sdk configurations in correct place Signed-off-by: Scott Trent --- config/default/manager_auth_proxy_patch.yaml | 5 +++++ config/manager/manager.yaml | 3 ++- .../bases/susql-operator.clusterserviceversion.yaml | 1 + config/rbac/auth_proxy_role.yaml | 9 +++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index 73fad2a..a0225b3 100644 --- a/config/default/manager_auth_proxy_patch.yaml +++ b/config/default/manager_auth_proxy_patch.yaml @@ -37,3 +37,8 @@ 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)" diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 69fe882..f6ea71d 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -74,7 +74,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 diff --git a/config/manifests/bases/susql-operator.clusterserviceversion.yaml b/config/manifests/bases/susql-operator.clusterserviceversion.yaml index c58fddd..ed6fe23 100644 --- a/config/manifests/bases/susql-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/susql-operator.clusterserviceversion.yaml @@ -107,6 +107,7 @@ spec: - email: mohammed.munir.abdi@ibm.com name: Mohammed Abdi maturity: alpha + minKubeVersion: 1.12.0 provider: name: SusQL Operator Contributors url: https://github.com/sustainable-computing-io/susql-operator diff --git a/config/rbac/auth_proxy_role.yaml b/config/rbac/auth_proxy_role.yaml index 95d4fff..b043d4d 100644 --- a/config/rbac/auth_proxy_role.yaml +++ b/config/rbac/auth_proxy_role.yaml @@ -22,3 +22,12 @@ rules: - subjectaccessreviews verbs: - create +- apiGroups: + - '' + resources: + - pods + - pods/status + verbs: + - get + - list + - watch