Merge pull request #6802 from krmichel/master

Add value for configuring a custom Diffie-Hellman parameters file
This commit is contained in:
Kubernetes Prow Robot 2021-01-27 19:19:07 -08:00 committed by GitHub
commit 118a7527fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 0 deletions

View file

@ -15,6 +15,9 @@ data:
{{- if or .Values.controller.proxySetHeaders .Values.controller.headers }} {{- if or .Values.controller.proxySetHeaders .Values.controller.headers }}
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.dhParam }}
ssl-dh-param: {{ printf "%s/%s" .Release.Namespace (include "ingress-nginx.controller.fullname" .) }}
{{- end }}
{{- range $key, $value := .Values.controller.config }} {{- range $key, $value := .Values.controller.config }}
{{ $key | nindent 2 }}: {{ $value | quote }} {{ $key | nindent 2 }}: {{ $value | quote }}
{{- end }} {{- end }}

View file

@ -0,0 +1,10 @@
{{- with .Values.dhParam -}}
apiVersion: v1
kind: Secret
metadata:
name: {{ include "ingress-nginx.controller.fullname" $ }}
labels:
{{- include "ingress-nginx.labels" $ | nindent 4 }}
data:
dhparam.pem: {{ . }}
{{- end }}

View file

@ -731,3 +731,8 @@ tcp: {}
## ##
udp: {} udp: {}
# 53: "kube-system/kube-dns:53" # 53: "kube-system/kube-dns:53"
# A base64ed Diffie-Hellman parameter
# This can be generated with: openssl dhparam 4096 2> /dev/null | base64
# Ref: https://github.com/krmichel/ingress-nginx/blob/master/docs/examples/customization/ssl-dh-param
dhParam: