chore: Alow service namespace override (aws#6849)

rschalo · Aug 22, 2024 · e54ccdd · e54ccdd
1 parent 9f67fdc
commit e54ccdd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml b/charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml
@@ -1289,7 +1289,7 @@ spec:
       clientConfig:
         service:
           name: {{ .Values.webhook.serviceName }}
-          namespace: {{ .Release.Namespace }}
+          namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
           port: {{ .Values.webhook.port }}
 {{- end }}
 
diff --git a/charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml b/charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml
@@ -816,7 +816,7 @@ spec:
       clientConfig:
         service:
           name: {{ .Values.webhook.serviceName }}
-          namespace: {{ .Release.Namespace }}
+          namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
           port: {{ .Values.webhook.port }}
 {{- end }}
 
diff --git a/charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml b/charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml
@@ -1029,7 +1029,7 @@ spec:
       clientConfig:
         service:
           name: {{ .Values.webhook.serviceName }}
-          namespace: {{ .Release.Namespace }}
+          namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
           port: {{ .Values.webhook.port }}
 {{- end }}
 
diff --git a/charts/karpenter-crd/values.yaml b/charts/karpenter-crd/values.yaml
@@ -2,5 +2,6 @@ webhook:
   # -- Whether to enable the webhooks.
   enabled: false
   serviceName: karpenter
+  serviceNamespace: ""
   # -- The container port to use for the webhook.
   port: 8443
diff --git a/hack/mutation/conversion_webhook_injection.sh b/hack/mutation/conversion_webhook_injection.sh
@@ -18,7 +18,7 @@ echo "{{- if .Values.webhook.enabled }}
       clientConfig:
         service:
           name: {{ .Values.webhook.serviceName }}
-          namespace: {{ .Release.Namespace }}
+          namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
           port: {{ .Values.webhook.port }}
 {{- end }}
 " >>  charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml
@@ -33,7 +33,7 @@ echo "{{- if .Values.webhook.enabled }}
       clientConfig:
         service:
           name: {{ .Values.webhook.serviceName }}
-          namespace: {{ .Release.Namespace }}
+          namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
           port: {{ .Values.webhook.port }}
 {{- end }}
 " >>  charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml
@@ -48,7 +48,7 @@ echo "{{- if .Values.webhook.enabled }}
       clientConfig:
         service:
           name: {{ .Values.webhook.serviceName }}
-          namespace: {{ .Release.Namespace }}
+          namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
           port: {{ .Values.webhook.port }}
 {{- end }}
 " >>  charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml