feat: helm chart feature for service monitor additional labels (#185)

* Adding ability to add additional labels to service monitor * Bumping chart version * Adding test and updating config --------- Co-authored-by: mstrelkovs <[email protected]>
isindir · Aug 10, 2024 · 3f5f14a · 3f5f14a
1 parent 9933d7f
commit 3f5f14a
Show file tree

Hide file tree

Showing 8 changed files with 155 additions and 104 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ encrypted files stored in `git` repository.
 
 | Kubernetes | Sops | Chart | Operator |
 |---|---|---|---|
-| v1.30.x | v3.9.0 | 0.19.2 | 0.13.2 |
+| v1.30.x | v3.9.0 | 0.19.3 | 0.13.2 |
 | v1.29.x | v3.8.1 | 0.18.6 | 0.12.6 |
 | v1.28.x | v3.8.1 | 0.17.4 | 0.11.4 |
 | v1.27.x | v3.7.3 | 0.15.5 | 0.9.5 |

diff --git a/chart/helm3/sops-secrets-operator/Chart.yaml b/chart/helm3/sops-secrets-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 # UPDATE_HERE
-version: 0.19.2
+version: 0.19.3
 appVersion: 0.13.2
 type: application
 description: Helm chart deploys sops-secrets-operator

diff --git a/chart/helm3/sops-secrets-operator/templates/monitor.yaml b/chart/helm3/sops-secrets-operator/templates/monitor.yaml
@@ -2,9 +2,12 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "sops-secrets-operator.fullname" . }}-mentrics-monitor
+  name: {{ include "sops-secrets-operator.fullname" . }}-metrics-monitor
   labels:
-{{ include "sops-secrets-operator.labels" . | indent 4 }}
+    {{- include "sops-secrets-operator.labels" . | nindent 4 }}
+    {{- with .Values.metrics.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
     - path: /metrics

diff --git a/chart/helm3/sops-secrets-operator/tests/monitor_test.yaml b/chart/helm3/sops-secrets-operator/tests/monitor_test.yaml
@@ -31,3 +31,29 @@ tests:
           value:
             app.kubernetes.io/instance: sops
             app.kubernetes.io/name: sops-secrets-operator
+
+  - it: should include additional labels when set
+    release:
+      name: sops
+      namespace: sops
+    set:
+      metrics:
+        enabled: true
+        additionalLabels:
+          custom-label: custom-value
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ServiceMonitor
+      - isAPIVersion:
+          of: monitoring.coreos.com/v1
+      - equal:
+          path: metadata.labels
+          value:
+            app.kubernetes.io/instance: sops
+            app.kubernetes.io/managed-by: Helm
+            app.kubernetes.io/name: sops-secrets-operator
+            app.kubernetes.io/version: "0.13.2"
+            helm.sh/chart: sops-secrets-operator-0.19.3
+            custom-label: custom-value
diff --git a/chart/helm3/sops-secrets-operator/tests/operator_test.yaml b/chart/helm3/sops-secrets-operator/tests/operator_test.yaml
@@ -31,7 +31,7 @@ tests:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: sops-secrets-operator
         app.kubernetes.io/version: 0.13.2
-        helm.sh/chart: sops-secrets-operator-0.19.2
+        helm.sh/chart: sops-secrets-operator-0.19.3
 
 # custom name
 - it: should correctly render custome name

diff --git a/chart/helm3/sops-secrets-operator/values.yaml b/chart/helm3/sops-secrets-operator/values.yaml
@@ -189,3 +189,5 @@ rbac:
 metrics:
   # -- Enable prometheus metrics
   enabled: false
+  # -- Additional labels for ServiceMonitor
+  additionalLabels: {}