Skip to content

Commit a4f7006

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5951 from kbst/usenamespaceenvexpansion
Use env expansion to provide namespace in container args
2 parents 3435e78 + e5e963b commit a4f7006

File tree

11 files changed

+108
-38
lines changed

11 files changed

+108
-38
lines changed

‎charts/ingress-nginx/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
name: ingress-nginx
3-
version: 2.11.1
3+
version: 2.11.2
44
appVersion: 0.34.1
55
home: https://github.com/kubernetes/ingress-nginx
66
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer

‎charts/ingress-nginx/templates/_helpers.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Users can provide an override for an explicit service they want bound via `.Valu
4848
4949
*/}}
5050
{{- define "ingress-nginx.controller.publishServicePath" -}}
51-
{{- $defServiceName := printf "%s/%s" .Release.Namespace (include "ingress-nginx.controller.fullname" .) -}}
51+
{{- $defServiceName := printf "%s/%s" "$(POD_NAMESPACE)" (include "ingress-nginx.controller.fullname" .) -}}
5252
{{- $servicePath := default $defServiceName .Values.controller.publishService.pathOverride }}
5353
{{- print $servicePath | trimSuffix "-" -}}
5454
{{- end -}}

‎charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml

+7-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,14 @@ spec:
3838
imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.image.pullPolicy }}
3939
args:
4040
- create
41-
- --host={{ include "ingress-nginx.controller.fullname" . }}-admission,{{ include "ingress-nginx.controller.fullname" . }}-admission.{{ .Release.Namespace }}.svc
42-
- --namespace={{ .Release.Namespace }}
41+
- --host={{ include "ingress-nginx.controller.fullname" . }}-admission,{{ include "ingress-nginx.controller.fullname" . }}-admission.$(POD_NAMESPACE).svc
42+
- --namespace=$(POD_NAMESPACE)
4343
- --secret-name={{ include "ingress-nginx.fullname" . }}-admission
44+
env:
45+
- name: POD_NAMESPACE
46+
valueFrom:
47+
fieldRef:
48+
fieldPath: metadata.namespace
4449
restartPolicy: OnFailure
4550
serviceAccountName: {{ include "ingress-nginx.fullname" . }}-admission
4651
{{- if .Values.controller.admissionWebhooks.patch.nodeSelector }}

‎charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,15 @@ spec:
3939
args:
4040
- patch
4141
- --webhook-name={{ include "ingress-nginx.fullname" . }}-admission
42-
- --namespace={{ .Release.Namespace }}
42+
- --namespace=$(POD_NAMESPACE)
4343
- --patch-mutating=false
4444
- --secret-name={{ include "ingress-nginx.fullname" . }}-admission
4545
- --patch-failure-policy={{ .Values.controller.admissionWebhooks.failurePolicy }}
46+
env:
47+
- name: POD_NAMESPACE
48+
valueFrom:
49+
fieldRef:
50+
fieldPath: metadata.namespace
4651
restartPolicy: OnFailure
4752
serviceAccountName: {{ include "ingress-nginx.fullname" . }}-admission
4853
{{- if .Values.controller.admissionWebhooks.patch.nodeSelector }}

‎charts/ingress-nginx/templates/controller-deployment.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,22 @@ spec:
7171
args:
7272
- /nginx-ingress-controller
7373
{{- if .Values.defaultBackend.enabled }}
74-
- --default-backend-service={{ .Release.Namespace }}/{{ include "ingress-nginx.defaultBackend.fullname" . }}
74+
- --default-backend-service=$(POD_NAMESPACE)/{{ include "ingress-nginx.defaultBackend.fullname" . }}
7575
{{- end }}
7676
{{- if .Values.controller.publishService.enabled }}
7777
- --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }}
7878
{{- end }}
7979
- --election-id={{ .Values.controller.electionID }}
8080
- --ingress-class={{ .Values.controller.ingressClass }}
81-
- --configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.controller.fullname" . }}
81+
- --configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.controller.fullname" . }}
8282
{{- if .Values.tcp }}
83-
- --tcp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
83+
- --tcp-services-configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.fullname" . }}-tcp
8484
{{- end }}
8585
{{- if .Values.udp }}
86-
- --udp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-udp
86+
- --udp-services-configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.fullname" . }}-udp
8787
{{- end }}
8888
{{- if .Values.controller.scope.enabled }}
89-
- --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }}
89+
- --watch-namespace={{ default "$(POD_NAMESPACE)" .Values.controller.scope.namespace }}
9090
{{- end }}
9191
{{- if and .Values.controller.reportNodeInternalIp .Values.controller.hostNetwork }}
9292
- --report-node-internal-ip-address={{ .Values.controller.reportNodeInternalIp }}

‎deploy/static/provider/aws/deploy-tls-termination.yaml

+15-5
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,10 @@ spec:
352352
- /wait-shutdown
353353
args:
354354
- /nginx-ingress-controller
355-
- --publish-service=ingress-nginx/ingress-nginx-controller
355+
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
356356
- --election-id=ingress-controller-leader
357357
- --ingress-class=nginx
358-
- --configmap=ingress-nginx/ingress-nginx-controller
358+
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
359359
- --validating-webhook=:8443
360360
- --validating-webhook-certificate=/usr/local/certificates/cert
361361
- --validating-webhook-key=/usr/local/certificates/key
@@ -611,9 +611,14 @@ spec:
611611
imagePullPolicy: IfNotPresent
612612
args:
613613
- create
614-
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.ingress-nginx.svc
615-
- --namespace=ingress-nginx
614+
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
615+
- --namespace=$(POD_NAMESPACE)
616616
- --secret-name=ingress-nginx-admission
617+
env:
618+
- name: POD_NAMESPACE
619+
valueFrom:
620+
fieldRef:
621+
fieldPath: metadata.namespace
617622
restartPolicy: OnFailure
618623
serviceAccountName: ingress-nginx-admission
619624
securityContext:
@@ -655,10 +660,15 @@ spec:
655660
args:
656661
- patch
657662
- --webhook-name=ingress-nginx-admission
658-
- --namespace=ingress-nginx
663+
- --namespace=$(POD_NAMESPACE)
659664
- --patch-mutating=false
660665
- --secret-name=ingress-nginx-admission
661666
- --patch-failure-policy=Fail
667+
env:
668+
- name: POD_NAMESPACE
669+
valueFrom:
670+
fieldRef:
671+
fieldPath: metadata.namespace
662672
restartPolicy: OnFailure
663673
serviceAccountName: ingress-nginx-admission
664674
securityContext:

‎deploy/static/provider/aws/deploy.yaml

+15-5
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,10 @@ spec:
343343
- /wait-shutdown
344344
args:
345345
- /nginx-ingress-controller
346-
- --publish-service=ingress-nginx/ingress-nginx-controller
346+
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
347347
- --election-id=ingress-controller-leader
348348
- --ingress-class=nginx
349-
- --configmap=ingress-nginx/ingress-nginx-controller
349+
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
350350
- --validating-webhook=:8443
351351
- --validating-webhook-certificate=/usr/local/certificates/cert
352352
- --validating-webhook-key=/usr/local/certificates/key
@@ -599,9 +599,14 @@ spec:
599599
imagePullPolicy: IfNotPresent
600600
args:
601601
- create
602-
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.ingress-nginx.svc
603-
- --namespace=ingress-nginx
602+
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
603+
- --namespace=$(POD_NAMESPACE)
604604
- --secret-name=ingress-nginx-admission
605+
env:
606+
- name: POD_NAMESPACE
607+
valueFrom:
608+
fieldRef:
609+
fieldPath: metadata.namespace
605610
restartPolicy: OnFailure
606611
serviceAccountName: ingress-nginx-admission
607612
securityContext:
@@ -643,10 +648,15 @@ spec:
643648
args:
644649
- patch
645650
- --webhook-name=ingress-nginx-admission
646-
- --namespace=ingress-nginx
651+
- --namespace=$(POD_NAMESPACE)
647652
- --patch-mutating=false
648653
- --secret-name=ingress-nginx-admission
649654
- --patch-failure-policy=Fail
655+
env:
656+
- name: POD_NAMESPACE
657+
valueFrom:
658+
fieldRef:
659+
fieldPath: metadata.namespace
650660
restartPolicy: OnFailure
651661
serviceAccountName: ingress-nginx-admission
652662
securityContext:

‎deploy/static/provider/baremetal/deploy.yaml

+14-4
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ spec:
339339
- /nginx-ingress-controller
340340
- --election-id=ingress-controller-leader
341341
- --ingress-class=nginx
342-
- --configmap=ingress-nginx/ingress-nginx-controller
342+
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
343343
- --validating-webhook=:8443
344344
- --validating-webhook-certificate=/usr/local/certificates/cert
345345
- --validating-webhook-key=/usr/local/certificates/key
@@ -592,9 +592,14 @@ spec:
592592
imagePullPolicy: IfNotPresent
593593
args:
594594
- create
595-
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.ingress-nginx.svc
596-
- --namespace=ingress-nginx
595+
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
596+
- --namespace=$(POD_NAMESPACE)
597597
- --secret-name=ingress-nginx-admission
598+
env:
599+
- name: POD_NAMESPACE
600+
valueFrom:
601+
fieldRef:
602+
fieldPath: metadata.namespace
598603
restartPolicy: OnFailure
599604
serviceAccountName: ingress-nginx-admission
600605
securityContext:
@@ -636,10 +641,15 @@ spec:
636641
args:
637642
- patch
638643
- --webhook-name=ingress-nginx-admission
639-
- --namespace=ingress-nginx
644+
- --namespace=$(POD_NAMESPACE)
640645
- --patch-mutating=false
641646
- --secret-name=ingress-nginx-admission
642647
- --patch-failure-policy=Fail
648+
env:
649+
- name: POD_NAMESPACE
650+
valueFrom:
651+
fieldRef:
652+
fieldPath: metadata.namespace
643653
restartPolicy: OnFailure
644654
serviceAccountName: ingress-nginx-admission
645655
securityContext:

‎deploy/static/provider/cloud/deploy.yaml

+15-5
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,10 @@ spec:
338338
- /wait-shutdown
339339
args:
340340
- /nginx-ingress-controller
341-
- --publish-service=ingress-nginx/ingress-nginx-controller
341+
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
342342
- --election-id=ingress-controller-leader
343343
- --ingress-class=nginx
344-
- --configmap=ingress-nginx/ingress-nginx-controller
344+
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
345345
- --validating-webhook=:8443
346346
- --validating-webhook-certificate=/usr/local/certificates/cert
347347
- --validating-webhook-key=/usr/local/certificates/key
@@ -594,9 +594,14 @@ spec:
594594
imagePullPolicy: IfNotPresent
595595
args:
596596
- create
597-
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.ingress-nginx.svc
598-
- --namespace=ingress-nginx
597+
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
598+
- --namespace=$(POD_NAMESPACE)
599599
- --secret-name=ingress-nginx-admission
600+
env:
601+
- name: POD_NAMESPACE
602+
valueFrom:
603+
fieldRef:
604+
fieldPath: metadata.namespace
600605
restartPolicy: OnFailure
601606
serviceAccountName: ingress-nginx-admission
602607
securityContext:
@@ -638,10 +643,15 @@ spec:
638643
args:
639644
- patch
640645
- --webhook-name=ingress-nginx-admission
641-
- --namespace=ingress-nginx
646+
- --namespace=$(POD_NAMESPACE)
642647
- --patch-mutating=false
643648
- --secret-name=ingress-nginx-admission
644649
- --patch-failure-policy=Fail
650+
env:
651+
- name: POD_NAMESPACE
652+
valueFrom:
653+
fieldRef:
654+
fieldPath: metadata.namespace
645655
restartPolicy: OnFailure
646656
serviceAccountName: ingress-nginx-admission
647657
securityContext:

‎deploy/static/provider/do/deploy.yaml

+15-5
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,10 @@ spec:
341341
- /wait-shutdown
342342
args:
343343
- /nginx-ingress-controller
344-
- --publish-service=ingress-nginx/ingress-nginx-controller
344+
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
345345
- --election-id=ingress-controller-leader
346346
- --ingress-class=nginx
347-
- --configmap=ingress-nginx/ingress-nginx-controller
347+
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
348348
- --validating-webhook=:8443
349349
- --validating-webhook-certificate=/usr/local/certificates/cert
350350
- --validating-webhook-key=/usr/local/certificates/key
@@ -597,9 +597,14 @@ spec:
597597
imagePullPolicy: IfNotPresent
598598
args:
599599
- create
600-
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.ingress-nginx.svc
601-
- --namespace=ingress-nginx
600+
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
601+
- --namespace=$(POD_NAMESPACE)
602602
- --secret-name=ingress-nginx-admission
603+
env:
604+
- name: POD_NAMESPACE
605+
valueFrom:
606+
fieldRef:
607+
fieldPath: metadata.namespace
603608
restartPolicy: OnFailure
604609
serviceAccountName: ingress-nginx-admission
605610
securityContext:
@@ -641,10 +646,15 @@ spec:
641646
args:
642647
- patch
643648
- --webhook-name=ingress-nginx-admission
644-
- --namespace=ingress-nginx
649+
- --namespace=$(POD_NAMESPACE)
645650
- --patch-mutating=false
646651
- --secret-name=ingress-nginx-admission
647652
- --patch-failure-policy=Fail
653+
env:
654+
- name: POD_NAMESPACE
655+
valueFrom:
656+
fieldRef:
657+
fieldPath: metadata.namespace
648658
restartPolicy: OnFailure
649659
serviceAccountName: ingress-nginx-admission
650660
securityContext:

‎deploy/static/provider/kind/deploy.yaml

+14-4
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ spec:
343343
- /nginx-ingress-controller
344344
- --election-id=ingress-controller-leader
345345
- --ingress-class=nginx
346-
- --configmap=ingress-nginx/ingress-nginx-controller
346+
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
347347
- --validating-webhook=:8443
348348
- --validating-webhook-certificate=/usr/local/certificates/cert
349349
- --validating-webhook-key=/usr/local/certificates/key
@@ -605,9 +605,14 @@ spec:
605605
imagePullPolicy: IfNotPresent
606606
args:
607607
- create
608-
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.ingress-nginx.svc
609-
- --namespace=ingress-nginx
608+
- --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
609+
- --namespace=$(POD_NAMESPACE)
610610
- --secret-name=ingress-nginx-admission
611+
env:
612+
- name: POD_NAMESPACE
613+
valueFrom:
614+
fieldRef:
615+
fieldPath: metadata.namespace
611616
restartPolicy: OnFailure
612617
serviceAccountName: ingress-nginx-admission
613618
securityContext:
@@ -649,10 +654,15 @@ spec:
649654
args:
650655
- patch
651656
- --webhook-name=ingress-nginx-admission
652-
- --namespace=ingress-nginx
657+
- --namespace=$(POD_NAMESPACE)
653658
- --patch-mutating=false
654659
- --secret-name=ingress-nginx-admission
655660
- --patch-failure-policy=Fail
661+
env:
662+
- name: POD_NAMESPACE
663+
valueFrom:
664+
fieldRef:
665+
fieldPath: metadata.namespace
656666
restartPolicy: OnFailure
657667
serviceAccountName: ingress-nginx-admission
658668
securityContext:

0 commit comments

Comments
 (0)