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

Merge pull request #6203 from aledbf/false

Browse source 
Refactor key/value parsing
This commit is contained in:
Kubernetes Prow Robot 2020-09-21 10:20:31 -07:00 committed by GitHub
commit 701ad4e077
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/ingress-nginx/Chart.yaml
View file

@ -1,6 +1,6 @@
apiVersion: v1 apiVersion: v1
name: ingress-nginx name: ingress-nginx
version: 3.2.0 version: 3.3.0
appVersion: 0.35.0 appVersion: 0.35.0
home: https://github.com/kubernetes/ingress-nginx home: https://github.com/kubernetes/ingress-nginx
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer

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

@ -102,10 +102,11 @@ spec:
- --health-check-path={{ .Values.controller.healthCheckPath }} - --health-check-path={{ .Values.controller.healthCheckPath }}
{{- end }} {{- end }}
{{- range $key, $value := .Values.controller.extraArgs }} {{- range $key, $value := .Values.controller.extraArgs }}
{{- if $value }} {{- /* Accept keys without values or with false as value */}}
- --{{ $key }}={{ $value }} {{- if eq ($value | quote | len) 2 }}
{{- else }}
- --{{ $key }} - --{{ $key }}
{{- else }}
- --{{ $key }}={{ $value }}
{{- end }} {{- end }}
{{- end }} {{- end }}
securityContext: securityContext:

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

@ -106,10 +106,11 @@ spec:
- --health-check-path={{ .Values.controller.healthCheckPath }} - --health-check-path={{ .Values.controller.healthCheckPath }}
{{- end }} {{- end }}
{{- range $key, $value := .Values.controller.extraArgs }} {{- range $key, $value := .Values.controller.extraArgs }}
{{- if $value }} {{- /* Accept keys without values or with false as value */}}
- --{{ $key }}={{ $value }} {{- if eq ($value | quote | len) 2 }}
{{- else }}
- --{{ $key }} - --{{ $key }}
{{- else }}
- --{{ $key }}={{ $value }}
{{- end }} {{- end }}
{{- end }} {{- end }}
securityContext: securityContext:

7
charts/ingress-nginx/templates/default-backend-deployment.yaml
View file

@ -43,10 +43,11 @@ spec:
{{- if .Values.defaultBackend.extraArgs }} {{- if .Values.defaultBackend.extraArgs }}
args: args:
{{- range $key, $value := .Values.defaultBackend.extraArgs }} {{- range $key, $value := .Values.defaultBackend.extraArgs }}
{{- if $value }} {{- /* Accept keys without values or with false as value */}}
- --{{ $key }}={{ $value }} {{- if eq ($value | quote | len) 2 }}
{{- else }}
- --{{ $key }} - --{{ $key }}
{{- else }}
- --{{ $key }}={{ $value }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}