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

Cleanup chart code

Browse source
This commit is contained in:
ChiefAlexander 2020-03-02 08:49:26 -06:00
parent 103eb067f2
commit 388a499533
No known key found for this signature in database
GPG key ID: 0FF2F4C67F06A1AC
38 changed files with 403 additions and 446 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
charts/ingress-nginx/templates/_helpers.tpl
View file

@ -114,6 +114,17 @@ Return the appropriate apiVersion for deployment.
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{/*
Return the appropriate apiVersion for daemonset.
*/}}
{{- define "daemonset.apiVersion" -}}
{{- if semverCompare ">=1.9-0" .Capabilities.KubeVersion.GitVersion -}}
{{- print "apps/v1" -}}
{{- else -}}
{{- print "v1/beta2" -}}
{{- end -}}
{{- end -}}
{{/* {{/*
Return the appropriate apiGroup for PodSecurityPolicy. Return the appropriate apiGroup for PodSecurityPolicy.
*/}} */}}

6
charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml
View file

@ -1,8 +1,8 @@
{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled }} {{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled -}}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
annotations: annotations:
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@ -22,6 +22,6 @@ rules:
resources: ['podsecuritypolicies'] resources: ['podsecuritypolicies']
verbs: ['use'] verbs: ['use']
resourceNames: resourceNames:
- {{ include "ingress-nginx.fullname" . }}-admission - {{ template "ingress-nginx.fullname" . }}-admission
{{- end }} {{- end }}
{{- end }} {{- end }}

8
charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
View file

@ -1,8 +1,8 @@
{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled }} {{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled -}}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
annotations: annotations:
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@ -12,9 +12,9 @@ metadata:
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end }} {{- end }}

24
charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
View file

@ -1,8 +1,8 @@
{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled }} {{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled -}}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission-create name: {{ template "ingress-nginx.fullname" . }}-admission-create
annotations: annotations:
"helm.sh/hook": pre-install,pre-upgrade "helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@ -10,17 +10,16 @@ metadata:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
{{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }} {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
# Alpha feature since k8s 1.12 # Alpha feature since k8s 1.12
ttlSecondsAfterFinished: 0 ttlSecondsAfterFinished: 0
{{- end }} {{- end }}
template: template:
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission-create name: {{ template "ingress-nginx.fullname" . }}-admission-create
{{- with .Values.controller.admissionWebhooks.patch.podAnnotations }} {{- if .Values.controller.admissionWebhooks.patch.podAnnotations }}
annotations: annotations: {{ toYaml .Values.controller.admissionWebhooks.patch.podAnnotations | nindent 8 }}
{{ toYaml . | indent 8 }} {{- end }}
{{- end }}
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 8 }} {{- include "ingress-nginx.labels" . | nindent 8 }}
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
@ -38,10 +37,9 @@ spec:
- --namespace={{ .Release.Namespace }} - --namespace={{ .Release.Namespace }}
- --secret-name={{ template "ingress-nginx.fullname". }}-admission - --secret-name={{ template "ingress-nginx.fullname". }}-admission
restartPolicy: OnFailure restartPolicy: OnFailure
serviceAccountName: {{ include "ingress-nginx.fullname" . }}-admission serviceAccountName: {{ template "ingress-nginx.fullname" . }}-admission
{{- with .Values.controller.admissionWebhooks.patch.nodeSelector }} {{- if .Values.controller.admissionWebhooks.patch.nodeSelector }}
nodeSelector: nodeSelector: {{ toYaml .Values.controller.admissionWebhooks.patch.nodeSelector | nindent 8 }}
{{ toYaml . | indent 8 }}
{{- end }} {{- end }}
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true

26
charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
View file

@ -1,8 +1,8 @@
{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled }} {{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled -}}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission-patch name: {{ template "ingress-nginx.fullname" . }}-admission-patch
annotations: annotations:
"helm.sh/hook": post-install,post-upgrade "helm.sh/hook": post-install,post-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@ -10,17 +10,16 @@ metadata:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
{{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }} {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
# Alpha feature since k8s 1.12 # Alpha feature since k8s 1.12
ttlSecondsAfterFinished: 0 ttlSecondsAfterFinished: 0
{{- end }} {{- end }}
template: template:
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission-patch name: {{ template "ingress-nginx.fullname" . }}-admission-patch
{{- with .Values.controller.admissionWebhooks.patch.podAnnotations }} {{- if .Values.controller.admissionWebhooks.patch.podAnnotations }}
annotations: annotations: {{ toYaml .Values.controller.admissionWebhooks.patch.podAnnotations | nindent 8 }}
{{ toYaml . | indent 8 }} {{- end }}
{{- end }}
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 8 }} {{- include "ingress-nginx.labels" . | nindent 8 }}
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
@ -34,16 +33,15 @@ spec:
imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.pullPolicy }} imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.pullPolicy }}
args: args:
- patch - patch
- --webhook-name={{ include "ingress-nginx.fullname" . }}-admission - --webhook-name={{ template "ingress-nginx.fullname" . }}-admission
- --namespace={{ .Release.Namespace }} - --namespace={{ .Release.Namespace }}
- --patch-mutating=false - --patch-mutating=false
- --secret-name={{ template "ingress-nginx.fullname". }}-admission - --secret-name={{ template "ingress-nginx.fullname". }}-admission
- --patch-failure-policy={{ .Values.controller.admissionWebhooks.failurePolicy }} - --patch-failure-policy={{ .Values.controller.admissionWebhooks.failurePolicy }}
restartPolicy: OnFailure restartPolicy: OnFailure
serviceAccountName: {{ include "ingress-nginx.fullname" . }}-admission serviceAccountName: {{ template "ingress-nginx.fullname" . }}-admission
{{- with .Values.controller.admissionWebhooks.patch.nodeSelector }} {{- if .Values.controller.admissionWebhooks.patch.nodeSelector }}
nodeSelector: nodeSelector: {{ toYaml .Values.controller.admissionWebhooks.patch.nodeSelector | nindent 8 }}
{{ toYaml . | indent 8 }}
{{- end }} {{- end }}
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true

4
charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml
View file

@ -1,8 +1,8 @@
{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled .Values.podSecurityPolicy.enabled }} {{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled .Values.podSecurityPolicy.enabled -}}
apiVersion: policy/v1beta1 apiVersion: policy/v1beta1
kind: PodSecurityPolicy kind: PodSecurityPolicy
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
annotations: annotations:
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded

4
charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml
View file

@ -1,8 +1,8 @@
{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled }} {{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled -}}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
annotations: annotations:
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded

8
charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml
View file

@ -1,8 +1,8 @@
{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled }} {{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled -}}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
annotations: annotations:
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
@ -12,9 +12,9 @@ metadata:
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end }} {{- end }}

4
charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
View file

@ -1,8 +1,8 @@
{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled }} {{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled -}}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
annotations: annotations:
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded

4
charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
View file

@ -1,11 +1,11 @@
{{- if .Values.controller.admissionWebhooks.enabled }} {{- if .Values.controller.admissionWebhooks.enabled -}}
apiVersion: admissionregistration.k8s.io/v1beta1 apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
name: {{ include "ingress-nginx.fullname" . }}-admission name: {{ template "ingress-nginx.fullname" . }}-admission
webhooks: webhooks:
- name: validate.nginx.ingress.kubernetes.io - name: validate.nginx.ingress.kubernetes.io
rules: rules:

4
charts/ingress-nginx/templates/clusterrole.yaml
View file

@ -1,4 +1,4 @@
{{- if and (.Values.rbac.create) (not .Values.rbac.scope) -}} {{- if and .Values.rbac.create (not .Values.rbac.scope) -}}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
@ -65,4 +65,4 @@ rules:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
{{- end -}} {{- end }}

8
charts/ingress-nginx/templates/clusterrolebinding.yaml
View file

