Merge pull request #90 from acobaugh/webhooknamespaceselector

fix(helm): fix the namespaceSelector that prevents the webhook from running in the release namespace
kubernetes-sigs · Oct 13, 2022 · 9f8c15f · 9f8c15f
2 parents 1b39a40 + 924a03e
commit 9f8c15f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/charts/gmsa/templates/mutatingwebhook.yaml b/charts/gmsa/templates/mutatingwebhook.yaml
@@ -28,7 +28,10 @@ webhooks:
     # don't run on ${NAMESPACE}
     namespaceSelector:
       matchExpressions:
-        - key: {{ .Release.Namespace }}
+        - key: kubernetes.io/metadata.name
           operator: NotIn
-          values: [disabled]
+          values: [{{ .Release.Namespace }}]
+        - key: windows.k8s.io/disabled
+          operator: NotIn
+          values: ["true"]
 
diff --git a/charts/gmsa/templates/validatingwebhook.yaml b/charts/gmsa/templates/validatingwebhook.yaml
@@ -28,7 +28,10 @@ webhooks:
     # don't run on ${NAMESPACE}
     namespaceSelector:
       matchExpressions:
-        - key: {{ .Release.Namespace }}
+        - key: kubernetes.io/metadata.name
           operator: NotIn
-          values: [disabled]
+          values: [{{ .Release.Namespace }}]
+        - key: windows.k8s.io/disabled
+          operator: NotIn
+          values: ["true"]