Templates: Remove quotes.

In alignment to others. Also does not make sense as `namespace` must conform to DNS.
This commit is contained in:
Marco Ebert 2023-10-25 14:33:27 +02:00 committed by k8s-infra-cherrypick-robot
parent 78ffac9766
commit 15ce4fc172
8 changed files with 8 additions and 8 deletions

View file

@ -19,5 +19,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "ingress-nginx.admissionWebhooks.fullname" . }}
namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
namespace: {{ include "ingress-nginx.namespace" . }}
{{- end }}

View file

@ -20,5 +20,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "ingress-nginx.admissionWebhooks.fullname" . }}
namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
namespace: {{ include "ingress-nginx.namespace" . }}
{{- end }}

View file

@ -38,8 +38,8 @@ webhooks:
- v1
clientConfig:
service:
namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
name: {{ include "ingress-nginx.controller.fullname" . }}-admission
namespace: {{ include "ingress-nginx.namespace" . }}
path: /networking/v1/ingresses
{{- if .Values.controller.admissionWebhooks.timeoutSeconds }}
timeoutSeconds: {{ .Values.controller.admissionWebhooks.timeoutSeconds }}

View file

@ -15,5 +15,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ template "ingress-nginx.serviceAccountName" . }}
namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
namespace: {{ include "ingress-nginx.namespace" . }}
{{- end }}

View file

@ -4,7 +4,7 @@ kind: PrometheusRule
metadata:
name: {{ include "ingress-nginx.controller.fullname" . }}
{{- if .Values.controller.metrics.prometheusRule.namespace }}
namespace: {{ .Values.controller.metrics.prometheusRule.namespace | quote }}
namespace: {{ .Values.controller.metrics.prometheusRule.namespace }}
{{- end }}
labels:
{{- include "ingress-nginx.labels" . | nindent 4 }}

View file

@ -17,5 +17,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ template "ingress-nginx.serviceAccountName" . }}
namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
namespace: {{ include "ingress-nginx.namespace" . }}
{{- end }}

View file

@ -4,7 +4,7 @@ kind: ServiceMonitor
metadata:
name: {{ include "ingress-nginx.controller.fullname" . }}
{{- if .Values.controller.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.controller.metrics.serviceMonitor.namespace | quote }}
namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
{{- else }}
namespace: {{ include "ingress-nginx.namespace" . }}
{{- end }}

View file

@ -17,5 +17,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }}
namespace: {{ (include "ingress-nginx.namespace" .) | quote }}
namespace: {{ include "ingress-nginx.namespace" . }}
{{- end }}