@ -1,16 +1,16 @@
{{- if and (.Values.rbac.create) (not .Values.rbac.scope) -}} {{- if and .Values.rbac.create (not .Values.rbac.scope) -}}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
name: {{ include "ingress-nginx.fullname" . }} name: {{ template "ingress-nginx.fullname" . }}
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: {{ include "ingress-nginx.fullname" . }} name: {{ template "ingress-nginx.fullname" . }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "ingress-nginx.serviceAccountName" . }} name: {{ template "ingress-nginx.serviceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end -}} {{- end }}

5
charts/ingress-nginx/templates/addheaders-configmap.yaml → charts/ingress-nginx/templates/controller-configmap-addheaders.yaml
View file

@ -1,4 +1,4 @@
{{- if .Values.controller.addHeaders }} {{- if .Values.controller.addHeaders -}}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -6,6 +6,5 @@ metadata:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
name: {{ include "ingress-nginx.fullname" . }}-custom-add-headers name: {{ include "ingress-nginx.fullname" . }}-custom-add-headers
data: data: {{ toYaml .Values.controller.addHeaders | nindent 2 }}
{{ toYaml .Values.controller.addHeaders | indent 2 }}
{{- end }} {{- end }}

2
charts/ingress-nginx/templates/proxyheaders-configmap.yaml → charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml
View file

@ -1,4 +1,4 @@
{{- if or .Values.controller.proxySetHeaders .Values.controller.headers }} {{- if or .Values.controller.proxySetHeaders .Values.controller.headers -}}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:

12
charts/ingress-nginx/templates/tcp-configmap.yaml → charts/ingress-nginx/templates/controller-configmap-tcp.yaml
View file

@ -1,13 +1,13 @@
{{- if .Values.tcp }} {{- if .Values.tcp -}}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
annotations: {{- if .Values.controller.tcp.annotations }}
{{ toYaml .Values.controller.tcp.annotations | indent 4}} annotations: {{ toYaml .Values.controller.tcp.annotations | nindent 4 }}
name: {{ include "ingress-nginx.fullname" . }}-tcp {{- end }}
data: name: {{ include "ingress-nginx.fullname" . }}-tcp
{{ tpl (toYaml .Values.tcp) . | indent 2 }} data: {{ tpl (toYaml .Values.tcp) . | nindent 2 }}
{{- end }} {{- end }}

12
charts/ingress-nginx/templates/udp-configmap.yaml → charts/ingress-nginx/templates/controller-configmap-udp.yaml
View file

@ -1,13 +1,13 @@
{{- if .Values.udp }} {{- if .Values.udp -}}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
annotations: {{- if .Values.controller.udp.annotations }}
{{ toYaml .Values.controller.udp.annotations | indent 4}} annotations: {{ toYaml .Values.controller.udp.annotations | nindent 4 }}
name: {{ include "ingress-nginx.fullname" . }}-udp {{- end }}
data: name: {{ include "ingress-nginx.fullname" . }}-udp
{{ tpl (toYaml .Values.udp) . | indent 2 }} data: {{ tpl (toYaml .Values.udp) . | nindent 2 }}
{{- end }} {{- end }}

9
charts/ingress-nginx/templates/controller-configmap.yaml
View file

@ -1,12 +1,13 @@
{{- if or .Values.controller.config (or (or .Values.controller.proxySetHeaders .Values.controller.headers) .Values.controller.addHeaders) }} {{- if or .Values.controller.config (or (or .Values.controller.proxySetHeaders .Values.controller.headers) .Values.controller.addHeaders) -}}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
annotations: {{- if .Values.controller.configAnnotations }}
{{ toYaml .Values.controller.configAnnotations | indent 4}} annotations: {{ toYaml .Values.controller.configAnnotations | nindent 4 }}
{{- end }}
name: {{ template "ingress-nginx.controller.fullname" . }} name: {{ template "ingress-nginx.controller.fullname" . }}
data: data:
{{- if .Values.controller.addHeaders }} {{- if .Values.controller.addHeaders }}
@ -16,6 +17,6 @@ data:
proxy-set-headers: {{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-custom-proxy-headers proxy-set-headers: {{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-custom-proxy-headers
{{- end }} {{- end }}
{{- if .Values.controller.config }} {{- if .Values.controller.config }}
{{ toYaml .Values.controller.config | indent 2 }} {{ toYaml .Values.controller.config | nindent 2 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

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

@ -1,62 +1,55 @@
{{- if or (eq .Values.controller.kind "DaemonSet") (eq .Values.controller.kind "Both") }} {{- if or (eq .Values.controller.kind "DaemonSet") (eq .Values.controller.kind "Both") -}}
{{- $useHostPort := .Values.controller.daemonset.useHostPort -}} apiVersion: {{ template "daemonset.apiVersion" . }}
{{- $hostPorts := .Values.controller.daemonset.hostPorts -}}
apiVersion: {{ template "deployment.apiVersion" . }}
kind: DaemonSet kind: DaemonSet
metadata: metadata:
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
name: {{ template "ingress-nginx.controller.fullname" . }} name: {{ template "ingress-nginx.controller.fullname" . }}
annotations: {{- if .Values.controller.daemonsetAnnotations }}
{{ toYaml .Values.controller.deploymentAnnotations | indent 4}} annotations: {{ toYaml .Values.controller.daemonsetAnnotations | nindent 4 }}
{{- end }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{- include "ingress-nginx.selectorLabels" . | nindent 6 }} {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
updateStrategy: {{- if .Values.controller.updateStrategy }}
{{ toYaml .Values.controller.updateStrategy | indent 4 }} updateStrategy: {{ toYaml .Values.controller.updateStrategy | nindent 4 }}
{{- end }}
minReadySeconds: {{ .Values.controller.minReadySeconds }} minReadySeconds: {{ .Values.controller.minReadySeconds }}
template: template:
metadata: metadata:
{{- if .Values.controller.podAnnotations }} {{- if .Values.controller.podAnnotations }}
annotations: annotations: {{ toYaml .Values.controller.podAnnotations | nindent 8 }}
{{- range $key, $value := .Values.controller.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
labels: labels:
{{- include "ingress-nginx.selectorLabels" . | nindent 8 }} {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
{{- if .Values.controller.podLabels }} {{- if .Values.controller.podLabels }}
{{ toYaml .Values.controller.podLabels | indent 8}} {{- toYaml .Values.controller.podLabels | nindent 8 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.controller.dnsConfig }} {{- if .Values.controller.dnsConfig }}
dnsConfig: dnsConfig: {{ toYaml .Values.controller.dnsConfig | nindent 8 }}
{{ toYaml .Values.controller.dnsConfig | indent 8 }} {{- end }}
{{- end }}
dnsPolicy: {{ .Values.controller.dnsPolicy }} dnsPolicy: {{ .Values.controller.dnsPolicy }}
{{- if .Values.imagePullSecrets }} {{- if .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 8 }}
{{ toYaml .Values.imagePullSecrets | indent 8 }} {{- end }}
{{- if .Values.controller.priorityClassName }}
priorityClassName: {{ .Values.controller.priorityClassName }}
{{- end }} {{- end }}
{{- if .Values.controller.priorityClassName }}
priorityClassName: "{{ .Values.controller.priorityClassName }}"
{{- end }}
{{- if .Values.controller.podSecurityContext }} {{- if .Values.controller.podSecurityContext }}
securityContext: securityContext: {{ toYaml .Values.controller.podSecurityContext | nindent 8 }}
{{ toYaml .Values.controller.podSecurityContext | indent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: {{ template "ingress-nginx.name" . }}-{{ .Values.controller.name }} - name: {{ template "ingress-nginx.name" . }}-{{ .Values.controller.name }}
image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}" image: {{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}
imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}" imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
{{- if .Values.controller.lifecycle }} {{- if .Values.controller.lifecycle }}
lifecycle: lifecycle: {{ toYaml .Values.controller.lifecycle | nindent 12 }}
{{ toYaml .Values.controller.lifecycle | indent 12 }}
{{- end }} {{- end }}
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
@ -92,7 +85,7 @@ spec:
{{- if .Values.controller.scope.enabled }} {{- if .Values.controller.scope.enabled }}
- --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }} - --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }}
{{- end }} {{- end }}
{{- if and (.Values.controller.reportNodeInternalIp) (.Values.controller.hostNetwork)}} {{- if and .Values.controller.reportNodeInternalIp .Values.controller.hostNetwork }}
- --report-node-internal-ip-address={{ .Values.controller.reportNodeInternalIp }} - --report-node-internal-ip-address={{ .Values.controller.reportNodeInternalIp }}
{{- end }} {{- end }}
{{- if .Values.controller.admissionWebhooks.enabled }} {{- if .Values.controller.admissionWebhooks.enabled }}
@ -130,7 +123,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
{{- if .Values.controller.extraEnvs }} {{- if .Values.controller.extraEnvs }}
{{ toYaml .Values.controller.extraEnvs | indent 12 }} {{- toYaml .Values.controller.extraEnvs | nindent 12 }}
{{- end }} {{- end }}
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -142,13 +135,23 @@ spec:
timeoutSeconds: {{ .Values.controller.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.controller.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.livenessProbe.successThreshold }} successThreshold: {{ .Values.controller.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.controller.livenessProbe.failureThreshold }}
readinessProbe:
httpGet:
path: /healthz
port: {{ .Values.controller.readinessProbe.port }}
scheme: HTTP
initialDelaySeconds: {{ .Values.controller.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.controller.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
ports: ports:
{{- range $key, $value := .Values.controller.containerPort }} {{- range $key, $value := .Values.controller.containerPort }}
- name: {{ $key }} - name: {{ $key }}
containerPort: {{ $value }} containerPort: {{ $value }}
protocol: TCP protocol: TCP
{{- if $useHostPort }} {{- if $.Values.controller.daemonset.useHostPort }}
hostPort: {{ index $hostPorts $key | default $value }} hostPort: {{ index $.Values.controller.daemonset.hostPorts $key | default $value }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.controller.metrics.enabled }} {{- if .Values.controller.metrics.enabled }}
@ -162,88 +165,77 @@ spec:
protocol: TCP protocol: TCP
{{- end }} {{- end }}
{{- range $key, $value := .Values.tcp }} {{- range $key, $value := .Values.tcp }}
- name: "{{ $key }}-tcp" - name: {{ $key }}-tcp
containerPort: {{ $key }} containerPort: {{ $key }}
protocol: TCP protocol: TCP
{{- if $useHostPort }} {{- if $.Values.controller.daemonset.useHostPort }}
hostPort: {{ $key }} hostPort: {{ $key }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- range $key, $value := .Values.udp }} {{- range $key, $value := .Values.udp }}
- name: "{{ $key }}-udp" - name: {{ $key }}-udp
containerPort: {{ $key }} containerPort: {{ $key }}
protocol: UDP protocol: UDP
{{- if $useHostPort }} {{- if $.Values.controller.daemonset.useHostPort }}
hostPort: {{ $key }} hostPort: {{ $key }}
{{- end }} {{- end }}
{{- end }} {{- end }}
readinessProbe: {{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled) }}
httpGet:
path: /healthz
port: {{ .Values.controller.readinessProbe.port }}
scheme: HTTP
initialDelaySeconds: {{ .Values.controller.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.controller.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
{{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled) }}
volumeMounts: volumeMounts:
{{- end }} {{- if .Values.controller.customTemplate.configMapName }}
{{- if .Values.controller.customTemplate.configMapName }}
- mountPath: /etc/nginx/template - mountPath: /etc/nginx/template
name: nginx-template-volume name: nginx-template-volume
readOnly: true readOnly: true
{{- end }} {{- end }}
{{- if .Values.controller.admissionWebhooks.enabled }} {{- if .Values.controller.admissionWebhooks.enabled }}
- name: webhook-cert - name: webhook-cert
mountPath: "/usr/local/certificates/" mountPath: /usr/local/certificates/
readOnly: true readOnly: true
{{- end }} {{- end }}
{{- if .Values.controller.extraVolumeMounts }} {{- if .Values.controller.extraVolumeMounts }}
{{ toYaml .Values.controller.extraVolumeMounts | indent 12}} {{- toYaml .Values.controller.extraVolumeMounts | nindent 12 }}
{{- end }} {{- end }}
resources: {{- end }}
{{ toYaml .Values.controller.resources | indent 12 }} {{- if .Values.controller.resources }}
{{- if .Values.controller.extraContainers }} resources: {{ toYaml .Values.controller.resources | nindent 12 }}
{{ toYaml .Values.controller.extraContainers | indent 8}} {{- end }}
{{- end }} {{- if .Values.controller.extraContainers }}
{{- if .Values.controller.extraInitContainers }} {{ toYaml .Values.controller.extraContainers | nindent 8 }}
initContainers: {{- end }}
{{ toYaml .Values.controller.extraInitContainers | indent 8}} {{- if .Values.controller.extraInitContainers }}
{{- end }} initContainers: {{ toYaml .Values.controller.extraInitContainers | nindent 8 }}
{{- end }}
{{- if .Values.controller.hostNetwork }}
hostNetwork: {{ .Values.controller.hostNetwork }} hostNetwork: {{ .Values.controller.hostNetwork }}
{{- end }}
{{- if .Values.controller.nodeSelector }} {{- if .Values.controller.nodeSelector }}
nodeSelector: nodeSelector: {{ toYaml .Values.controller.nodeSelector | nindent 8 }}
{{ toYaml .Values.controller.nodeSelector | indent 8 }}
{{- end }} {{- end }}
{{- if .Values.controller.tolerations }} {{- if .Values.controller.tolerations }}
tolerations: tolerations: {{ toYaml .Values.controller.tolerations | nindent 8 }}
{{ toYaml .Values.controller.tolerations | indent 8 }}
{{- end }} {{- end }}
{{- if .Values.controller.affinity }} {{- if .Values.controller.affinity }}
affinity: affinity: {{ toYaml .Values.controller.affinity | nindent 8 }}
{{ toYaml .Values.controller.affinity | indent 8 }}
{{- end }} {{- end }}
serviceAccountName: {{ template "ingress-nginx.serviceAccountName" . }} serviceAccountName: {{ template "ingress-nginx.serviceAccountName" . }}
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
{{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled .Values.controller.extraVolumes) }} {{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled .Values.controller.extraVolumes) }}
volumes: volumes:
{{- end }} {{- if .Values.controller.customTemplate.configMapName }}
{{- if .Values.controller.customTemplate.configMapName }}
- name: nginx-template-volume - name: nginx-template-volume
configMap: configMap:
name: {{ .Values.controller.customTemplate.configMapName }} name: {{ .Values.controller.customTemplate.configMapName }}
items: items:
- key: {{ .Values.controller.customTemplate.configMapKey }} - key: {{ .Values.controller.customTemplate.configMapKey }}
path: nginx.tmpl path: nginx.tmpl
{{- end }} {{- end }}
{{- if .Values.controller.admissionWebhooks.enabled }} {{- if .Values.controller.admissionWebhooks.enabled }}
- name: webhook-cert - name: webhook-cert
secret: secret:
secretName: {{ template "ingress-nginx.fullname". }}-admission secretName: {{ template "ingress-nginx.fullname". }}-admission
{{- end }} {{- end }}
{{- if .Values.controller.extraVolumes }} {{- if .Values.controller.extraVolumes }}
{{ toYaml .Values.controller.extraVolumes | indent 8}} {{ toYaml .Values.controller.extraVolumes | nindent 8 }}
{{- end }} {{- end }}
{{- end }}
{{- end }} {{- end }}

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

@ -1,4 +1,4 @@
{{- if or (eq .Values.controller.kind "Deployment") (eq .Values.controller.kind "Both") }} {{- if or (eq .Values.controller.kind "Deployment") (eq .Values.controller.kind "Both") -}}
apiVersion: {{ template "deployment.apiVersion" . }} apiVersion: {{ template "deployment.apiVersion" . }}
kind: Deployment kind: Deployment
metadata: metadata:
@ -6,8 +6,9 @@ metadata:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
name: {{ template "ingress-nginx.controller.fullname" . }} name: {{ template "ingress-nginx.controller.fullname" . }}
annotations: {{- if .Values.controller.deploymentAnnotations }}
{{ toYaml .Values.controller.deploymentAnnotations | indent 4}} annotations: {{ toYaml .Values.controller.deploymentAnnotations | nindent 4 }}
{{- end }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
@ -17,47 +18,41 @@ spec:
replicas: {{ .Values.controller.replicaCount }} replicas: {{ .Values.controller.replicaCount }}
{{- end }} {{- end }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
strategy: {{- if .Values.controller.updateStrategy }}
{{ toYaml .Values.controller.updateStrategy | indent 4 }} strategy: {{ toYaml .Values.controller.updateStrategy | nindent 4 }}
{{- end }}
minReadySeconds: {{ .Values.controller.minReadySeconds }} minReadySeconds: {{ .Values.controller.minReadySeconds }}
template: template:
metadata: metadata:
{{- if .Values.controller.podAnnotations }} {{- if .Values.controller.podAnnotations }}
annotations: annotations: {{ toYaml .Values.controller.podAnnotations | nindent 8 }}
{{- range $key, $value := .Values.controller.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
labels: labels:
{{- include "ingress-nginx.selectorLabels" . | nindent 8 }} {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
{{- if .Values.controller.podLabels }} {{- if .Values.controller.podLabels }}
{{ toYaml .Values.controller.podLabels | indent 8 }} {{- toYaml .Values.controller.podLabels | nindent 8 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.controller.dnsConfig }} {{- if .Values.controller.dnsConfig }}
dnsConfig: dnsConfig: {{ toYaml .Values.controller.dnsConfig | nindent 8 }}
{{ toYaml .Values.controller.dnsConfig | indent 8 }} {{- end }}
{{- end }}
dnsPolicy: {{ .Values.controller.dnsPolicy }} dnsPolicy: {{ .Values.controller.dnsPolicy }}
{{- if .Values.imagePullSecrets }} {{- if .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 8 }}
{{ toYaml .Values.imagePullSecrets | indent 8 }} {{- end }}
{{- if .Values.controller.priorityClassName }}
priorityClassName: {{ .Values.controller.priorityClassName }}
{{- end }} {{- end }}
{{- if .Values.controller.priorityClassName }}
priorityClassName: "{{ .Values.controller.priorityClassName }}"
{{- end }}
{{- if .Values.controller.podSecurityContext }} {{- if .Values.controller.podSecurityContext }}
securityContext: securityContext: {{ toYaml .Values.controller.podSecurityContext | nindent 8 }}
{{ toYaml .Values.controller.podSecurityContext | indent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: {{ template "ingress-nginx.name" . }}-{{ .Values.controller.name }} - name: {{ template "ingress-nginx.name" . }}-{{ .Values.controller.name }}
image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}" image: {{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}
imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}" imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
{{- if .Values.controller.lifecycle }} {{- if .Values.controller.lifecycle }}
lifecycle: lifecycle: {{ toYaml .Values.controller.lifecycle | nindent 12 }}
{{ toYaml .Values.controller.lifecycle | indent 12 }}
{{- end }} {{- end }}
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
@ -93,7 +88,7 @@ spec:
{{- if .Values.controller.scope.enabled }} {{- if .Values.controller.scope.enabled }}
- --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }} - --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }}
{{- end }} {{- end }}
{{- if and (.Values.controller.reportNodeInternalIp) (.Values.controller.hostNetwork) }} {{- if and .Values.controller.reportNodeInternalIp .Values.controller.hostNetwork }}
- --report-node-internal-ip-address={{ .Values.controller.reportNodeInternalIp }} - --report-node-internal-ip-address={{ .Values.controller.reportNodeInternalIp }}
{{- end }} {{- end }}
{{- if .Values.controller.admissionWebhooks.enabled }} {{- if .Values.controller.admissionWebhooks.enabled }}
@ -131,7 +126,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
{{- if .Values.controller.extraEnvs }} {{- if .Values.controller.extraEnvs }}
{{ toYaml .Values.controller.extraEnvs | indent 12 }} {{- toYaml .Values.controller.extraEnvs | nindent 12 }}
{{- end }} {{- end }}
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -143,6 +138,16 @@ spec:
timeoutSeconds: {{ .Values.controller.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.controller.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.livenessProbe.successThreshold }} successThreshold: {{ .Values.controller.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.controller.livenessProbe.failureThreshold }}
readinessProbe:
httpGet:
path: /healthz
port: {{ .Values.controller.readinessProbe.port }}
scheme: HTTP
initialDelaySeconds: {{ .Values.controller.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.controller.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
ports: ports:
{{- range $key, $value := .Values.controller.containerPort }} {{- range $key, $value := .Values.controller.containerPort }}
- name: {{ $key }} - name: {{ $key }}
@ -160,82 +165,71 @@ spec:
protocol: TCP protocol: TCP
{{- end }} {{- end }}
{{- range $key, $value := .Values.tcp }} {{- range $key, $value := .Values.tcp }}
- name: "{{ $key }}-tcp" - name: {{ $key }}-tcp
containerPort: {{ $key }} containerPort: {{ $key }}
protocol: TCP protocol: TCP
{{- end }} {{- end }}
{{- range $key, $value := .Values.udp }} {{- range $key, $value := .Values.udp }}
- name: "{{ $key }}-udp" - name: {{ $key }}-udp
containerPort: {{ $key }} containerPort: {{ $key }}
protocol: UDP protocol: UDP
{{- end }} {{- end }}
readinessProbe: {{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled) }}
httpGet:
path: /healthz
port: {{ .Values.controller.readinessProbe.port }}
scheme: HTTP
initialDelaySeconds: {{ .Values.controller.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.controller.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
{{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled) }}
volumeMounts: volumeMounts:
{{- end }} {{- if .Values.controller.customTemplate.configMapName }}
{{- if .Values.controller.customTemplate.configMapName }}
- mountPath: /etc/nginx/template - mountPath: /etc/nginx/template
name: nginx-template-volume name: nginx-template-volume
readOnly: true readOnly: true
{{- end }} {{- end }}
{{- if .Values.controller.admissionWebhooks.enabled }} {{- if .Values.controller.admissionWebhooks.enabled }}
- name: webhook-cert - name: webhook-cert
mountPath: "/usr/local/certificates/" mountPath: /usr/local/certificates/
readOnly: true readOnly: true
{{- end }} {{- end }}
{{- if .Values.controller.extraVolumeMounts }} {{- if .Values.controller.extraVolumeMounts }}
{{ toYaml .Values.controller.extraVolumeMounts | indent 12}} {{- toYaml .Values.controller.extraVolumeMounts | nindent 12 }}
{{- end }} {{- end }}
resources: {{- end }}
{{ toYaml .Values.controller.resources | indent 12 }} {{- if .Values.controller.resources }}
{{- if .Values.controller.extraContainers }} resources: {{ toYaml .Values.controller.resources | nindent 12 }}
{{ toYaml .Values.controller.extraContainers | indent 8}} {{- end }}
{{- end }} {{- if .Values.controller.extraContainers }}
{{- if .Values.controller.extraInitContainers }} {{ toYaml .Values.controller.extraContainers | nindent 8 }}
initContainers: {{- end }}
{{ toYaml .Values.controller.extraInitContainers | indent 8}} {{- if .Values.controller.extraInitContainers }}
{{- end }} initContainers: {{ toYaml .Values.controller.extraInitContainers | nindent 8 }}
{{- end }}
{{- if .Values.controller.hostNetwork }}
hostNetwork: {{ .Values.controller.hostNetwork }} hostNetwork: {{ .Values.controller.hostNetwork }}
{{- end }}
{{- if .Values.controller.nodeSelector }} {{- if .Values.controller.nodeSelector }}
nodeSelector: nodeSelector: {{ toYaml .Values.controller.nodeSelector | nindent 8 }}
{{ toYaml .Values.controller.nodeSelector | indent 8 }}
{{- end }} {{- end }}
{{- if .Values.controller.tolerations }} {{- if .Values.controller.tolerations }}
tolerations: tolerations: {{ toYaml .Values.controller.tolerations | nindent 8 }}
{{ toYaml .Values.controller.tolerations | indent 8 }}
{{- end }} {{- end }}
{{- if .Values.controller.affinity }} {{- if .Values.controller.affinity }}
affinity: affinity: {{ toYaml .Values.controller.affinity | nindent 8 }}
{{ toYaml .Values.controller.affinity | indent 8 }}
{{- end }} {{- end }}
serviceAccountName: {{ template "ingress-nginx.serviceAccountName" . }} serviceAccountName: {{ template "ingress-nginx.serviceAccountName" . }}
terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }} terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
{{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled .Values.controller.extraVolumes) }} {{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled .Values.controller.extraVolumes) }}
volumes: volumes:
{{- end }} {{- if .Values.controller.customTemplate.configMapName }}
{{- if .Values.controller.customTemplate.configMapName }}
- name: nginx-template-volume - name: nginx-template-volume
configMap: configMap:
name: {{ .Values.controller.customTemplate.configMapName }} name: {{ .Values.controller.customTemplate.configMapName }}
items: items:
- key: {{ .Values.controller.customTemplate.configMapKey }} - key: {{ .Values.controller.customTemplate.configMapKey }}
path: nginx.tmpl path: nginx.tmpl
{{- end }} {{- end }}
{{- if .Values.controller.admissionWebhooks.enabled }} {{- if .Values.controller.admissionWebhooks.enabled }}
- name: webhook-cert - name: webhook-cert
secret: secret:
secretName: {{ template "ingress-nginx.fullname". }}-admission secretName: {{ template "ingress-nginx.fullname". }}-admission
{{- end }} {{- end }}
{{- if .Values.controller.extraVolumes }} {{- if .Values.controller.extraVolumes }}
{{ toYaml .Values.controller.extraVolumes | indent 8}} {{ toYaml .Values.controller.extraVolumes | nindent 8 }}
{{- end }} {{- end }}
{{- end }}
{{- end }} {{- end }}

12
charts/ingress-nginx/templates/controller-hpa.yaml
View file

@ -1,5 +1,4 @@
{{- if or (eq .Values.controller.kind "Deployment") (eq .Values.controller.kind "Both") }} {{- if and .Values.controller.autoscaling.enabled (or (eq .Values.controller.kind "Deployment") (eq .Values.controller.kind "Both")) -}}
{{- if .Values.controller.autoscaling.enabled }}
apiVersion: autoscaling/v2beta1 apiVersion: autoscaling/v2beta1
kind: HorizontalPodAutoscaler kind: HorizontalPodAutoscaler
metadata: metadata:
@ -15,17 +14,16 @@ spec:
minReplicas: {{ .Values.controller.autoscaling.minReplicas }} minReplicas: {{ .Values.controller.autoscaling.minReplicas }}
maxReplicas: {{ .Values.controller.autoscaling.maxReplicas }} maxReplicas: {{ .Values.controller.autoscaling.maxReplicas }}
metrics: metrics:
{{- with .Values.controller.autoscaling.targetCPUUtilizationPercentage }} {{- with .Values.controller.autoscaling.targetCPUUtilizationPercentage }}
- type: Resource - type: Resource
resource: resource:
name: cpu name: cpu
targetAverageUtilization: {{ . }} targetAverageUtilization: {{ . }}
{{- end }} {{- end }}
{{- with .Values.controller.autoscaling.targetMemoryUtilizationPercentage }} {{- with .Values.controller.autoscaling.targetMemoryUtilizationPercentage }}
- type: Resource - type: Resource
resource: resource:
name: memory name: memory
targetAverageUtilization: {{ . }} targetAverageUtilization: {{ . }}
{{- end }} {{- end }}
{{- end }}
{{- end }} {{- end }}

2
charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml
View file

@ -1,4 +1,4 @@
{{- if or (and .Values.controller.autoscaling.enabled (gt (.Values.controller.autoscaling.minReplicas | int) 1)) (gt (.Values.controller.replicaCount | int) 1) }} {{- if or (and .Values.controller.autoscaling.enabled (gt (.Values.controller.autoscaling.minReplicas | int) 1)) (gt (.Values.controller.replicaCount | int) 1) -}}
apiVersion: policy/v1beta1 apiVersion: policy/v1beta1
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:

16
charts/ingress-nginx/templates/controller-prometheusrules.yaml
View file

@ -1,21 +1,21 @@
{{- if and .Values.controller.metrics.enabled .Values.controller.metrics.prometheusRule.enabled }} {{- if and .Values.controller.metrics.enabled .Values.controller.metrics.prometheusRule.enabled -}}
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule kind: PrometheusRule
metadata: metadata:
name: {{ template "ingress-nginx.controller.fullname" . }} name: {{ template "ingress-nginx.controller.fullname" . }}
{{- if .Values.controller.metrics.prometheusRule.namespace }} {{- if .Values.controller.metrics.prometheusRule.namespace }}
namespace: {{ .Values.controller.metrics.prometheusRule.namespace }} namespace: {{ .Values.controller.metrics.prometheusRule.namespace }}
{{- end }} {{- end }}
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
{{- if .Values.controller.metrics.prometheusRule.additionalLabels }} {{- if .Values.controller.metrics.prometheusRule.additionalLabels }}
{{ toYaml .Values.controller.metrics.prometheusRule.additionalLabels | indent 4 }} {{- toYaml .Values.controller.metrics.prometheusRule.additionalLabels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- with .Values.controller.metrics.prometheusRule.rules }} {{- if .Values.controller.metrics.prometheusRule.rules }}
groups: groups:
- name: {{ template "ingress-nginx.name" $ }} - name: {{ template "ingress-nginx.name" . }}
rules: {{- toYaml . | nindent 4 }} rules: {{- toYaml .Values.controller.metrics.prometheusRule.rules | nindent 4 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

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

@ -1,8 +1,8 @@
{{- if .Values.podSecurityPolicy.enabled}} {{- if .Values.podSecurityPolicy.enabled -}}
apiVersion: {{ template "podSecurityPolicy.apiVersion" . }} apiVersion: {{ template "podSecurityPolicy.apiVersion" . }}
kind: PodSecurityPolicy kind: PodSecurityPolicy
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }} name: {{ template "ingress-nginx.fullname" . }}
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
@ -18,7 +18,9 @@ spec:
#- 'projected' #- 'projected'
- 'secret' - 'secret'
#- 'downwardAPI' #- 'downwardAPI'
{{- if .Values.controller.hostNetwork }}
hostNetwork: {{ .Values.controller.hostNetwork }} hostNetwork: {{ .Values.controller.hostNetwork }}
{{- end }}
{{- if or .Values.controller.hostNetwork .Values.controller.daemonset.useHostPort }} {{- if or .Values.controller.hostNetwork .Values.controller.daemonset.useHostPort }}
hostPorts: hostPorts:
{{- if .Values.controller.hostNetwork }} {{- if .Values.controller.hostNetwork }}

9
charts/ingress-nginx/templates/controller-role.yaml
View file

@ -5,7 +5,7 @@ metadata:
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
name: {{ include "ingress-nginx.fullname" . }} name: {{ template "ingress-nginx.fullname" . }}
rules: rules:
- apiGroups: - apiGroups:
- "" - ""
@ -80,10 +80,9 @@ rules:
- create - create
- patch - patch
{{- if .Values.podSecurityPolicy.enabled }} {{- if .Values.podSecurityPolicy.enabled }}
- apiGroups: ['{{ template "podSecurityPolicy.apiGroup" . }}'] - apiGroups: [{{ template "podSecurityPolicy.apiGroup" . }}]
resources: ['podsecuritypolicies'] resources: ['podsecuritypolicies']
verbs: ['use'] verbs: ['use']
resourceNames: [{{ include "ingress-nginx.fullname" . }}] resourceNames: [{{ template "ingress-nginx.fullname" . }}]
{{- end }}
{{- end }} {{- end }}
{{- end -}}

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

@ -5,13 +5,13 @@ metadata:
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
name: {{ include "ingress-nginx.fullname" . }} name: {{ template "ingress-nginx.fullname" . }}
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role
name: {{ include "ingress-nginx.fullname" . }} name: {{ template "ingress-nginx.fullname" . }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "ingress-nginx.serviceAccountName" . }} name: {{ template "ingress-nginx.serviceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end -}} {{- end }}

29
charts/ingress-nginx/templates/controller-metrics-service.yaml → charts/ingress-nginx/templates/controller-service-metrics.yaml
View file

@ -1,36 +1,30 @@
{{- if .Values.controller.metrics.enabled }} {{- if .Values.controller.metrics.enabled -}}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
{{- if .Values.controller.metrics.service.annotations }} {{- if .Values.controller.metrics.service.annotations }}
annotations: annotations: {{ toYaml .Values.controller.metrics.service.annotations | nindent 4 }}
{{- range $key, $value := .Values.controller.metrics.service.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
labels: labels:
{{- if .Values.controller.metrics.service.labels }}
{{ toYaml .Values.controller.metrics.service.labels | indent 4 }}
{{- end }}
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
{{- if .Values.controller.metrics.service.labels }}
{{- toYaml .Values.controller.metrics.service.labels | nindent 4 }}
{{- end }}
name: {{ template "ingress-nginx.controller.fullname" . }}-metrics name: {{ template "ingress-nginx.controller.fullname" . }}-metrics
spec: spec:
{{- if not .Values.controller.metrics.service.omitClusterIP }} type: {{ .Values.controller.metrics.service.type }}
{{- with .Values.controller.metrics.service.clusterIP }} {{- if .Values.controller.metrics.service.clusterIP }}
clusterIP: {{ if eq "-" . }}""{{ else }}{{ . | quote }}{{ end }} clusterIP: {{ .Values.controller.metrics.service.clusterIP }}
{{- end }}
{{- end }} {{- end }}
{{- if .Values.controller.metrics.service.externalIPs }} {{- if .Values.controller.metrics.service.externalIPs }}
externalIPs: externalIPs: {{ toYaml .Values.controller.metrics.service.externalIPs | nindent 4 }}
{{ toYaml .Values.controller.metrics.service.externalIPs | indent 4 }}
{{- end }} {{- end }}
{{- if .Values.controller.metrics.service.loadBalancerIP }} {{- if .Values.controller.metrics.service.loadBalancerIP }}
loadBalancerIP: "{{ .Values.controller.metrics.service.loadBalancerIP }}" loadBalancerIP: {{ .Values.controller.metrics.service.loadBalancerIP }}
{{- end }} {{- end }}
{{- if .Values.controller.metrics.service.loadBalancerSourceRanges }} {{- if .Values.controller.metrics.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: loadBalancerSourceRanges: {{ toYaml .Values.controller.metrics.service.loadBalancerSourceRanges | nindent 4 }}
{{ toYaml .Values.controller.metrics.service.loadBalancerSourceRanges | indent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: metrics - name: metrics
@ -39,5 +33,4 @@ spec:
selector: selector:
{{- include "ingress-nginx.selectorLabels" . | nindent 4 }} {{- include "ingress-nginx.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
type: "{{ .Values.controller.metrics.service.type }}"
{{- end }} {{- end }}

23
charts/ingress-nginx/templates/controller-webhook-service.yaml → charts/ingress-nginx/templates/controller-service-webhook.yaml
View file

@ -1,33 +1,27 @@
{{- if .Values.controller.admissionWebhooks.enabled }} {{- if .Values.controller.admissionWebhooks.enabled -}}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
{{- if .Values.controller.admissionWebhooks.service.annotations }} {{- if .Values.controller.admissionWebhooks.service.annotations }}
annotations: annotations: {{ toYaml .Values.controller.admissionWebhooks.service.annotations | nindent 4 }}
{{- range $key, $value := .Values.controller.admissionWebhooks.service.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
name: {{ template "ingress-nginx.controller.fullname" . }}-admission name: {{ template "ingress-nginx.controller.fullname" . }}-admission
spec: spec:
{{- if not .Values.controller.admissionWebhooks.service.omitClusterIP }} type: {{ .Values.controller.admissionWebhooks.service.type }}
{{- with .Values.controller.admissionWebhooks.service.clusterIP }} {{- if .Values.controller.admissionWebhooks.service.clusterIP }}
clusterIP: {{ if eq "-" . }}""{{ else }}{{ . | quote }}{{ end }} clusterIP: {{ .Values.controller.admissionWebhooks.service.clusterIP }}
{{- end }}
{{- end }} {{- end }}
{{- if .Values.controller.admissionWebhooks.service.externalIPs }} {{- if .Values.controller.admissionWebhooks.service.externalIPs }}
externalIPs: externalIPs: {{ toYaml .Values.controller.admissionWebhooks.service.externalIPs | nindent 4 }}
{{ toYaml .Values.controller.admissionWebhooks.service.externalIPs | indent 4 }}
{{- end }} {{- end }}
{{- if .Values.controller.admissionWebhooks.service.loadBalancerIP }} {{- if .Values.controller.admissionWebhooks.service.loadBalancerIP }}
loadBalancerIP: "{{ .Values.controller.admissionWebhooks.service.loadBalancerIP }}" loadBalancerIP: {{ .Values.controller.admissionWebhooks.service.loadBalancerIP }}
{{- end }} {{- end }}
{{- if .Values.controller.admissionWebhooks.service.loadBalancerSourceRanges }} {{- if .Values.controller.admissionWebhooks.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: loadBalancerSourceRanges: {{ toYaml .Values.controller.admissionWebhooks.service.loadBalancerSourceRanges | nindent 4 }}
{{ toYaml .Values.controller.admissionWebhooks.service.loadBalancerSourceRanges | indent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: https-webhook - name: https-webhook
@ -36,5 +30,4 @@ spec:
selector: selector:
{{- include "ingress-nginx.selectorLabels" . | nindent 4 }} {{- include "ingress-nginx.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
type: "{{ .Values.controller.admissionWebhooks.service.type }}"
{{- end }} {{- end }}

45
charts/ingress-nginx/templates/controller-service.yaml
View file

@ -1,44 +1,38 @@
{{- if .Values.controller.service.enabled }} {{- if .Values.controller.service.enabled -}}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
{{- if .Values.controller.service.annotations }} {{- if .Values.controller.service.annotations }}
annotations: annotations: {{ toYaml .Values.controller.service.annotations | nindent 4 }}
{{- range $key, $value := .Values.controller.service.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
labels: labels:
{{- if .Values.controller.service.labels }}
{{ toYaml .Values.controller.service.labels | indent 4 }}
{{- end }}
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
{{- if .Values.controller.service.labels }}
{{- toYaml .Values.controller.service.labels | nindent 4 }}
{{- end }}
name: {{ template "ingress-nginx.controller.fullname" . }} name: {{ template "ingress-nginx.controller.fullname" . }}
spec: spec:
{{- if not .Values.controller.service.omitClusterIP }} type: {{ .Values.controller.service.type }}
{{- with .Values.controller.service.clusterIP }} {{- if .Values.controller.service.clusterIP }}
clusterIP: {{ if eq "-" . }}""{{ else }}{{ . | quote }}{{ end }} clusterIP: {{ .Values.controller.service.clusterIP }}
{{- end }}
{{- end }} {{- end }}
{{- if .Values.controller.service.externalIPs }} {{- if .Values.controller.service.externalIPs }}
externalIPs: externalIPs: {{ toYaml .Values.controller.service.externalIPs | nindent 4 }}
{{ toYaml .Values.controller.service.externalIPs | indent 4 }}
{{- end }} {{- end }}
{{- if .Values.controller.service.loadBalancerIP }} {{- if .Values.controller.service.loadBalancerIP }}
loadBalancerIP: "{{ .Values.controller.service.loadBalancerIP }}" loadBalancerIP: {{ .Values.controller.service.loadBalancerIP }}
{{- end }} {{- end }}
{{- if .Values.controller.service.loadBalancerSourceRanges }} {{- if .Values.controller.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: loadBalancerSourceRanges: {{ toYaml .Values.controller.service.loadBalancerSourceRanges | nindent 4 }}
{{ toYaml .Values.controller.service.loadBalancerSourceRanges | indent 4 }}
{{- end }} {{- end }}
{{- if and (semverCompare ">=1.7-0" .Capabilities.KubeVersion.GitVersion) (.Values.controller.service.externalTrafficPolicy) }} {{- if and .Values.controller.service.externalTrafficPolicy (semverCompare ">=1.7-0" .Capabilities.KubeVersion.GitVersion) }}
externalTrafficPolicy: "{{ .Values.controller.service.externalTrafficPolicy }}" externalTrafficPolicy: {{ .Values.controller.service.externalTrafficPolicy }}
{{- end }} {{- end }}
{{- if .Values.controller.service.sessionAffinity }} {{- if .Values.controller.service.sessionAffinity }}
sessionAffinity: "{{ .Values.controller.service.sessionAffinity }}" sessionAffinity: {{ .Values.controller.service.sessionAffinity }}
{{- end }} {{- end }}
{{- if and (semverCompare ">=1.7-0" .Capabilities.KubeVersion.GitVersion) (.Values.controller.service.healthCheckNodePort) }} {{- if and .Values.controller.service.healthCheckNodePort (semverCompare ">=1.7-0" .Capabilities.KubeVersion.GitVersion) }}
healthCheckNodePort: {{ .Values.controller.service.healthCheckNodePort }} healthCheckNodePort: {{ .Values.controller.service.healthCheckNodePort }}
{{- end }} {{- end }}
ports: ports:
@ -62,10 +56,10 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- range $key, $value := .Values.tcp }} {{- range $key, $value := .Values.tcp }}
- name: "{{ $key }}-tcp" - name: {{ $key }}-tcp
port: {{ $key }} port: {{ $key }}
protocol: TCP protocol: TCP
targetPort: "{{ $key }}-tcp" targetPort: {{ $key }}-tcp
{{- if $.Values.controller.service.nodePorts.tcp }} {{- if $.Values.controller.service.nodePorts.tcp }}
{{- if index $.Values.controller.service.nodePorts.tcp $key }} {{- if index $.Values.controller.service.nodePorts.tcp $key }}
nodePort: {{ index $.Values.controller.service.nodePorts.tcp $key }} nodePort: {{ index $.Values.controller.service.nodePorts.tcp $key }}
@ -73,10 +67,10 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- range $key, $value := .Values.udp }} {{- range $key, $value := .Values.udp }}
- name: "{{ $key }}-udp" - name: {{ $key }}-udp
port: {{ $key }} port: {{ $key }}
protocol: UDP protocol: UDP
targetPort: "{{ $key }}-udp" targetPort: {{ $key }}-udp
{{- if $.Values.controller.service.nodePorts.udp }} {{- if $.Values.controller.service.nodePorts.udp }}
{{- if index $.Values.controller.service.nodePorts.udp $key }} {{- if index $.Values.controller.service.nodePorts.udp $key }}
nodePort: {{ index $.Values.controller.service.nodePorts.udp $key }} nodePort: {{ index $.Values.controller.service.nodePorts.udp $key }}
@ -86,5 +80,4 @@ spec:
selector: selector:
{{- include "ingress-nginx.selectorLabels" . | nindent 4 }} {{- include "ingress-nginx.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
type: "{{ .Values.controller.service.type }}"
{{- end }} {{- end }}

2
charts/ingress-nginx/templates/controller-serviceaccount.yaml
View file

@ -6,4 +6,4 @@ metadata:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
name: {{ template "ingress-nginx.serviceAccountName" . }} name: {{ template "ingress-nginx.serviceAccountName" . }}
{{- end -}} {{- end }}

17
charts/ingress-nginx/templates/controller-servicemonitor.yaml
View file

@ -1,16 +1,16 @@
{{- if and .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }} {{- if and .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled -}}
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ template "ingress-nginx.controller.fullname" . }} name: {{ template "ingress-nginx.controller.fullname" . }}
{{- if .Values.controller.metrics.serviceMonitor.namespace }} {{- if .Values.controller.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }} namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
{{- end }} {{- end }}
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }} app.kubernetes.io/component: {{ .Values.controller.name | quote }}
{{- if .Values.controller.metrics.serviceMonitor.additionalLabels }} {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
{{ toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | indent 4 }} {{- toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
@ -19,14 +19,13 @@ spec:
{{- if .Values.controller.metrics.serviceMonitor.honorLabels }} {{- if .Values.controller.metrics.serviceMonitor.honorLabels }}
honorLabels: true honorLabels: true
{{- end }} {{- end }}
{{- if .Values.controller.metrics.serviceMonitor.namespaceSelector }} {{- if .Values.controller.metrics.serviceMonitor.namespaceSelector }}
namespaceSelector: namespaceSelector: {{ toYaml .Values.controller.metrics.serviceMonitor.namespaceSelector | nindent 4 }}
{{ toYaml .Values.controller.metrics.serviceMonitor.namespaceSelector | indent 4 -}} {{ else }}
{{ else }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace }} - {{ .Release.Namespace }}
{{- end }} {{- end }}
selector: selector:
matchLabels: matchLabels:
{{- include "ingress-nginx.selectorLabels" . | nindent 6 }} {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}

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

@ -1,4 +1,4 @@
{{- if .Values.defaultBackend.enabled }} {{- if .Values.defaultBackend.enabled -}}
apiVersion: {{ template "deployment.apiVersion" . }} apiVersion: {{ template "deployment.apiVersion" . }}
kind: Deployment kind: Deployment
metadata: metadata:
@ -16,33 +16,29 @@ spec:
template: template:
metadata: metadata:
{{- if .Values.defaultBackend.podAnnotations }} {{- if .Values.defaultBackend.podAnnotations }}
annotations: annotations: {{ toYaml .Values.defaultBackend.podAnnotations | nindent 8 }}
{{- range $key, $value := .Values.defaultBackend.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
labels: labels:
{{- include "ingress-nginx.selectorLabels" . | nindent 8 }} {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
{{- if .Values.defaultBackend.podLabels }} {{- if .Values.defaultBackend.podLabels }}
{{ toYaml .Values.defaultBackend.podLabels | indent 8 }} {{- toYaml .Values.defaultBackend.podLabels | nindent 8 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.imagePullSecrets }} {{- if .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 8 }}
{{ toYaml .Values.imagePullSecrets | indent 8 }} {{- end }}
{{- if .Values.defaultBackend.priorityClassName }}
priorityClassName: {{ .Values.defaultBackend.priorityClassName }}
{{- end }} {{- end }}
{{- if .Values.defaultBackend.priorityClassName }}
priorityClassName: "{{ .Values.defaultBackend.priorityClassName }}"
{{- end }}
{{- if .Values.defaultBackend.podSecurityContext }} {{- if .Values.defaultBackend.podSecurityContext }}
securityContext: securityContext: {{ toYaml .Values.defaultBackend.podSecurityContext | nindent 8 }}
{{ toYaml .Values.defaultBackend.podSecurityContext | indent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: {{ template "ingress-nginx.name" . }}-{{ .Values.defaultBackend.name }} - name: {{ template "ingress-nginx.name" . }}-{{ .Values.defaultBackend.name }}
image: "{{ .Values.defaultBackend.image.repository }}:{{ .Values.defaultBackend.image.tag }}" image: {{ .Values.defaultBackend.image.repository }}:{{ .Values.defaultBackend.image.tag }}
imagePullPolicy: "{{ .Values.defaultBackend.image.pullPolicy }}" imagePullPolicy: {{ .Values.defaultBackend.image.pullPolicy }}
{{- if .Values.defaultBackend.extraArgs }}
args: args:
{{- range $key, $value := .Values.defaultBackend.extraArgs }} {{- range $key, $value := .Values.defaultBackend.extraArgs }}
{{- if $value }} {{- if $value }}
@ -51,11 +47,11 @@ spec:
- --{{ $key }} - --{{ $key }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }}
securityContext: securityContext:
runAsUser: {{ .Values.defaultBackend.image.runAsUser }} runAsUser: {{ .Values.defaultBackend.image.runAsUser }}
{{- if .Values.defaultBackend.extraEnvs }} {{- if .Values.defaultBackend.extraEnvs }}
env: env: {{ toYaml .Values.defaultBackend.extraEnvs | nindent 12 }}
{{ toYaml .Values.defaultBackend.extraEnvs | indent 12 }}
{{- end }} {{- end }}
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -81,20 +77,18 @@ spec:
- name: http - name: http
containerPort: {{ .Values.defaultBackend.port }} containerPort: {{ .Values.defaultBackend.port }}
protocol: TCP protocol: TCP
resources: {{- if .Values.defaultBackend.resources }}
{{ toYaml .Values.defaultBackend.resources | indent 12 }} resources: {{ toYaml .Values.defaultBackend.resources | nindent 12 }}
{{- end }}
{{- if .Values.defaultBackend.nodeSelector }} {{- if .Values.defaultBackend.nodeSelector }}
nodeSelector: nodeSelector: {{ toYaml .Values.defaultBackend.nodeSelector | nindent 8 }}
{{ toYaml .Values.defaultBackend.nodeSelector | indent 8 }}
{{- end }} {{- end }}
serviceAccountName: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }} serviceAccountName: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }}
{{- if .Values.defaultBackend.tolerations }} {{- if .Values.defaultBackend.tolerations }}
tolerations: tolerations: {{ toYaml .Values.defaultBackend.tolerations | nindent 8 }}
{{ toYaml .Values.defaultBackend.tolerations | indent 8 }}
{{- end }} {{- end }}
{{- if .Values.defaultBackend.affinity }} {{- if .Values.defaultBackend.affinity }}
affinity: affinity: {{ toYaml .Values.defaultBackend.affinity | nindent 8 }}
{{ toYaml .Values.defaultBackend.affinity | indent 8 }}
{{- end }} {{- end }}
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
{{- end }} {{- end }}

2
charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml
View file

@ -1,4 +1,4 @@
{{- if gt (.Values.defaultBackend.replicaCount | int) 1 }} {{- if gt (.Values.defaultBackend.replicaCount | int) 1 -}}
apiVersion: policy/v1beta1 apiVersion: policy/v1beta1
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:

4
charts/ingress-nginx/templates/default-backend-psp.yaml
View file

@ -2,7 +2,7 @@
apiVersion: {{ template "podSecurityPolicy.apiVersion" . }} apiVersion: {{ template "podSecurityPolicy.apiVersion" . }}
kind: PodSecurityPolicy kind: PodSecurityPolicy
metadata: metadata:
name: {{ include "ingress-nginx.fullname" . }}-backend name: {{ template "ingress-nginx.fullname" . }}-backend
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
@ -30,4 +30,4 @@ spec:
- projected - projected
- secret - secret
- downwardAPI - downwardAPI
{{- end -}} {{- end }}

8
charts/ingress-nginx/templates/default-backend-role.yaml
View file

@ -5,10 +5,10 @@ metadata:
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
name: {{ include "ingress-nginx.fullname" . }}-backend name: {{ template "ingress-nginx.fullname" . }}-backend
rules: rules:
- apiGroups: ['{{ template "podSecurityPolicy.apiGroup" . }}'] - apiGroups: [{{ template "podSecurityPolicy.apiGroup" . }}]
resources: ['podsecuritypolicies'] resources: ['podsecuritypolicies']
verbs: ['use'] verbs: ['use']
resourceNames: [{{ include "ingress-nginx.fullname" . }}-backend] resourceNames: [{{ template "ingress-nginx.fullname" . }}-backend]
{{- end -}} {{- end }}

2
charts/ingress-nginx/templates/default-backend-rolebinding.yaml
View file

@ -14,4 +14,4 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }} name: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end -}} {{- end }}

23
charts/ingress-nginx/templates/default-backend-service.yaml
View file

@ -1,33 +1,27 @@
{{- if .Values.defaultBackend.enabled }} {{- if .Values.defaultBackend.enabled -}}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
{{- if .Values.defaultBackend.service.annotations }} {{- if .Values.defaultBackend.service.annotations }}
annotations: annotations: {{ toYaml .Values.defaultBackend.service.annotations | nindent 4 }}
{{- range $key, $value := .Values.defaultBackend.service.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
labels: labels:
{{- include "ingress-nginx.labels" . | nindent 4 }} {{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
name: {{ template "ingress-nginx.defaultBackend.fullname" . }} name: {{ template "ingress-nginx.defaultBackend.fullname" . }}
spec: spec:
{{- if not .Values.defaultBackend.service.omitClusterIP }} type: {{ .Values.defaultBackend.service.type }}
{{- with .Values.defaultBackend.service.clusterIP }} {{- if .Values.defaultBackend.service.clusterIP }}
clusterIP: {{ if eq "-" . }}""{{ else }}{{ . | quote }}{{ end }} clusterIP: {{ .Values.defaultBackend.service.clusterIP }}
{{- end }}
{{- end }} {{- end }}
{{- if .Values.defaultBackend.service.externalIPs }} {{- if .Values.defaultBackend.service.externalIPs }}
externalIPs: externalIPs: {{ toYaml .Values.defaultBackend.service.externalIPs | nindent 4 }}
{{ toYaml .Values.defaultBackend.service.externalIPs | indent 4 }}
{{- end }} {{- end }}
{{- if .Values.defaultBackend.service.loadBalancerIP }} {{- if .Values.defaultBackend.service.loadBalancerIP }}
loadBalancerIP: "{{ .Values.defaultBackend.service.loadBalancerIP }}" loadBalancerIP: {{ .Values.defaultBackend.service.loadBalancerIP }}
{{- end }} {{- end }}
{{- if .Values.defaultBackend.service.loadBalancerSourceRanges }} {{- if .Values.defaultBackend.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: loadBalancerSourceRanges: {{ toYaml .Values.defaultBackend.service.loadBalancerSourceRanges | nindent 4 }}
{{ toYaml .Values.defaultBackend.service.loadBalancerSourceRanges | indent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: http - name: http
@ -37,5 +31,4 @@ spec:
selector: selector:
{{- include "ingress-nginx.selectorLabels" . | nindent 4 }} {{- include "ingress-nginx.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
type: "{{ .Values.defaultBackend.service.type }}"
{{- end }} {{- end }}

2
charts/ingress-nginx/templates/default-backend-serviceaccount.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.defaultBackend.enabled .Values.defaultBackend.serviceAccount.create }} {{- if and .Values.defaultBackend.enabled .Values.defaultBackend.serviceAccount.create -}}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:

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

@ -133,6 +133,10 @@ controller:
## ##
deploymentAnnotations: {} deploymentAnnotations: {}
## Annotations to be added to the controller daemonset
##
daemonsetAnnotations: {}
# The update strategy to apply to the Deployment or DaemonSet # The update strategy to apply to the Deployment or DaemonSet
## ##
updateStrategy: {} updateStrategy: {}
@ -242,8 +246,6 @@ controller:
annotations: {} annotations: {}
labels: {} labels: {}
## Deprecated, instead simply do not provide a clusterIP value
omitClusterIP: false
# clusterIP: "" # clusterIP: ""
## List of IP addresses at which the controller services are available ## List of IP addresses at which the controller services are available
@ -251,7 +253,7 @@ controller:
## ##
externalIPs: [] externalIPs: []
loadBalancerIP: "" # loadBalancerIP: ""
loadBalancerSourceRanges: [] loadBalancerSourceRanges: []
enableHttp: true enableHttp: true
@ -260,13 +262,16 @@ controller:
## Set external traffic policy to: "Local" to preserve source IP on ## Set external traffic policy to: "Local" to preserve source IP on
## providers supporting it ## providers supporting it
## Ref: https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-typeloadbalancer ## Ref: https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-typeloadbalancer
externalTrafficPolicy: "" # externalTrafficPolicy: ""
# Must be either "None" or "ClientIP" if set. Kubernetes will default to "None". # Must be either "None" or "ClientIP" if set. Kubernetes will default to "None".
# Ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies # Ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies
sessionAffinity: "" # sessionAffinity: ""
healthCheckNodePort: 0 # specifies the health check node port (numeric port number) for the service. If healthCheckNodePort isn’t specified,
# the service controller allocates a port from your cluster’s NodePort range.
# Ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
# healthCheckNodePort: 0
ports: ports:
http: 80 http: 80
@ -337,11 +342,9 @@ controller:
service: service:
annotations: {} annotations: {}
## Deprecated, instead simply do not provide a clusterIP value
omitClusterIP: false
# clusterIP: "" # clusterIP: ""
externalIPs: [] externalIPs: []
loadBalancerIP: "" # loadBalancerIP: ""
loadBalancerSourceRanges: [] loadBalancerSourceRanges: []
servicePort: 443 servicePort: 443
type: ClusterIP type: ClusterIP
@ -368,8 +371,6 @@ controller:
# prometheus.io/scrape: "true" # prometheus.io/scrape: "true"
# prometheus.io/port: "10254" # prometheus.io/port: "10254"
## Deprecated, instead simply do not provide a clusterIP value
omitClusterIP: false
# clusterIP: "" # clusterIP: ""
## List of IP addresses at which the stats-exporter service is available ## List of IP addresses at which the stats-exporter service is available
@ -377,7 +378,7 @@ controller:
## ##
externalIPs: [] externalIPs: []
loadBalancerIP: "" # loadBalancerIP: ""
loadBalancerSourceRanges: [] loadBalancerSourceRanges: []
servicePort: 9913 servicePort: 9913
type: ClusterIP type: ClusterIP
@ -397,7 +398,7 @@ controller:
prometheusRule: prometheusRule:
enabled: false enabled: false
additionalLabels: {} additionalLabels: {}
namespace: "" # namespace: ""
rules: [] rules: []
# # These are just examples rules, please adapt them to your needs # # These are just examples rules, please adapt them to your needs
# - alert: TooMany500s # - alert: TooMany500s
@ -516,8 +517,7 @@ defaultBackend:
service: service:
annotations: {} annotations: {}
## Deprecated, instead simply do not provide a clusterIP value
omitClusterIP: false
# clusterIP: "" # clusterIP: ""
## List of IP addresses at which the default backend service is available ## List of IP addresses at which the default backend service is available
@ -525,7 +525,7 @@ defaultBackend:
## ##
externalIPs: [] externalIPs: []
loadBalancerIP: "" # loadBalancerIP: ""
loadBalancerSourceRanges: [] loadBalancerSourceRanges: []
servicePort: 80 servicePort: 80
type: ClusterIP type: ClusterIP