Merge pull request #101 from sustainable-computing-io/double-counting…

…-bug Clean up
sustainable-computing-io · May 14, 2024 · 47a7105 · 47a7105
2 parents 0c3c601 + 7c554c2
commit 47a7105
Show file tree

Hide file tree

Showing 19 changed files with 285 additions and 164 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.14
+0.0.15
diff --git a/...-operator-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/...-operator-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
@@ -0,0 +1,18 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app.kubernetes.io/component: metrics
+    app.kubernetes.io/created-by: susql-operator
+    app.kubernetes.io/instance: controller-manager-metrics-monitor
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: servicemonitor
+    app.kubernetes.io/part-of: susql-operator
+  name: susql-operator-controller-manager-metrics-monitor
+spec:
+  endpoints:
+  - port: metrics
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: service
+      app.kubernetes.io/part-of: susql-operator
diff --git a/...r-manager-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml b/...r-manager-metrics-service_v1_service.yaml → ...r-manager-metrics-service_v1_service.yaml
@@ -5,19 +5,19 @@ metadata:
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: susql-operator
-    app.kubernetes.io/instance: susql-controller-manager-metrics-service
+    app.kubernetes.io/instance: controller-manager-metrics-service
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: service
     app.kubernetes.io/part-of: susql-operator
-    control-plane: susql-controller-manager
-  name: susql-operator-susql-controller-manager-metrics-service
+  name: susql-operator-controller-manager-metrics-service
 spec:
   ports:
-  - name: https
-    port: 8443
+  - name: metrics
+    port: 8082
     protocol: TCP
-    targetPort: https
+    targetPort: metrics
   selector:
-    control-plane: susql-controller-manager
+    app.kubernetes.io/component: manager
+    app.kubernetes.io/instance: controller-manager
 status:
   loadBalancer: {}
diff --git a/...tor-susql-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/...tor-susql-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
diff --git 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.14
-    createdAt: "2024-04-30T07:27:57Z"
+    containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.15
+    createdAt: "2024-05-14T16:24:18Z"
     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.14
+  name: susql-operator.v0.0.15
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -147,54 +147,48 @@ spec:
           - get
           - list
           - watch
-        serviceAccountName: susql-operator-susql-controller-manager
+        serviceAccountName: susql-operator-controller-manager
       deployments:
       - label:
           app.kubernetes.io/component: manager
-          app.kubernetes.io/created-by: susql-operator
-          app.kubernetes.io/instance: susql-controller-manager
-          app.kubernetes.io/managed-by: kustomize
+          app.kubernetes.io/instance: controller-manager
           app.kubernetes.io/name: deployment
           app.kubernetes.io/part-of: susql-operator
-          control-plane: susql-controller-manager
-        name: susql-operator-susql-controller-manager
+        name: susql-operator-controller
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: susql-controller-manager
+              app.kubernetes.io/component: manager
+              app.kubernetes.io/instance: controller-manager
+              app.kubernetes.io/part-of: susql-operator
           strategy: {}
           template:
             metadata:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
-                control-plane: susql-controller-manager
+                app.kubernetes.io/component: manager
+                app.kubernetes.io/instance: controller-manager
+                app.kubernetes.io/part-of: susql-operator
             spec:
+              affinity:
+                nodeAffinity:
+                  requiredDuringSchedulingIgnoredDuringExecution:
+                    nodeSelectorTerms:
+                    - matchExpressions:
+                      - key: kubernetes.io/arch
+                        operator: In
+                        values:
+                        - amd64
+                        - arm64
+                        - ppc64le
+                        - s390x
+                      - key: kubernetes.io/os
+                        operator: In
+                        values:
+                        - linux
               containers:
-              - args:
-                - --secure-listen-address=0.0.0.0:8443
-                - --upstream=http://127.0.0.1:8082/
-                - --logtostderr=true
-                - --v=0
-                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
-                name: kube-rbac-proxy
-                ports:
-                - containerPort: 8443
-                  name: https
-                  protocol: TCP
-                resources:
-                  limits:
-                    cpu: 500m
-                    memory: 128Mi
-                  requests:
-                    cpu: 5m
-                    memory: 64Mi
-                securityContext:
-                  allowPrivilegeEscalation: false
-                  capabilities:
-                    drop:
-                    - ALL
               - args:
                 - --leader-elect
                 - --kepler-prometheus-url=$(KEPLER-PROMETHEUS-URL)
@@ -203,7 +197,7 @@ spec:
                 - --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
+                - --metrics-bind-address=127.0.0.1:8082
                 command:
                 - /manager
                 env:
@@ -217,28 +211,25 @@ spec:
                   value: http://0.0.0.0:8082
                 - name: SAMPLING-RATE
                   value: "2"
-                image: quay.io/sustainable_computing_io/susql_operator:0.0.14
+                image: quay.io/sustainable_computing_io/susql_operator:0.0.15
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
                     path: /healthz
                     port: 8081
-                  initialDelaySeconds: 15
+                  initialDelaySeconds: 20
                   periodSeconds: 20
                 name: manager
                 ports:
                 - containerPort: 8082
-                  name: metric
-                  protocol: TCP
-                - containerPort: 9999
-                  name: autometric
+                  name: metrics
                   protocol: TCP
                 readinessProbe:
                   httpGet:
                     path: /readyz
                     port: 8081
-                  initialDelaySeconds: 5
-                  periodSeconds: 10
+                  initialDelaySeconds: 20
+                  periodSeconds: 20
                 resources:
                   limits:
                     cpu: 500m
@@ -253,7 +244,7 @@ spec:
                     - ALL
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: susql-operator-susql-controller-manager
+              serviceAccountName: susql-operator-controller-manager
               terminationGracePeriodSeconds: 10
       permissions:
       - rules:
@@ -288,7 +279,7 @@ spec:
           verbs:
           - create
           - patch
-        serviceAccountName: susql-operator-susql-controller-manager
+        serviceAccountName: susql-operator-controller-manager
     strategy: deployment
   installModes:
   - supported: true
@@ -321,4 +312,4 @@ spec:
   provider:
     name: SusQL Operator Contributors
     url: https://github.com/sustainable-computing-io/susql-operator
-  version: 0.0.14
+  version: 0.0.15
diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -30,7 +30,7 @@ patchesStrategicMerge:
 # Protect the /metrics endpoint by putting it behind auth.
 # If you want your controller-manager to expose the /metrics
 # endpoint w/o any authn/z, please comment the following line.
-- manager_auth_proxy_patch.yaml
+# - manager_auth_proxy_patch.yaml
 
 
 

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: susql-controller-manager
+  name: controller-manager
   namespace: system
 spec:
   template:

diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: susql-controller-manager
+  name: controller-manager
   namespace: system
 spec:
   template:

diff --git 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.14
+  newTag: 0.0.15