Remove checks for older versions

kubernetes · Mar 13, 2020 · 9f3fbc3 · 9f3fbc3
1 parent c37e792
commit 9f3fbc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 37 deletions.
diff --git a/charts/ingress-nginx/templates/controller-daemonset.yaml b/charts/ingress-nginx/templates/controller-daemonset.yaml
@@ -55,27 +55,13 @@ spec:
             - /nginx-ingress-controller
           {{- if .Values.defaultBackend.enabled }}
             - --default-backend-service={{ .Release.Namespace }}/{{ include "ingress-nginx.defaultBackend.fullname" . }}
-          {{- else }}
-            {{- if (semverCompare "<0.21.0" .Values.controller.image.tag) }}
-            - --default-backend-service={{ required ".Values.controller.defaultBackendService is required if .Values.defaultBackend.enabled=false and .Values.controller.image.tag < 0.21.0" .Values.controller.defaultBackendService }}
-            {{- else if .Values.controller.defaultBackendService }}
-            - --default-backend-service={{ .Values.controller.defaultBackendService }}
-            {{- end }}
           {{- end }}
-          {{- if and (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) .Values.controller.publishService.enabled }}
+          {{- if .Values.controller.publishService.enabled }}
             - --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }}
           {{- end }}
-          {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
             - --election-id={{ .Values.controller.electionID }}
-          {{- end }}
-          {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
             - --ingress-class={{ .Values.controller.ingressClass }}
-          {{- end }}
-          {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
             - --configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.controller.fullname" . }}
-          {{- else }}
-            - --nginx-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.controller.fullname" . }}
-          {{- end }}
           {{- if .Values.tcp }}
             - --tcp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
           {{- end }}
@@ -103,7 +89,6 @@ spec:
             - --{{ $key }}
             {{- end }}
           {{- end }}
-        {{- if (semverCompare ">=0.16.0" .Values.controller.image.tag) }}
           securityContext:
             capabilities:
                 drop:
@@ -112,7 +97,6 @@ spec:
                 - NET_BIND_SERVICE
             runAsUser: {{ .Values.controller.image.runAsUser }}
             allowPrivilegeEscalation: {{ .Values.controller.image.allowPrivilegeEscalation }}
-        {{- end }}
           env:
             - name: POD_NAME
               valueFrom:

diff --git a/charts/ingress-nginx/templates/controller-deployment.yaml b/charts/ingress-nginx/templates/controller-deployment.yaml
@@ -58,32 +58,18 @@ spec:
             - /nginx-ingress-controller
           {{- if .Values.defaultBackend.enabled }}
             - --default-backend-service={{ .Release.Namespace }}/{{ include "ingress-nginx.defaultBackend.fullname" . }}
-          {{- else }}
-            {{- if (semverCompare "<0.21.0" .Values.controller.image.tag) }}
-            - --default-backend-service={{ required ".Values.controller.defaultBackendService is required if .Values.defaultBackend.enabled=false and .Values.controller.image.tag < 0.21.0" .Values.controller.defaultBackendService }}
-            {{- else if .Values.controller.defaultBackendService }}
-            - --default-backend-service={{ .Values.controller.defaultBackendService }}
-            {{- end }}
           {{- end }}
-          {{- if and (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) .Values.controller.publishService.enabled }}
+          {{- if .Values.controller.publishService.enabled }}
             - --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }}
           {{- end }}
-          {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
             - --election-id={{ .Values.controller.electionID }}
-          {{- end }}
-          {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
             - --ingress-class={{ .Values.controller.ingressClass }}
-          {{- end }}
-          {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
-            - --configmap={{ default .Release.Namespace .Values.controller.configMapNamespace }}/{{ include "ingress-nginx.controller.fullname" . }}
-          {{- else }}
-            - --nginx-configmap={{ default .Release.Namespace .Values.controller.configMapNamespace }}/{{ include "ingress-nginx.controller.fullname" . }}
-          {{- end }}
+            - --configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.controller.fullname" . }}
           {{- if .Values.tcp }}
-            - --tcp-services-configmap={{ default .Release.Namespace .Values.controller.tcp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
+            - --tcp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
           {{- end }}
           {{- if .Values.udp }}
-            - --udp-services-configmap={{ default .Release.Namespace .Values.controller.udp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-udp
+            - --udp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-udp
           {{- end }}
           {{- if .Values.controller.scope.enabled }}
             - --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }}
@@ -106,7 +92,6 @@ spec:
             - --{{ $key }}
             {{- end }}
           {{- end }}
-        {{- if (semverCompare ">=0.16.0" .Values.controller.image.tag) }}
           securityContext:
             capabilities:
                 drop:
@@ -115,7 +100,6 @@ spec:
                 - NET_BIND_SERVICE
             runAsUser: {{ .Values.controller.image.runAsUser }}
             allowPrivilegeEscalation: {{ .Values.controller.image.allowPrivilegeEscalation }}
-        {{- end }}
           env:
             - name: POD_NAME
               valueFrom: