Merge pull request #67 from sustainable-computing-io/issue66

consolidate labels as needed
sustainable-computing-io · Mar 22, 2024 · 1e3009c · 1e3009c
2 parents 0510f5e + a3bc834
commit 1e3009c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/config/servicemonitor/susql-smon.yaml b/config/servicemonitor/susql-smon.yaml
@@ -22,4 +22,4 @@ spec:
   jobLabel: app.kubernetes.io/name
   selector:
     matchLabels:
-      sustainable-computing.io/app: susql
+      sustainable-computing.io/app: susql-controller
diff --git a/deployment/susql-controller/templates/deployment.yaml b/deployment/susql-controller/templates/deployment.yaml
@@ -7,13 +7,13 @@ spec:
     replicas: 1
     selector:
         matchLabels:
-            deployment.apps: {{ .Values.name }}
+            sustainable-computing.io/app: {{ .Values.name }}
     template:
         metadata:
             name: {{ .Values.name }}
             namespace: {{ .Values.namespace }}
             labels:
-                deployment.apps: {{ .Values.name }}
+                sustainable-computing.io/app: {{ .Values.name }}
         spec:
             automountServiceAccountToken: true
             serviceAccount: {{ .Values.name }}

diff --git a/deployment/susql-controller/templates/service.yaml b/deployment/susql-controller/templates/service.yaml
@@ -4,10 +4,12 @@ kind: Service
 metadata:
     name: {{ required "Please specify a 'name' in the user file" .Values.name }}
     namespace: {{ required "Please specify a 'namespace' in the user file" .Values.namespace }}
+    labels:
+        sustainable-computing.io/app: {{ .Values.name }}
 spec:
     type: ClusterIP
     selector:
-        deployment.apps: susql-controller
+        sustainable-computing.io/app: {{ .Values.name }}
     ports:
         - name: metrics
           port: 8082