home/charts
2
0
Fork 0
mirror of https://github.com/wahyd4/charts.git synced 2026-08-20 10:35:57 +10:00
Code Issues Packages Projects Releases Wiki Activity

Delete semver comparisons

Browse Source
This commit is contained in:
tompizmor
2018-09-28 17:13:07 +02:00
parent 068716500c
commit 335c370e8e
3 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/nginx-ingress-controller/Chart.yaml
+1 -1
View File
@@ -1,5 +1,5 @@
name: nginx-ingress-controller
version: 1.0.0
version: 2.0.0
appVersion: 0.18.0
description: Chart for the nginx Ingress controller
keywords:
bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml
+6 -17
View File
@@ -42,6 +42,9 @@ spec:
{{- if .Values.priorityClassName }}
priorityClassName: "{{ .Values.priorityClassName }}"
{{- end }}
securityContext:
fsGroup: {{ .Values.securityContext.fsGroup }}
runAsUser: {{ .Values.securityContext.runAsUser }}
containers:
- name: {{ template "nginx-ingress.name" . }}-{{ .Values.name }}
image: "{{ template "nginx-ingress-controller.image" . }}"
@@ -53,20 +56,12 @@ spec:
args:
- /nginx-ingress-controller
- --default-backend-service={{ if .Values.defaultBackend.enabled }}{{ .Release.Namespace }}/{{ template "nginx-ingress.defaultBackend.fullname" . }}{{ else }}{{ .Values.defaultBackendService }}{{ end }}
{{- if and (semverCompare ">=0.9.0-beta.1" .Values.image.tag) .Values.publishService.enabled }}
{{- if .Values.publishService.enabled }}
- --publish-service={{ template "nginx-ingress.publishServicePath" . }}
{{- end }}
{{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }}
- --election-id={{ .Values.electionID }}
{{- end }}
{{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }}
- --ingress-class={{ .Values.ingressClass }}
{{- end }}
{{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }}
- --configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }}
{{- else }}
- --nginx-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }}
{{- end }}
{{- if .Values.tcp }}
- --tcp-services-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }}-tcp
{{- end }}
@@ -83,16 +78,10 @@ spec:
- --{{ $key }}
{{- end }}
{{- end }}
{{- if (semverCompare ">=0.16.0" .Values.image.tag) }}
securityContext:
capabilities:
drop:
- ALL
add:
- NET_BIND_SERVICE
fsGroup: {{ .Values.securityContext.fsGroup }}
runAsUser: {{ .Values.securityContext.runAsUser }}
{{- end }}
drop: ["ALL"]
add: ["NET_BIND_SERVICE"]
env:
- name: POD_NAME
valueFrom:
bitnami/nginx-ingress-controller/templates/controller-deployment.yaml
+6 -17
View File
@@ -42,6 +42,9 @@ spec:
{{- if .Values.priorityClassName }}
priorityClassName: "{{ .Values.priorityClassName }}"
{{- end }}
securityContext:
fsGroup: {{ .Values.securityContext.fsGroup }}
runAsUser: {{ .Values.securityContext.runAsUser }}
containers:
- name: {{ template "nginx-ingress.name" . }}-{{ .Values.name }}
image: "{{ template "nginx-ingress-controller.image" . }}"
@@ -53,20 +56,12 @@ spec:
args:
- /nginx-ingress-controller
- --default-backend-service={{ if .Values.defaultBackend.enabled }}{{ .Release.Namespace }}/{{ template "nginx-ingress.defaultBackend.fullname" . }}{{ else }}{{ .Values.defaultBackendService }}{{ end }}
{{- if and (semverCompare ">=0.9.0-beta.1" .Values.image.tag) .Values.publishService.enabled }}
{{- if .Values.publishService.enabled }}
- --publish-service={{ template "nginx-ingress.publishServicePath" . }}
{{- end }}
{{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }}
- --election-id={{ .Values.electionID }}
{{- end }}
{{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }}
- --ingress-class={{ .Values.ingressClass }}
{{- end }}
{{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }}
- --configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }}
{{- else }}
- --nginx-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }}
{{- end }}
{{- if .Values.tcp }}
- --tcp-services-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }}-tcp
{{- end }}
@@ -83,16 +78,10 @@ spec:
- --{{ $key }}
{{- end }}
{{- end }}
{{- if (semverCompare ">=0.16.0" .Values.image.tag) }}
securityContext:
capabilities:
drop:
- ALL
add:
- NET_BIND_SERVICE
fsGroup: {{ .Values.securityContext.fsGroup }}
runAsUser: {{ .Values.securityContext.runAsUser }}
{{- end }}
drop: ["ALL"]
add: ["NET_BIND_SERVICE"]
env:
- name: POD_NAME
valueFrom: