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

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

View file

@ -4,7 +4,7 @@ controller:
tag: 1.0.0-dev
digest: null
kind: DaemonSet
enableSnippetDirectives: false
allowSnippetAnnotations: false
admissionWebhooks:
enabled: false
service:

View file

@ -5,7 +5,7 @@ controller:
digest: null
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

@ -70,10 +70,10 @@ controller:
ingressClassByName: 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