DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: allow scope/tcp/udp configmap namespace to altered (#7161)

Browse source
This commit is contained in:
Tore 2021-07-16 13:58:10 +02:00 committed by GitHub
parent 62f9dc9516
commit ea0f02524b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/ingress-nginx/templates/controller-daemonset.yaml
View file

@ -81,12 +81,12 @@ spec:
{{- end }} {{- end }}
- --election-id={{ .Values.controller.electionID }} - --election-id={{ .Values.controller.electionID }}
- --ingress-class={{ .Values.controller.ingressClass }} - --ingress-class={{ .Values.controller.ingressClass }}
- --configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.controller.fullname" . }} - --configmap={{ default "$(POD_NAMESPACE)" .Values.controller.configMapNamespace }}/{{ include "ingress-nginx.controller.fullname" . }}
{{- if .Values.tcp }} {{- if .Values.tcp }}
- --tcp-services-configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.fullname" . }}-tcp - --tcp-services-configmap={{ default "$(POD_NAMESPACE)" .Values.controller.tcp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
{{- end }} {{- end }}
{{- if .Values.udp }} {{- if .Values.udp }}
- --udp-services-configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.fullname" . }}-udp - --udp-services-configmap={{ default "$(POD_NAMESPACE)" .Values.controller.udp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-udp
{{- end }} {{- end }}
{{- if .Values.controller.scope.enabled }} {{- if .Values.controller.scope.enabled }}
- --watch-namespace={{ default "$(POD_NAMESPACE)" .Values.controller.scope.namespace }} - --watch-namespace={{ default "$(POD_NAMESPACE)" .Values.controller.scope.namespace }}

6
charts/ingress-nginx/templates/controller-deployment.yaml
View file

@ -85,12 +85,12 @@ spec:
{{- end }} {{- end }}
- --election-id={{ .Values.controller.electionID }} - --election-id={{ .Values.controller.electionID }}
- --ingress-class={{ .Values.controller.ingressClass }} - --ingress-class={{ .Values.controller.ingressClass }}
- --configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.controller.fullname" . }} - --configmap={{ default "$(POD_NAMESPACE)" .Values.controller.configMapNamespace }}/{{ include "ingress-nginx.controller.fullname" . }}
{{- if .Values.tcp }} {{- if .Values.tcp }}
- --tcp-services-configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.fullname" . }}-tcp - --tcp-services-configmap={{ default "$(POD_NAMESPACE)" .Values.controller.tcp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
{{- end }} {{- end }}
{{- if .Values.udp }} {{- if .Values.udp }}
- --udp-services-configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.fullname" . }}-udp - --udp-services-configmap={{ default "$(POD_NAMESPACE)" .Values.controller.udp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-udp
{{- end }} {{- end }}
{{- if .Values.controller.scope.enabled }} {{- if .Values.controller.scope.enabled }}
- --watch-namespace={{ default "$(POD_NAMESPACE)" .Values.controller.scope.namespace }} - --watch-namespace={{ default "$(POD_NAMESPACE)" .Values.controller.scope.namespace }}

8
charts/ingress-nginx/values.yaml
View file

@ -121,23 +121,23 @@ controller:
## ##
scope: scope:
enabled: false enabled: false
namespace: "" # defaults to .Release.Namespace namespace: "" # defaults to $(POD_NAMESPACE)
## Allows customization of the configmap / nginx-configmap namespace ## Allows customization of the configmap / nginx-configmap namespace
## ##
configMapNamespace: "" # defaults to .Release.Namespace configMapNamespace: "" # defaults to $(POD_NAMESPACE)
## Allows customization of the tcp-services-configmap ## Allows customization of the tcp-services-configmap
## ##
tcp: tcp:
configMapNamespace: "" # defaults to .Release.Namespace configMapNamespace: "" # defaults to $(POD_NAMESPACE)
## Annotations to be added to the tcp config configmap ## Annotations to be added to the tcp config configmap
annotations: {} annotations: {}
## Allows customization of the udp-services-configmap ## Allows customization of the udp-services-configmap
## ##
udp: udp:
configMapNamespace: "" # defaults to .Release.Namespace configMapNamespace: "" # defaults to $(POD_NAMESPACE)
## Annotations to be added to the udp config configmap ## Annotations to be added to the udp config configmap
annotations: {} annotations: {}