diff --git a/calico/templates/daemonset-calico-etcd.yaml b/calico/templates/daemonset-calico-etcd.yaml index 993eade7e..a19d3c1b8 100644 --- a/calico/templates/daemonset-calico-etcd.yaml +++ b/calico/templates/daemonset-calico-etcd.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_calico_etcd }} {{- $envAll := . }} -{{- $serviceAccountName := "calico-etcd"}} +{{- $serviceAccountName := "calico-etcd" }} {{ tuple $envAll "calico-etcd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- diff --git a/calico/templates/daemonset-calico-node.yaml b/calico/templates/daemonset-calico-node.yaml index 52fb824a2..59b5849b5 100644 --- a/calico/templates/daemonset-calico-node.yaml +++ b/calico/templates/daemonset-calico-node.yaml @@ -42,7 +42,7 @@ limitations under the License. {{- $_ := set .Values.conf.node "CALICO_IPV4POOL_CIDR" .Values.networking.podSubnet -}} {{- end -}} -{{- $serviceAccountName := "calico-node"}} +{{- $serviceAccountName := "calico-node" }} {{ tuple $envAll "calico_node" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 @@ -146,7 +146,7 @@ spec: configMapKeyRef: name: calico-etc key: etcd_endpoints -{{ if .Values.endpoints.etcd.auth.client.tls.ca}} +{{ if .Values.endpoints.etcd.auth.client.tls.ca }} - name: ETCD_CA_CERT_FILE value: {{ .Values.endpoints.etcd.auth.client.path.ca }} - name: ETCD_CA_CERT @@ -155,7 +155,7 @@ spec: name: calico-etcd-secrets key: tls.ca {{ end }} -{{ if .Values.endpoints.etcd.auth.client.tls.key}} +{{ if .Values.endpoints.etcd.auth.client.tls.key }} - name: ETCD_KEY_FILE value: {{ .Values.endpoints.etcd.auth.client.path.key }} - name: ETCD_KEY @@ -164,7 +164,7 @@ spec: name: calico-etcd-secrets key: tls.key {{ end }} -{{ if .Values.endpoints.etcd.auth.client.tls.crt}} +{{ if .Values.endpoints.etcd.auth.client.tls.crt }} - name: ETCD_CERT_FILE value: {{ .Values.endpoints.etcd.auth.client.path.crt }} - name: ETCD_CERT @@ -299,15 +299,15 @@ spec: key: etcd_endpoints # etcd certs -{{ if .Values.endpoints.etcd.auth.client.tls.ca}} +{{ if .Values.endpoints.etcd.auth.client.tls.ca }} - name: ETCD_CA_CERT_FILE value: {{ .Values.endpoints.etcd.auth.client.path.ca }} {{ end }} -{{ if .Values.endpoints.etcd.auth.client.tls.key}} +{{ if .Values.endpoints.etcd.auth.client.tls.key }} - name: ETCD_KEY_FILE value: {{ .Values.endpoints.etcd.auth.client.path.key }} {{ end }} -{{ if .Values.endpoints.etcd.auth.client.tls.crt}} +{{ if .Values.endpoints.etcd.auth.client.tls.crt }} - name: ETCD_CERT_FILE value: {{ .Values.endpoints.etcd.auth.client.path.crt }} {{ end }} diff --git a/calico/templates/deployment-calico-kube-controllers.yaml b/calico/templates/deployment-calico-kube-controllers.yaml index c61fee7a2..e8a3dbfb3 100644 --- a/calico/templates/deployment-calico-kube-controllers.yaml +++ b/calico/templates/deployment-calico-kube-controllers.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.deployment_calico_kube_controllers }} {{- $envAll := . }} -{{- $serviceAccountName := "calico-kube-controllers"}} +{{- $serviceAccountName := "calico-kube-controllers" }} {{ tuple $envAll "calico_kube_controllers" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- kind: ClusterRoleBinding @@ -126,15 +126,15 @@ spec: {{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.conf.controllers | indent 12 }} # etcd tls files -{{ if .Values.endpoints.etcd.auth.client.tls.ca}} +{{ if .Values.endpoints.etcd.auth.client.tls.ca }} - name: ETCD_CA_CERT_FILE value: {{ .Values.endpoints.etcd.auth.client.path.ca }} {{ end }} -{{ if .Values.endpoints.etcd.auth.client.tls.key}} +{{ if .Values.endpoints.etcd.auth.client.tls.key }} - name: ETCD_KEY_FILE value: {{ .Values.endpoints.etcd.auth.client.path.key }} {{ end }} -{{ if .Values.endpoints.etcd.auth.client.tls.crt}} +{{ if .Values.endpoints.etcd.auth.client.tls.crt }} - name: ETCD_CERT_FILE value: {{ .Values.endpoints.etcd.auth.client.path.crt }} {{ end }} diff --git a/calico/templates/job-calico-settings.yaml b/calico/templates/job-calico-settings.yaml index 6c86d5230..37bdf3a91 100644 --- a/calico/templates/job-calico-settings.yaml +++ b/calico/templates/job-calico-settings.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_calico_settings }} {{- $envAll := . }} -{{- $serviceAccountName := "calico-settings"}} +{{- $serviceAccountName := "calico-settings" }} {{ tuple $envAll "calico_settings" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: batch/v1 @@ -61,15 +61,15 @@ spec: configMapKeyRef: name: calico-etc key: etcd_endpoints -{{ if .Values.endpoints.etcd.auth.client.tls.ca}} +{{ if .Values.endpoints.etcd.auth.client.tls.ca }} - name: ETCD_CA_CERT_FILE value: {{ .Values.endpoints.etcd.auth.client.path.ca }} {{ end }} -{{ if .Values.endpoints.etcd.auth.client.tls.key}} +{{ if .Values.endpoints.etcd.auth.client.tls.key }} - name: ETCD_KEY_FILE value: {{ .Values.endpoints.etcd.auth.client.path.key }} {{ end }} -{{ if .Values.endpoints.etcd.auth.client.tls.crt}} +{{ if .Values.endpoints.etcd.auth.client.tls.crt }} - name: ETCD_CERT_FILE value: {{ .Values.endpoints.etcd.auth.client.path.crt }} {{ end }} diff --git a/ceph-client/templates/deployment-mds.yaml b/ceph-client/templates/deployment-mds.yaml index b35bd3ea5..f6b26ee24 100644 --- a/ceph-client/templates/deployment-mds.yaml +++ b/ceph-client/templates/deployment-mds.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_mds ( and .Values.deployment.ceph .Values.conf.features.mds) }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-mds"}} +{{- $serviceAccountName := "ceph-mds" }} {{ tuple $envAll "mds" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- kind: Deployment diff --git a/ceph-client/templates/deployment-mgr.yaml b/ceph-client/templates/deployment-mgr.yaml index 034393cba..32f628a66 100644 --- a/ceph-client/templates/deployment-mgr.yaml +++ b/ceph-client/templates/deployment-mgr.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_mgr (and .Values.deployment.ceph .Values.conf.features.mgr ) }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-mgr"}} +{{- $serviceAccountName := "ceph-mgr" }} {{ tuple $envAll "mgr" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- kind: Deployment diff --git a/ceph-client/templates/job-bootstrap.yaml b/ceph-client/templates/job-bootstrap.yaml index 5f249ff8c..d64cee0d7 100644 --- a/ceph-client/templates/job-bootstrap.yaml +++ b/ceph-client/templates/job-bootstrap.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-client-bootstrap"}} +{{- $serviceAccountName := "ceph-client-bootstrap" }} {{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: batch/v1 diff --git a/ceph-client/templates/service-mgr.yaml b/ceph-client/templates/service-mgr.yaml index 76a825532..b9814e330 100644 --- a/ceph-client/templates/service-mgr.yaml +++ b/ceph-client/templates/service-mgr.yaml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */}} -{{- if and .Values.manifests.service_mgr ( and .Values.deployment.ceph .Values.conf.features.mgr )}} +{{- if and .Values.manifests.service_mgr ( and .Values.deployment.ceph .Values.conf.features.mgr ) }} {{- $envAll := . }} {{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.ceph_mgr }} --- diff --git a/ceph-mon/templates/daemonset-mon.yaml b/ceph-mon/templates/daemonset-mon.yaml index 60a1a271c..059f2db15 100644 --- a/ceph-mon/templates/daemonset-mon.yaml +++ b/ceph-mon/templates/daemonset-mon.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.daemonset_mon .Values.deployment.ceph }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-mon"}} +{{- $serviceAccountName := "ceph-mon" }} {{ tuple $envAll "mon" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/ceph-mon/templates/deployment-moncheck.yaml b/ceph-mon/templates/deployment-moncheck.yaml index 701c9316e..a3d8f52d7 100644 --- a/ceph-mon/templates/deployment-moncheck.yaml +++ b/ceph-mon/templates/deployment-moncheck.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_moncheck .Values.deployment.ceph }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-mon-check"}} +{{- $serviceAccountName := "ceph-mon-check" }} {{ tuple $envAll "moncheck" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- kind: Deployment diff --git a/ceph-mon/templates/job-bootstrap.yaml b/ceph-mon/templates/job-bootstrap.yaml index 07a1a7992..d409e0f24 100644 --- a/ceph-mon/templates/job-bootstrap.yaml +++ b/ceph-mon/templates/job-bootstrap.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-bootstrap"}} +{{- $serviceAccountName := "ceph-bootstrap" }} {{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: batch/v1 diff --git a/ceph-mon/templates/job-keyring.yaml b/ceph-mon/templates/job-keyring.yaml index cdc582bf1..d41de1ae2 100644 --- a/ceph-mon/templates/job-keyring.yaml +++ b/ceph-mon/templates/job-keyring.yaml @@ -80,7 +80,7 @@ spec: value: /tmp - name: CEPH_TEMPLATES_DIR value: /tmp/templates - {{- if eq $cephBootstrapKey "mon"}} + {{- if eq $cephBootstrapKey "mon" }} - name: CEPH_KEYRING_NAME value: ceph.mon.keyring - name: CEPH_KEYRING_TEMPLATE diff --git a/ceph-osd/templates/daemonset-osd.yaml b/ceph-osd/templates/daemonset-osd.yaml index a6ac17896..9bc179376 100644 --- a/ceph-osd/templates/daemonset-osd.yaml +++ b/ceph-osd/templates/daemonset-osd.yaml @@ -350,7 +350,7 @@ spec: {{- if .Values.manifests.daemonset_osd }} {{- $daemonset := "osd" }} {{- $configMapName := "ceph-osd-etc" }} -{{- $serviceAccountName := "ceph-osd"}} +{{- $serviceAccountName := "ceph-osd" }} {{ tuple . "osd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName . | include "ceph.osd.daemonset" | toString | fromYaml }} {{- $configmap_yaml := "ceph.osd.configmap.etc" }} diff --git a/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl b/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl index eb9c70986..ebfec47df 100644 --- a/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl +++ b/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl @@ -284,7 +284,7 @@ limitations under the License. {{- $_ := set $context.Values "__tmpYAML" dict }} {{ $dsNodeName := index $context.Values.__daemonset_yaml.metadata "name" }} -{{ $localDsNodeName := print (trunc 54 $current_dict.dns_1123_name) "-" (print $dsNodeName $k | quote | sha256sum | trunc 8)}} +{{ $localDsNodeName := print (trunc 54 $current_dict.dns_1123_name) "-" (print $dsNodeName $k | quote | sha256sum | trunc 8) }} {{- if not $context.Values.__tmpYAML.metadata }}{{- $_ := set $context.Values.__tmpYAML "metadata" dict }}{{- end }} {{- $_ := set $context.Values.__tmpYAML.metadata "name" $localDsNodeName }} diff --git a/ceph-provisioners/templates/job-bootstrap.yaml b/ceph-provisioners/templates/job-bootstrap.yaml index 0358f9030..d2e165977 100644 --- a/ceph-provisioners/templates/job-bootstrap.yaml +++ b/ceph-provisioners/templates/job-bootstrap.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-client-bootstrap"}} +{{- $serviceAccountName := "ceph-client-bootstrap" }} {{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: batch/v1 diff --git a/ceph-rgw/templates/deployment-rgw.yaml b/ceph-rgw/templates/deployment-rgw.yaml index 13d7abd6d..5b807680e 100644 --- a/ceph-rgw/templates/deployment-rgw.yaml +++ b/ceph-rgw/templates/deployment-rgw.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_rgw ( and .Values.deployment.ceph .Values.conf.features.rgw ) }} {{- $envAll := . }} -{{- $serviceAccountName := "ceph-rgw"}} +{{- $serviceAccountName := "ceph-rgw" }} {{ tuple $envAll "rgw" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- kind: Deployment diff --git a/elasticsearch/templates/cron-job-curator.yaml b/elasticsearch/templates/cron-job-curator.yaml index 54996ddd4..877ee4c7c 100644 --- a/elasticsearch/templates/cron-job-curator.yaml +++ b/elasticsearch/templates/cron-job-curator.yaml @@ -19,7 +19,7 @@ limitations under the License. {{- $esUserSecret := .Values.secrets.elasticsearch.user }} -{{- $serviceAccountName := "elastic-curator"}} +{{- $serviceAccountName := "elastic-curator" }} {{ tuple $envAll "curator" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: batch/v1beta1 diff --git a/elasticsearch/templates/deployment-client.yaml b/elasticsearch/templates/deployment-client.yaml index b13a62f34..ce5e8e396 100644 --- a/elasticsearch/templates/deployment-client.yaml +++ b/elasticsearch/templates/deployment-client.yaml @@ -21,7 +21,7 @@ limitations under the License. {{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }} -{{- $serviceAccountName := printf "%s-%s" .Release.Name "elasticsearch-client"}} +{{- $serviceAccountName := printf "%s-%s" .Release.Name "elasticsearch-client" }} {{ tuple $envAll "elasticsearch_client" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/elasticsearch/templates/deployment-master.yaml b/elasticsearch/templates/deployment-master.yaml index c4eaf1af0..c58d201eb 100644 --- a/elasticsearch/templates/deployment-master.yaml +++ b/elasticsearch/templates/deployment-master.yaml @@ -19,7 +19,7 @@ limitations under the License. {{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }} -{{- $serviceAccountName := "elasticsearch-master"}} +{{- $serviceAccountName := "elasticsearch-master" }} {{ tuple $envAll "elasticsearch_master" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/elasticsearch/templates/statefulset-data.yaml b/elasticsearch/templates/statefulset-data.yaml index 73862ca08..49a6c4052 100644 --- a/elasticsearch/templates/statefulset-data.yaml +++ b/elasticsearch/templates/statefulset-data.yaml @@ -19,7 +19,7 @@ limitations under the License. {{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }} -{{- $serviceAccountName := printf "%s-%s" .Release.Name "elasticsearch-data"}} +{{- $serviceAccountName := printf "%s-%s" .Release.Name "elasticsearch-data" }} {{ tuple $envAll "elasticsearch_data" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/flannel/templates/daemonset-kube-flannel-ds.yaml b/flannel/templates/daemonset-kube-flannel-ds.yaml index 94ad5f635..957fcb84b 100644 --- a/flannel/templates/daemonset-kube-flannel-ds.yaml +++ b/flannel/templates/daemonset-kube-flannel-ds.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_kube_flannel_ds }} {{- $envAll := . }} -{{- $serviceAccountName := printf "%s-%s" .Release.Name "flannel"}} +{{- $serviceAccountName := printf "%s-%s" .Release.Name "flannel" }} {{ tuple $envAll "flannel" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- kind: ClusterRole diff --git a/fluent-logging/templates/daemonset-fluent-bit.yaml b/fluent-logging/templates/daemonset-fluent-bit.yaml index 196995eb2..938ea161d 100644 --- a/fluent-logging/templates/daemonset-fluent-bit.yaml +++ b/fluent-logging/templates/daemonset-fluent-bit.yaml @@ -112,7 +112,7 @@ spec: - /tmp/fluent-bit.sh env: - name: FLUENTD_HOST - value: {{ tuple "fluentd" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote}} + value: {{ tuple "fluentd" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }} - name: FLUENTD_PORT value: {{ tuple "fluentd" "internal" "service" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} volumeMounts: diff --git a/fluent-logging/templates/job-elasticsearch-template.yaml b/fluent-logging/templates/job-elasticsearch-template.yaml index 94c4e3336..406daf015 100644 --- a/fluent-logging/templates/job-elasticsearch-template.yaml +++ b/fluent-logging/templates/job-elasticsearch-template.yaml @@ -20,7 +20,7 @@ limitations under the License. {{- $mounts_elasticsearch_template := .Values.pod.mounts.elasticsearch_template.elasticsearch_template }} {{- $mounts_elasticsearch_template_init := .Values.pod.mounts.elasticsearch_template.init_container }} -{{- $serviceAccountName := "fluent-logging-elasticsearch-template"}} +{{- $serviceAccountName := "fluent-logging-elasticsearch-template" }} {{ tuple $envAll "elasticsearch_template" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: batch/v1 diff --git a/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml b/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml index f7be69f5a..abf94c330 100644 --- a/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml @@ -21,7 +21,7 @@ limitations under the License. {{ $fluentd_metrics_path := "api/plugins.json" }} {{ $fluentd_metrics_host := printf "http://%s/%s" $fluentd_host $fluentd_metrics_path }} -{{- $serviceAccountName := "prometheus-fluentd-exporter"}} +{{- $serviceAccountName := "prometheus-fluentd-exporter" }} {{ tuple $envAll "prometheus_fluentd_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1 diff --git a/grafana/values.yaml b/grafana/values.yaml index 47775ca7e..c15bde5eb 100644 --- a/grafana/values.yaml +++ b/grafana/values.yaml @@ -5485,7 +5485,7 @@ conf: - expr: irate(ceph_pool_rd{pool_id=~"$pool",application="ceph",release_group="$ceph_cluster"}[3m]) interval: "$interval" intervalFactor: 1 - legendFormat: Read - {{ $pool_name}} + legendFormat: Read - {{ $pool_name }} refId: B step: 60 - expr: irate(ceph_pool_wr{pool_id=~"$pool",application="ceph",release_group="$ceph_cluster"}[3m]) @@ -14797,7 +14797,7 @@ conf: format: time_series interval: '' intervalFactor: 2 - legendFormat: "{{ upstream}}" + legendFormat: "{{ upstream }}" metric: nginx_upstream_requests refId: A step: 10 @@ -14938,7 +14938,7 @@ conf: - expr: sum(irate(nginx_connections_total[5m])) by (type) format: time_series intervalFactor: 2 - legendFormat: "{{ type}}" + legendFormat: "{{ type }}" metric: nginx_server_connections refId: A step: 10 @@ -15080,7 +15080,7 @@ conf: format: time_series interval: '' intervalFactor: 2 - legendFormat: "{{ server_zone}}" + legendFormat: "{{ server_zone }}" metric: nginx_server_requests refId: A step: 10 diff --git a/helm-toolkit/templates/endpoints/_service_name_endpoint_with_namespace_lookup.tpl b/helm-toolkit/templates/endpoints/_service_name_endpoint_with_namespace_lookup.tpl index 9178ce5f7..a99f385f4 100644 --- a/helm-toolkit/templates/endpoints/_service_name_endpoint_with_namespace_lookup.tpl +++ b/helm-toolkit/templates/endpoints/_service_name_endpoint_with_namespace_lookup.tpl @@ -48,7 +48,7 @@ return: | {{- $typeYamlSafe := $type | replace "-" "_" }} {{- $endpointMap := index $context.Values.endpoints $typeYamlSafe }} {{- with $endpointMap -}} -{{- $endpointName := index .hosts $endpoint | default .hosts.default}} +{{- $endpointName := index .hosts $endpoint | default .hosts.default }} {{- $endpointNamespace := .namespace | default $context.Release.Namespace }} {{- if regexMatch "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+" $endpointName }} {{- if .service.name }} diff --git a/helm-toolkit/templates/manifests/_ingress.tpl b/helm-toolkit/templates/manifests/_ingress.tpl index 014ed55c8..90680ce5f 100644 --- a/helm-toolkit/templates/manifests/_ingress.tpl +++ b/helm-toolkit/templates/manifests/_ingress.tpl @@ -172,9 +172,9 @@ metadata: {{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }} spec: rules: -{{- range $key1, $vHost := tuple $hostName (printf "%s.%s" $hostName $envAll.Release.Namespace) (printf "%s.%s.svc.%s" $hostName $envAll.Release.Namespace $envAll.Values.endpoints.cluster_domain_suffix)}} +{{- range $key1, $vHost := tuple $hostName (printf "%s.%s" $hostName $envAll.Release.Namespace) (printf "%s.%s.svc.%s" $hostName $envAll.Release.Namespace $envAll.Values.endpoints.cluster_domain_suffix) }} {{- $hostRules := dict "vHost" $vHost "backendName" $backendName "backendPort" $backendPort }} -{{ $hostRules | include "helm-toolkit.manifests.ingress._host_rules" | indent 4}} +{{ $hostRules | include "helm-toolkit.manifests.ingress._host_rules" | indent 4 }} {{- end }} {{- if not ( hasSuffix ( printf ".%s.svc.%s" $envAll.Release.Namespace $envAll.Values.endpoints.cluster_domain_suffix) $hostNameFull) }} {{- range $key2, $ingressController := tuple "namespace" "cluster" }} @@ -202,7 +202,7 @@ spec: {{- end }} {{- end }} rules: -{{ $hostNameFullRules | include "helm-toolkit.manifests.ingress._host_rules" | indent 4}} +{{ $hostNameFullRules | include "helm-toolkit.manifests.ingress._host_rules" | indent 4 }} {{- end }} {{- end }} {{- end }} diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml index 0a3f6d945..f8c6a0cb9 100644 --- a/ingress/templates/deployment-error.yaml +++ b/ingress/templates/deployment-error.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.deployment_error }} {{- $envAll := . }} -{{- $serviceAccountName := "ingress-error-pages"}} +{{- $serviceAccountName := "ingress-error-pages" }} {{ tuple $envAll "error_pages" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1 diff --git a/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl b/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl index 6d9b0f474..c31f23fd3 100644 --- a/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl +++ b/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl @@ -20,7 +20,7 @@ set -ex curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \ -XPOST "${ELASTICSEARCH_ENDPOINT}/.kibana/index-pattern/{{ . }}-*" -H 'Content-Type: application/json' \ -d '{"title":"{{ . }}-*","timeFieldName":"@timestamp","notExpandable":true}' -{{- end}} +{{- end }} curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \ -XPOST "${ELASTICSEARCH_ENDPOINT}/.kibana/config/5.6.4" -H 'Content-Type: application/json' \ -d '{"defaultIndex" : "{{ .Values.conf.create_kibana_indexes.default_index }}-*"}' diff --git a/mariadb/files/nginx.tmpl b/mariadb/files/nginx.tmpl index b74b2b633..5ec3d0db6 100644 --- a/mariadb/files/nginx.tmpl +++ b/mariadb/files/nginx.tmpl @@ -25,7 +25,7 @@ worker_processes {{ $cfg.WorkerProcesses }}; pid /run/nginx.pid; {{ if ne .MaxOpenFiles 0 }} worker_rlimit_nofile {{ .MaxOpenFiles }}; -{{ end}} +{{ end }} {{/* http://nginx.org/en/docs/ngx_core_module.html#worker_shutdown_timeout */}} {{/* avoid waiting too long during a reload */}} @@ -228,7 +228,7 @@ http { {{ else }} default "$http_x_forwarded_for, $realip_remote_addr"; '' "$realip_remote_addr"; - {{ end}} + {{ end }} } {{ end }} @@ -581,15 +581,15 @@ stream { {{ $all := .First }} {{ $server := .Second }} {{ range $address := $all.Cfg.BindAddressIpv4 }} - listen {{ $address }}:{{ $all.ListenPorts.HTTP }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ if eq $server.Hostname "_"}} default_server reuseport backlog={{ $all.BacklogSize }}{{end}}; + listen {{ $address }}:{{ $all.ListenPorts.HTTP }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ if eq $server.Hostname "_" }} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }}; {{ else }} - listen {{ $all.ListenPorts.HTTP }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ if eq $server.Hostname "_"}} default_server reuseport backlog={{ $all.BacklogSize }}{{end}}; + listen {{ $all.ListenPorts.HTTP }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ if eq $server.Hostname "_" }} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }}; {{ end }} {{ if $all.IsIPV6Enabled }} {{ range $address := $all.Cfg.BindAddressIpv6 }} - listen {{ $address }}:{{ $all.ListenPorts.HTTP }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ if eq $server.Hostname "_"}} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }}; + listen {{ $address }}:{{ $all.ListenPorts.HTTP }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ if eq $server.Hostname "_" }} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }}; {{ else }} - listen [::]:{{ $all.ListenPorts.HTTP }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ if eq $server.Hostname "_"}} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }}; + listen [::]:{{ $all.ListenPorts.HTTP }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ if eq $server.Hostname "_" }} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }}; {{ end }} {{ end }} set $proxy_upstream_name "-"; @@ -598,22 +598,22 @@ stream { {{/* This listener must always have proxy_protocol enabled, because the SNI listener forwards on source IP info in it. */}} {{ if not (empty $server.SSLCertificate) }} {{ range $address := $all.Cfg.BindAddressIpv4 }} - listen {{ $address }}:{{ if $all.IsSSLPassthroughEnabled }}{{ $all.ListenPorts.SSLProxy }} proxy_protocol {{ else }}{{ $all.ListenPorts.HTTPS }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ end }} {{ if eq $server.Hostname "_"}} default_server reuseport backlog={{ $all.BacklogSize }}{{end}} ssl {{ if $all.Cfg.UseHTTP2 }}http2{{ end }}; + listen {{ $address }}:{{ if $all.IsSSLPassthroughEnabled }}{{ $all.ListenPorts.SSLProxy }} proxy_protocol {{ else }}{{ $all.ListenPorts.HTTPS }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ end }} {{ if eq $server.Hostname "_" }} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }} ssl {{ if $all.Cfg.UseHTTP2 }}http2{{ end }}; {{ else }} - listen {{ if $all.IsSSLPassthroughEnabled }}{{ $all.ListenPorts.SSLProxy }} proxy_protocol {{ else }}{{ $all.ListenPorts.HTTPS }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ end }} {{ if eq $server.Hostname "_"}} default_server reuseport backlog={{ $all.BacklogSize }}{{end}} ssl {{ if $all.Cfg.UseHTTP2 }}http2{{ end }}; + listen {{ if $all.IsSSLPassthroughEnabled }}{{ $all.ListenPorts.SSLProxy }} proxy_protocol {{ else }}{{ $all.ListenPorts.HTTPS }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ end }} {{ if eq $server.Hostname "_" }} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }} ssl {{ if $all.Cfg.UseHTTP2 }}http2{{ end }}; {{ end }} {{ if $all.IsIPV6Enabled }} {{ range $address := $all.Cfg.BindAddressIpv6 }} - {{ if not (empty $server.SSLCertificate) }}listen {{ $address }}:{{ if $all.IsSSLPassthroughEnabled }}{{ $all.ListenPorts.SSLProxy }} proxy_protocol{{ else }}{{ $all.ListenPorts.HTTPS }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ end }}{{ end }} {{ if eq $server.Hostname "_"}} default_server reuseport backlog={{ $all.BacklogSize }}{{end}} ssl {{ if $all.Cfg.UseHTTP2 }}http2{{ end }}; + {{ if not (empty $server.SSLCertificate) }}listen {{ $address }}:{{ if $all.IsSSLPassthroughEnabled }}{{ $all.ListenPorts.SSLProxy }} proxy_protocol{{ else }}{{ $all.ListenPorts.HTTPS }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ end }}{{ end }} {{ if eq $server.Hostname "_" }} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }} ssl {{ if $all.Cfg.UseHTTP2 }}http2{{ end }}; {{ else }} - {{ if not (empty $server.SSLCertificate) }}listen [::]:{{ if $all.IsSSLPassthroughEnabled }}{{ $all.ListenPorts.SSLProxy }} proxy_protocol{{ else }}{{ $all.ListenPorts.HTTPS }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ end }}{{ end }} {{ if eq $server.Hostname "_"}} default_server reuseport backlog={{ $all.BacklogSize }}{{end}} ssl {{ if $all.Cfg.UseHTTP2 }}http2{{ end }}; + {{ if not (empty $server.SSLCertificate) }}listen [::]:{{ if $all.IsSSLPassthroughEnabled }}{{ $all.ListenPorts.SSLProxy }} proxy_protocol{{ else }}{{ $all.ListenPorts.HTTPS }}{{ if $all.Cfg.UseProxyProtocol }} proxy_protocol{{ end }}{{ end }}{{ end }} {{ if eq $server.Hostname "_" }} default_server reuseport backlog={{ $all.BacklogSize }}{{ end }} ssl {{ if $all.Cfg.UseHTTP2 }}http2{{ end }}; {{ end }} {{ end }} {{/* comment PEM sha is required to detect changes in the generated configuration and force a reload */}} # PEM sha: {{ $server.SSLPemChecksum }} ssl_certificate {{ $server.SSLCertificate }}; ssl_certificate_key {{ $server.SSLCertificate }}; - {{ if not (empty $server.SSLFullChainCertificate)}} + {{ if not (empty $server.SSLFullChainCertificate) }} ssl_trusted_certificate {{ $server.SSLFullChainCertificate }}; ssl_stapling on; ssl_stapling_verify on; @@ -630,7 +630,7 @@ stream { ssl_client_certificate {{ $server.CertificateAuth.CAFileName }}; ssl_verify_client {{ $server.CertificateAuth.VerifyClient }}; ssl_verify_depth {{ $server.CertificateAuth.ValidationDepth }}; - {{ if not (empty $server.CertificateAuth.ErrorPage)}} + {{ if not (empty $server.CertificateAuth.ErrorPage) }} error_page 495 496 = {{ $server.CertificateAuth.ErrorPage }}; {{ end }} {{ end }} @@ -643,7 +643,7 @@ stream { {{ $path := buildLocation $location }} {{ $authPath := buildAuthLocation $location }} - {{ if not (empty $location.Rewrite.AppRoot)}} + {{ if not (empty $location.Rewrite.AppRoot) }} if ($uri = /) { return 302 {{ $location.Rewrite.AppRoot }}; } diff --git a/mariadb/templates/deployment-error.yaml b/mariadb/templates/deployment-error.yaml index 78c4b1887..bfc56bb0e 100644 --- a/mariadb/templates/deployment-error.yaml +++ b/mariadb/templates/deployment-error.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.deployment_error }} {{- $envAll := . }} -{{- $serviceAccountName := "mariadb-ingress-error-pages"}} +{{- $serviceAccountName := "mariadb-ingress-error-pages" }} {{ tuple $envAll "error_pages" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1 diff --git a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml index 00b3f6ecc..a26e45573 100644 --- a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }} {{- $envAll := . }} -{{- $serviceAccountName := "prometheus-mysql-exporter"}} +{{- $serviceAccountName := "prometheus-mysql-exporter" }} {{ tuple $envAll "prometheus_mysql_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1 diff --git a/nagios/templates/utils/_object_definition.tpl b/nagios/templates/utils/_object_definition.tpl index d21d4e447..384e7bd94 100644 --- a/nagios/templates/utils/_object_definition.tpl +++ b/nagios/templates/utils/_object_definition.tpl @@ -20,7 +20,7 @@ limitations under the License. {{- range $object := $objects }} {{ range $config := $object }} define {{ $type }} { -{{- range $key, $value := $config}} +{{- range $key, $value := $config }} {{ $key }} {{ $value }} {{- end }} } diff --git a/nfs-provisioner/templates/deployment.yaml b/nfs-provisioner/templates/deployment.yaml index 198d8116e..015cdb113 100644 --- a/nfs-provisioner/templates/deployment.yaml +++ b/nfs-provisioner/templates/deployment.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.deployment }} {{- $envAll := . }} -{{- $serviceAccountName := printf "%s-%s" .Release.Name "nfs-provisioner"}} +{{- $serviceAccountName := printf "%s-%s" .Release.Name "nfs-provisioner" }} {{ tuple $envAll "nfs" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- kind: ClusterRole diff --git a/prometheus-alertmanager/templates/clusterrolebinding.yaml b/prometheus-alertmanager/templates/clusterrolebinding.yaml index ff70448b9..2efea538f 100644 --- a/prometheus-alertmanager/templates/clusterrolebinding.yaml +++ b/prometheus-alertmanager/templates/clusterrolebinding.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.clusterrolebinding }} {{- $envAll := . }} -{{- $serviceAccountName := printf "%s-%s" .Release.Name "alertmanager"}} +{{- $serviceAccountName := printf "%s-%s" .Release.Name "alertmanager" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding diff --git a/prometheus-alertmanager/templates/statefulset.yaml b/prometheus-alertmanager/templates/statefulset.yaml index 3e8a0015b..9735d2e6a 100644 --- a/prometheus-alertmanager/templates/statefulset.yaml +++ b/prometheus-alertmanager/templates/statefulset.yaml @@ -20,7 +20,7 @@ limitations under the License. {{- $mounts_alertmanager := .Values.pod.mounts.alertmanager.alertmanager }} {{- $mounts_alertmanager_init := .Values.pod.mounts.alertmanager.init_container }} -{{- $serviceAccountName := "alertmanager"}} +{{- $serviceAccountName := "alertmanager" }} {{ tuple $envAll "alertmanager" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1 diff --git a/prometheus-kube-state-metrics/templates/deployment.yaml b/prometheus-kube-state-metrics/templates/deployment.yaml index cbaae0c00..9d5a05558 100644 --- a/prometheus-kube-state-metrics/templates/deployment.yaml +++ b/prometheus-kube-state-metrics/templates/deployment.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.deployment }} {{- $envAll := . }} -{{- $serviceAccountName := printf "%s-%s" .Release.Name "kube-state-metrics"}} +{{- $serviceAccountName := printf "%s-%s" .Release.Name "kube-state-metrics" }} {{ tuple $envAll "kube_state_metrics" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/prometheus-node-exporter/templates/daemonset.yaml b/prometheus-node-exporter/templates/daemonset.yaml index 645388253..73aaeabbf 100644 --- a/prometheus-node-exporter/templates/daemonset.yaml +++ b/prometheus-node-exporter/templates/daemonset.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.daemonset }} {{- $envAll := . }} -{{- $serviceAccountName := printf "%s-%s" .Release.Name "node-exporter"}} +{{- $serviceAccountName := printf "%s-%s" .Release.Name "node-exporter" }} {{ tuple $envAll "node_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/prometheus-process-exporter/templates/daemonset.yaml b/prometheus-process-exporter/templates/daemonset.yaml index 126fd5e60..55a34c418 100644 --- a/prometheus-process-exporter/templates/daemonset.yaml +++ b/prometheus-process-exporter/templates/daemonset.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.daemonset }} {{- $envAll := . }} -{{- $serviceAccountName := printf "%s-%s" .Release.Name "process-exporter"}} +{{- $serviceAccountName := printf "%s-%s" .Release.Name "process-exporter" }} {{ tuple $envAll "process_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/prometheus/templates/statefulset.yaml b/prometheus/templates/statefulset.yaml index 0a3dc1665..56cfb55e4 100644 --- a/prometheus/templates/statefulset.yaml +++ b/prometheus/templates/statefulset.yaml @@ -21,7 +21,7 @@ limitations under the License. {{- $mounts_prometheus_init := .Values.pod.mounts.prometheus.init_container }} {{- $promUserSecret := .Values.secrets.prometheus.admin }} -{{- $serviceAccountName := printf "%s-%s" .Release.Name "prometheus"}} +{{- $serviceAccountName := printf "%s-%s" .Release.Name "prometheus" }} {{ tuple $envAll "prometheus" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: rbac.authorization.k8s.io/v1beta1 diff --git a/prometheus/values.yaml b/prometheus/values.yaml index 28ed48700..5b00260dd 100644 --- a/prometheus/values.yaml +++ b/prometheus/values.yaml @@ -1072,7 +1072,7 @@ conf: labels: severity: warning annotations: - description: Reloading Alertmanager's configuration has failed for {{ $labels.namespace }}/{{ $labels.pod}}. + description: Reloading Alertmanager's configuration has failed for {{ $labels.namespace }}/{{ $labels.pod }}. summary: Alertmanager configuration reload has failed etcd3: groups: diff --git a/redis/templates/deployment.yaml b/redis/templates/deployment.yaml index 98cd1b721..edec6247d 100644 --- a/redis/templates/deployment.yaml +++ b/redis/templates/deployment.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.deployment }} {{- $envAll := . }} -{{- $serviceAccountName := "redis"}} +{{- $serviceAccountName := "redis" }} {{ tuple $envAll "redis" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1 diff --git a/registry/templates/daemonset-registry-proxy.yaml b/registry/templates/daemonset-registry-proxy.yaml index 1fe262b47..168e471d2 100644 --- a/registry/templates/daemonset-registry-proxy.yaml +++ b/registry/templates/daemonset-registry-proxy.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_registry_proxy }} {{- $envAll := . }} -{{- $serviceAccountName := "docker-registry-proxy"}} +{{- $serviceAccountName := "docker-registry-proxy" }} {{ tuple $envAll "registry_proxy" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1 diff --git a/registry/templates/deployment-registry.yaml b/registry/templates/deployment-registry.yaml index 1f11d2218..0a67bd158 100644 --- a/registry/templates/deployment-registry.yaml +++ b/registry/templates/deployment-registry.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.deployment_registry }} {{- $envAll := . }} -{{- $serviceAccountName := "docker-registry"}} +{{- $serviceAccountName := "docker-registry" }} {{ tuple $envAll "registry" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1 diff --git a/registry/templates/job-bootstrap.yaml b/registry/templates/job-bootstrap.yaml index d0f56cf09..8c2b6250d 100644 --- a/registry/templates/job-bootstrap.yaml +++ b/registry/templates/job-bootstrap.yaml @@ -18,7 +18,7 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.bootstrap.enabled }} -{{- $serviceAccountName := "docker-bootstrap"}} +{{- $serviceAccountName := "docker-bootstrap" }} {{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: batch/v1