fix: fixed matchLabels for deployments/services

steadybit · Sep 8, 2023 · 1c52b64 · 1c52b64
1 parent f7c62d2
commit 1c52b64
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 7 deletions.
diff --git a/charts/steadybit-extension-prometheus/Chart.lock b/charts/steadybit-extension-prometheus/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: extensionlib
   repository: https://steadybit.github.io/helm-charts
-  version: 1.4.3
-digest: sha256:8ea2d95f282d0e0e19ead08ff44fdca06a18c130c45f251dd87b1e5256341288
-generated: "2023-08-10T07:58:53.629241+02:00"
+  version: 1.4.4
+digest: sha256:b241bfbb60b24ff401a45d75efeaebfd5242801712bfaf7740f0461df9a50c37
+generated: "2023-09-08T09:51:05.121182+02:00"
diff --git a/charts/steadybit-extension-prometheus/Chart.yaml b/charts/steadybit-extension-prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: steadybit-extension-prometheus
 description: Steadybit Prometheus extension Helm chart for Kubernetes.
-version: 1.4.16
+version: 1.4.17
 appVersion: latest
 home: https://www.steadybit.com/
 icon: https://steadybit-website-assets.s3.amazonaws.com/logo-symbol-transparent.png
@@ -21,5 +21,5 @@ annotations:
       url: https://hub.steadybit.com
 dependencies:
   - name: extensionlib
-    version: ^1.4.3
+    version: ^1.4.4
     repository: https://steadybit.github.io/helm-charts
diff --git a/charts/steadybit-extension-prometheus/charts/extensionlib-1.4.3.tgz b/charts/steadybit-extension-prometheus/charts/extensionlib-1.4.3.tgz
diff --git a/charts/steadybit-extension-prometheus/charts/extensionlib-1.4.4.tgz b/charts/steadybit-extension-prometheus/charts/extensionlib-1.4.4.tgz
diff --git a/charts/steadybit-extension-prometheus/templates/deployment.yaml b/charts/steadybit-extension-prometheus/templates/deployment.yaml
@@ -12,11 +12,11 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "extensionlib.names.name" . }}
+      {{- include "extensionlib.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "extensionlib.names.name" . }}
+        {{- include "extensionlib.selectorLabels" . | nindent 8 }}
         {{- include "extensionlib.labels" (list .) | nindent 8 }}
         {{- range $key, $value := .Values.extraLabels }}
         {{ $key }}: {{ $value }}

diff --git a/charts/steadybit-extension-prometheus/tests/__snapshot__/deployment_test.yaml.snap b/charts/steadybit-extension-prometheus/tests/__snapshot__/deployment_test.yaml.snap
@@ -11,12 +11,14 @@ manifest should match snapshot using podAnnotations and Labels:
       replicas: 1
       selector:
         matchLabels:
+          app.kubernetes.io/instance: RELEASE-NAME
           app.kubernetes.io/name: steadybit-extension-prometheus
       template:
         metadata:
           annotations:
             some-annotation: some-annotation-value
           labels:
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: steadybit-extension-prometheus
             some-label: some-label-value
             steadybit.com/discovery-disabled: "true"
@@ -74,11 +76,13 @@ manifest should match snapshot with TLS:
       replicas: 1
       selector:
         matchLabels:
+          app.kubernetes.io/instance: RELEASE-NAME
           app.kubernetes.io/name: steadybit-extension-prometheus
       template:
         metadata:
           annotations: null
           labels:
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: steadybit-extension-prometheus
             steadybit.com/discovery-disabled: "true"
         spec:
@@ -146,11 +150,13 @@ manifest should match snapshot with extra env vars:
       replicas: 1
       selector:
         matchLabels:
+          app.kubernetes.io/instance: RELEASE-NAME
           app.kubernetes.io/name: steadybit-extension-prometheus
       template:
         metadata:
           annotations: null
           labels:
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: steadybit-extension-prometheus
             steadybit.com/discovery-disabled: "true"
         spec:
@@ -215,11 +221,13 @@ manifest should match snapshot with extra labels:
       replicas: 1
       selector:
         matchLabels:
+          app.kubernetes.io/instance: RELEASE-NAME
           app.kubernetes.io/name: steadybit-extension-prometheus
       template:
         metadata:
           annotations: null
           labels:
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: steadybit-extension-prometheus
             steadybit.com/discovery-disabled: "true"
             tags.datadoghq.com/service: steadybit-extension
@@ -277,11 +285,13 @@ manifest should match snapshot with mutual TLS:
       replicas: 1
       selector:
         matchLabels:
+          app.kubernetes.io/instance: RELEASE-NAME
           app.kubernetes.io/name: steadybit-extension-prometheus
       template:
         metadata:
           annotations: null
           labels:
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: steadybit-extension-prometheus
             steadybit.com/discovery-disabled: "true"
         spec:
@@ -358,11 +368,13 @@ manifest should match snapshot with mutual TLS using containerPaths:
       replicas: 1
       selector:
         matchLabels:
+          app.kubernetes.io/instance: RELEASE-NAME
           app.kubernetes.io/name: steadybit-extension-prometheus
       template:
         metadata:
           annotations: null
           labels:
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: steadybit-extension-prometheus
             steadybit.com/discovery-disabled: "true"
         spec:
@@ -425,11 +437,13 @@ manifest should match snapshot without TLS:
       replicas: 1
       selector:
         matchLabels:
+          app.kubernetes.io/instance: RELEASE-NAME
           app.kubernetes.io/name: steadybit-extension-prometheus
       template:
         metadata:
           annotations: null
           labels:
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: steadybit-extension-prometheus
             steadybit.com/discovery-disabled: "true"
         spec:

diff --git a/charts/steadybit-extension-prometheus/tests/__snapshot__/service_test.yaml.snap b/charts/steadybit-extension-prometheus/tests/__snapshot__/service_test.yaml.snap
@@ -15,6 +15,7 @@ manifest should match snapshot with TLS:
           protocol: TCP
           targetPort: 8087
       selector:
+        app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/name: steadybit-extension-prometheus
 manifest should match snapshot with mutual TLS:
   1: |
@@ -33,6 +34,7 @@ manifest should match snapshot with mutual TLS:
           protocol: TCP
           targetPort: 8087
       selector:
+        app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/name: steadybit-extension-prometheus
 manifest should match snapshot with mutual TLS using containerPaths:
   1: |
@@ -51,6 +53,7 @@ manifest should match snapshot with mutual TLS using containerPaths:
           protocol: TCP
           targetPort: 8087
       selector:
+        app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/name: steadybit-extension-prometheus
 manifest should match snapshot without TLS:
   1: |
@@ -69,4 +72,5 @@ manifest should match snapshot without TLS:
           protocol: TCP
           targetPort: 8087
       selector:
+        app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/name: steadybit-extension-prometheus