Browse Source

chore(helm): Add extra labels to the validating webhooks (#4074)

It should add a bunch of app.kubernetes.io labels

Signed-off-by: Miguel Sacristán Izcue <miguel_tete17@hotmail.com>
Co-authored-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
Tete17 1 year ago
parent
commit
a9ba8b2bc8

+ 2 - 6
deploy/charts/external-secrets/templates/validatingwebhook.yaml

@@ -4,10 +4,8 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: secretstore-validate
   labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
     external-secrets.io/component: webhook
-    {{- with .Values.commonLabels }}
-    {{ toYaml . | nindent 4 }}
-    {{- end }}
   {{- if and .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
   annotations:
     cert-manager.io/inject-ca-from: {{ template "external-secrets.namespace" . }}/{{ include "external-secrets.fullname" . }}-webhook
@@ -50,10 +48,8 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: externalsecret-validate
   labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
     external-secrets.io/component: webhook
-    {{- with .Values.commonLabels }}
-    {{ toYaml . | nindent 4 }}
-    {{- end }}
   {{- if and .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
   annotations:
     cert-manager.io/inject-ca-from: {{ template "external-secrets.namespace" . }}/{{ include "external-secrets.fullname" . }}-webhook

+ 1 - 1
deploy/charts/external-secrets/tests/__snapshot__/crds_test.yaml.snap

@@ -4,7 +4,7 @@ should match snapshot of default values:
     kind: CustomResourceDefinition
     metadata:
       annotations:
-        controller-gen.kubebuilder.io/version: v0.16.3
+        controller-gen.kubebuilder.io/version: v0.16.5
       labels:
         external-secrets.io/component: controller
       name: secretstores.external-secrets.io

+ 12 - 0
deploy/charts/external-secrets/tests/webhook_test.yaml

@@ -161,6 +161,18 @@ tests:
     templates:
       - validatingwebhook.yaml
       - crds/externalsecret.yaml
+  - it: should have the correct labels
+    set:
+      webhook.create: true
+    templates:
+      - validatingwebhook.yaml
+    asserts:
+      - equal:
+          path: metadata.labels["app.kubernetes.io/name"]
+          value: "external-secrets-webhook"
+      - equal:
+          path: metadata.labels["app.kubernetes.io/instance"]
+          value: "RELEASE-NAME"
   - it: should override metrics port
     set:
       webhook.metrics.listen.port: 8888