Change enable-snippet to allow-snippet-annotation (#7670) (#7677)

Signed-off-by: Ricardo Pchevuzinske Katz <rkatz@vmware.com>
This commit is contained in:
Ricardo Katz 2021-09-20 23:28:23 -03:00 committed by GitHub
parent a104d4fbc3
commit bb265845b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 30 additions and 28 deletions

View file

@ -1,6 +1,6 @@
controller:
kind: DaemonSet
enableSnippetDirectives: false
allowSnippetAnnotations: false
admissionWebhooks:
enabled: false
service:

View file

@ -1,7 +1,7 @@
controller:
config:
use-proxy-protocol: "true"
enableSnippetDirectives: false
allowSnippetAnnotations: false
admissionWebhooks:
enabled: false
service:

View file

@ -10,7 +10,7 @@ metadata:
name: {{ include "ingress-nginx.controller.fullname" . }}
namespace: {{ .Release.Namespace }}
data:
enable-snippet-directives: "{{ .Values.controller.enableSnippetDirectives }}"
allow-snippet-annotations: "{{ .Values.controller.allowSnippetAnnotations }}"
{{- if .Values.controller.addHeaders }}
add-headers: {{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-custom-add-headers
{{- end }}

View file

@ -62,10 +62,10 @@ controller:
reportNodeInternalIp: false
# This configuration defines if Ingress Controller should allow users to set
# their own *-snippet directives/annotations, otherwise this is forbidden / dropped
# their own *-snippet annotations, otherwise this is forbidden / dropped
# when users add those annotations.
# Global snippets in ConfigMap are still respected
enableSnippetDirectives: true
allowSnippetAnnotations: true
# Required for use with CNI based kubernetes installations (such as ones set up by kubeadm),
# since CNI and hostport don't mix yet. Can be deprecated once https://github.com/kubernetes/kubernetes/issues/23920