openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "'NOP' cleanup for more consistent white-space use in charts"

Browse Source
This commit is contained in:
Zuul 2019-01-04 07:32:39 +00:00 committed by Gerrit Code Review
commit 9eb31f0374
45 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calico/templates/daemonset-calico-etcd.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.daemonset_calico_etcd }} {{- if .Values.manifests.daemonset_calico_etcd }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "calico-etcd"}} {{- $serviceAccountName := "calico-etcd" }}
{{ tuple $envAll "calico-etcd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "calico-etcd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---

14
calico/templates/daemonset-calico-node.yaml
View File

@ -42,7 +42,7 @@ limitations under the License.
{{- $_ := set .Values.conf.node "CALICO_IPV4POOL_CIDR" .Values.networking.podSubnet -}} {{- $_ := set .Values.conf.node "CALICO_IPV4POOL_CIDR" .Values.networking.podSubnet -}}
{{- end -}} {{- end -}}
{{- $serviceAccountName := "calico-node"}} {{- $serviceAccountName := "calico-node" }}
{{ tuple $envAll "calico_node" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "calico_node" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1
@ -146,7 +146,7 @@ spec:
configMapKeyRef: configMapKeyRef:
name: calico-etc name: calico-etc
key: etcd_endpoints key: etcd_endpoints
{{ if .Values.endpoints.etcd.auth.client.tls.ca}} {{ if .Values.endpoints.etcd.auth.client.tls.ca }}
- name: ETCD_CA_CERT_FILE - name: ETCD_CA_CERT_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.ca }} value: {{ .Values.endpoints.etcd.auth.client.path.ca }}
- name: ETCD_CA_CERT - name: ETCD_CA_CERT
@ -155,7 +155,7 @@ spec:
name: calico-etcd-secrets name: calico-etcd-secrets
key: tls.ca key: tls.ca
{{ end }} {{ end }}
{{ if .Values.endpoints.etcd.auth.client.tls.key}} {{ if .Values.endpoints.etcd.auth.client.tls.key }}
- name: ETCD_KEY_FILE - name: ETCD_KEY_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.key }} value: {{ .Values.endpoints.etcd.auth.client.path.key }}
- name: ETCD_KEY - name: ETCD_KEY
@ -164,7 +164,7 @@ spec:
name: calico-etcd-secrets name: calico-etcd-secrets
key: tls.key key: tls.key
{{ end }} {{ end }}
{{ if .Values.endpoints.etcd.auth.client.tls.crt}} {{ if .Values.endpoints.etcd.auth.client.tls.crt }}
- name: ETCD_CERT_FILE - name: ETCD_CERT_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.crt }} value: {{ .Values.endpoints.etcd.auth.client.path.crt }}
- name: ETCD_CERT - name: ETCD_CERT
@ -299,15 +299,15 @@ spec:
key: etcd_endpoints key: etcd_endpoints
# etcd certs # etcd certs
{{ if .Values.endpoints.etcd.auth.client.tls.ca}} {{ if .Values.endpoints.etcd.auth.client.tls.ca }}
- name: ETCD_CA_CERT_FILE - name: ETCD_CA_CERT_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.ca }} value: {{ .Values.endpoints.etcd.auth.client.path.ca }}
{{ end }} {{ end }}
{{ if .Values.endpoints.etcd.auth.client.tls.key}} {{ if .Values.endpoints.etcd.auth.client.tls.key }}
- name: ETCD_KEY_FILE - name: ETCD_KEY_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.key }} value: {{ .Values.endpoints.etcd.auth.client.path.key }}
{{ end }} {{ end }}
{{ if .Values.endpoints.etcd.auth.client.tls.crt}} {{ if .Values.endpoints.etcd.auth.client.tls.crt }}
- name: ETCD_CERT_FILE - name: ETCD_CERT_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.crt }} value: {{ .Values.endpoints.etcd.auth.client.path.crt }}
{{ end }} {{ end }}

8
calico/templates/deployment-calico-kube-controllers.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.deployment_calico_kube_controllers }} {{- if .Values.manifests.deployment_calico_kube_controllers }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "calico-kube-controllers"}} {{- $serviceAccountName := "calico-kube-controllers" }}
{{ tuple $envAll "calico_kube_controllers" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "calico_kube_controllers" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
kind: ClusterRoleBinding kind: ClusterRoleBinding
@ -126,15 +126,15 @@ spec:
{{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.conf.controllers | indent 12 }} {{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.conf.controllers | indent 12 }}
# etcd tls files # etcd tls files
{{ if .Values.endpoints.etcd.auth.client.tls.ca}} {{ if .Values.endpoints.etcd.auth.client.tls.ca }}
- name: ETCD_CA_CERT_FILE - name: ETCD_CA_CERT_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.ca }} value: {{ .Values.endpoints.etcd.auth.client.path.ca }}
{{ end }} {{ end }}
{{ if .Values.endpoints.etcd.auth.client.tls.key}} {{ if .Values.endpoints.etcd.auth.client.tls.key }}
- name: ETCD_KEY_FILE - name: ETCD_KEY_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.key }} value: {{ .Values.endpoints.etcd.auth.client.path.key }}
{{ end }} {{ end }}
{{ if .Values.endpoints.etcd.auth.client.tls.crt}} {{ if .Values.endpoints.etcd.auth.client.tls.crt }}
- name: ETCD_CERT_FILE - name: ETCD_CERT_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.crt }} value: {{ .Values.endpoints.etcd.auth.client.path.crt }}
{{ end }} {{ end }}

8
calico/templates/job-calico-settings.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.job_calico_settings }} {{- if .Values.manifests.job_calico_settings }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "calico-settings"}} {{- $serviceAccountName := "calico-settings" }}
{{ tuple $envAll "calico_settings" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "calico_settings" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1
@ -61,15 +61,15 @@ spec:
configMapKeyRef: configMapKeyRef:
name: calico-etc name: calico-etc
key: etcd_endpoints key: etcd_endpoints
{{ if .Values.endpoints.etcd.auth.client.tls.ca}} {{ if .Values.endpoints.etcd.auth.client.tls.ca }}
- name: ETCD_CA_CERT_FILE - name: ETCD_CA_CERT_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.ca }} value: {{ .Values.endpoints.etcd.auth.client.path.ca }}
{{ end }} {{ end }}
{{ if .Values.endpoints.etcd.auth.client.tls.key}} {{ if .Values.endpoints.etcd.auth.client.tls.key }}
- name: ETCD_KEY_FILE - name: ETCD_KEY_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.key }} value: {{ .Values.endpoints.etcd.auth.client.path.key }}
{{ end }} {{ end }}
{{ if .Values.endpoints.etcd.auth.client.tls.crt}} {{ if .Values.endpoints.etcd.auth.client.tls.crt }}
- name: ETCD_CERT_FILE - name: ETCD_CERT_FILE
value: {{ .Values.endpoints.etcd.auth.client.path.crt }} value: {{ .Values.endpoints.etcd.auth.client.path.crt }}
{{ end }} {{ end }}

2
ceph-client/templates/deployment-mds.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if and .Values.manifests.deployment_mds ( and .Values.deployment.ceph .Values.conf.features.mds) }} {{- if and .Values.manifests.deployment_mds ( and .Values.deployment.ceph .Values.conf.features.mds) }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "ceph-mds"}} {{- $serviceAccountName := "ceph-mds" }}
{{ tuple $envAll "mds" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "mds" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
kind: Deployment kind: Deployment

2
ceph-client/templates/deployment-mgr.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if and .Values.manifests.deployment_mgr (and .Values.deployment.ceph .Values.conf.features.mgr ) }} {{- if and .Values.manifests.deployment_mgr (and .Values.deployment.ceph .Values.conf.features.mgr ) }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "ceph-mgr"}} {{- $serviceAccountName := "ceph-mgr" }}
{{ tuple $envAll "mgr" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "mgr" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
kind: Deployment kind: Deployment

2
ceph-client/templates/job-bootstrap.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "ceph-client-bootstrap"}} {{- $serviceAccountName := "ceph-client-bootstrap" }}
{{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1

2
ceph-client/templates/service-mgr.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. 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 := . }} {{- $envAll := . }}
{{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.ceph_mgr }} {{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.ceph_mgr }}
--- ---

2
ceph-mon/templates/daemonset-mon.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if and .Values.manifests.daemonset_mon .Values.deployment.ceph }} {{- if and .Values.manifests.daemonset_mon .Values.deployment.ceph }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "ceph-mon"}} {{- $serviceAccountName := "ceph-mon" }}
{{ tuple $envAll "mon" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "mon" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1

2
ceph-mon/templates/deployment-moncheck.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if and .Values.manifests.deployment_moncheck .Values.deployment.ceph }} {{- if and .Values.manifests.deployment_moncheck .Values.deployment.ceph }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "ceph-mon-check"}} {{- $serviceAccountName := "ceph-mon-check" }}
{{ tuple $envAll "moncheck" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "moncheck" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
kind: Deployment kind: Deployment

2
ceph-mon/templates/job-bootstrap.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "ceph-bootstrap"}} {{- $serviceAccountName := "ceph-bootstrap" }}
{{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1

2
ceph-mon/templates/job-keyring.yaml
View File

@ -80,7 +80,7 @@ spec:
value: /tmp value: /tmp
- name: CEPH_TEMPLATES_DIR - name: CEPH_TEMPLATES_DIR
value: /tmp/templates value: /tmp/templates
{{- if eq $cephBootstrapKey "mon"}} {{- if eq $cephBootstrapKey "mon" }}
- name: CEPH_KEYRING_NAME - name: CEPH_KEYRING_NAME
value: ceph.mon.keyring value: ceph.mon.keyring
- name: CEPH_KEYRING_TEMPLATE - name: CEPH_KEYRING_TEMPLATE

2
ceph-osd/templates/daemonset-osd.yaml
View File

@ -350,7 +350,7 @@ spec:
{{- if .Values.manifests.daemonset_osd }} {{- if .Values.manifests.daemonset_osd }}
{{- $daemonset := "osd" }} {{- $daemonset := "osd" }}
{{- $configMapName := "ceph-osd-etc" }} {{- $configMapName := "ceph-osd-etc" }}
{{- $serviceAccountName := "ceph-osd"}} {{- $serviceAccountName := "ceph-osd" }}
{{ tuple . "osd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple . "osd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName . | include "ceph.osd.daemonset" | toString | fromYaml }} {{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName . | include "ceph.osd.daemonset" | toString | fromYaml }}
{{- $configmap_yaml := "ceph.osd.configmap.etc" }} {{- $configmap_yaml := "ceph.osd.configmap.etc" }}

2
ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
View File

@ -284,7 +284,7 @@ limitations under the License.
{{- $_ := set $context.Values "__tmpYAML" dict }} {{- $_ := set $context.Values "__tmpYAML" dict }}
{{ $dsNodeName := index $context.Values.__daemonset_yaml.metadata "name" }} {{ $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 }} {{- if not $context.Values.__tmpYAML.metadata }}{{- $_ := set $context.Values.__tmpYAML "metadata" dict }}{{- end }}
{{- $_ := set $context.Values.__tmpYAML.metadata "name" $localDsNodeName }} {{- $_ := set $context.Values.__tmpYAML.metadata "name" $localDsNodeName }}

2
ceph-provisioners/templates/job-bootstrap.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "ceph-client-bootstrap"}} {{- $serviceAccountName := "ceph-client-bootstrap" }}
{{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1

2
ceph-rgw/templates/deployment-rgw.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if and .Values.manifests.deployment_rgw ( and .Values.deployment.ceph .Values.conf.features.rgw ) }} {{- if and .Values.manifests.deployment_rgw ( and .Values.deployment.ceph .Values.conf.features.rgw ) }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "ceph-rgw"}} {{- $serviceAccountName := "ceph-rgw" }}
{{ tuple $envAll "rgw" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "rgw" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
kind: Deployment kind: Deployment

2
elasticsearch/templates/cron-job-curator.yaml
View File

@ -19,7 +19,7 @@ limitations under the License.
{{- $esUserSecret := .Values.secrets.elasticsearch.user }} {{- $esUserSecret := .Values.secrets.elasticsearch.user }}
{{- $serviceAccountName := "elastic-curator"}} {{- $serviceAccountName := "elastic-curator" }}
{{ tuple $envAll "curator" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "curator" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: batch/v1beta1 apiVersion: batch/v1beta1

2
elasticsearch/templates/deployment-client.yaml
View File

@ -21,7 +21,7 @@ limitations under the License.
{{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }} {{- $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" }} {{ tuple $envAll "elasticsearch_client" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1

2
elasticsearch/templates/deployment-master.yaml
View File

@ -19,7 +19,7 @@ limitations under the License.
{{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }} {{- $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" }} {{ tuple $envAll "elasticsearch_master" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1

2
elasticsearch/templates/statefulset-data.yaml
View File

@ -19,7 +19,7 @@ limitations under the License.
{{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }} {{- $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" }} {{ tuple $envAll "elasticsearch_data" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1

2
flannel/templates/daemonset-kube-flannel-ds.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.daemonset_kube_flannel_ds }} {{- if .Values.manifests.daemonset_kube_flannel_ds }}
{{- $envAll := . }} {{- $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" }} {{ tuple $envAll "flannel" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
kind: ClusterRole kind: ClusterRole

2
fluent-logging/templates/daemonset-fluent-bit.yaml
View File

@ -112,7 +112,7 @@ spec:
- /tmp/fluent-bit.sh - /tmp/fluent-bit.sh
env: env:
- name: FLUENTD_HOST - 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 - name: FLUENTD_PORT
value: {{ tuple "fluentd" "internal" "service" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} value: {{ tuple "fluentd" "internal" "service" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
volumeMounts: volumeMounts:

2
fluent-logging/templates/job-elasticsearch-template.yaml
View File

@ -20,7 +20,7 @@ limitations under the License.
{{- $mounts_elasticsearch_template := .Values.pod.mounts.elasticsearch_template.elasticsearch_template }} {{- $mounts_elasticsearch_template := .Values.pod.mounts.elasticsearch_template.elasticsearch_template }}
{{- $mounts_elasticsearch_template_init := .Values.pod.mounts.elasticsearch_template.init_container }} {{- $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" }} {{ tuple $envAll "elasticsearch_template" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1

2
fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
View File

@ -21,7 +21,7 @@ limitations under the License.
{{ $fluentd_metrics_path := "api/plugins.json" }} {{ $fluentd_metrics_path := "api/plugins.json" }}
{{ $fluentd_metrics_host := printf "http://%s/%s" $fluentd_host $fluentd_metrics_path }} {{ $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" }} {{ tuple $envAll "prometheus_fluentd_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1

8
grafana/values.yaml
View File

@ -5485,7 +5485,7 @@ conf:
- expr: irate(ceph_pool_rd{pool_id=~"$pool",application="ceph",release_group="$ceph_cluster"}[3m]) - expr: irate(ceph_pool_rd{pool_id=~"$pool",application="ceph",release_group="$ceph_cluster"}[3m])
interval: "$interval" interval: "$interval"
intervalFactor: 1 intervalFactor: 1
legendFormat: Read - {{ $pool_name}} legendFormat: Read - {{ $pool_name }}
refId: B refId: B
step: 60 step: 60
- expr: irate(ceph_pool_wr{pool_id=~"$pool",application="ceph",release_group="$ceph_cluster"}[3m]) - expr: irate(ceph_pool_wr{pool_id=~"$pool",application="ceph",release_group="$ceph_cluster"}[3m])
@ -14797,7 +14797,7 @@ conf:
format: time_series format: time_series
interval: '' interval: ''
intervalFactor: 2 intervalFactor: 2
legendFormat: "{{ upstream}}" legendFormat: "{{ upstream }}"
metric: nginx_upstream_requests metric: nginx_upstream_requests
refId: A refId: A
step: 10 step: 10
@ -14938,7 +14938,7 @@ conf:
- expr: sum(irate(nginx_connections_total[5m])) by (type) - expr: sum(irate(nginx_connections_total[5m])) by (type)
format: time_series format: time_series
intervalFactor: 2 intervalFactor: 2
legendFormat: "{{ type}}" legendFormat: "{{ type }}"
metric: nginx_server_connections metric: nginx_server_connections
refId: A refId: A
step: 10 step: 10
@ -15080,7 +15080,7 @@ conf:
format: time_series format: time_series
interval: '' interval: ''
intervalFactor: 2 intervalFactor: 2
legendFormat: "{{ server_zone}}" legendFormat: "{{ server_zone }}"
metric: nginx_server_requests metric: nginx_server_requests
refId: A refId: A
step: 10 step: 10

2
helm-toolkit/templates/endpoints/_service_name_endpoint_with_namespace_lookup.tpl
View File

@ -48,7 +48,7 @@ return: |
{{- $typeYamlSafe := $type | replace "-" "_" }} {{- $typeYamlSafe := $type | replace "-" "_" }}
{{- $endpointMap := index $context.Values.endpoints $typeYamlSafe }} {{- $endpointMap := index $context.Values.endpoints $typeYamlSafe }}
{{- with $endpointMap -}} {{- with $endpointMap -}}
{{- $endpointName := index .hosts $endpoint | default .hosts.default}} {{- $endpointName := index .hosts $endpoint | default .hosts.default }}
{{- $endpointNamespace := .namespace | default $context.Release.Namespace }} {{- $endpointNamespace := .namespace | default $context.Release.Namespace }}
{{- if regexMatch "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+" $endpointName }} {{- if regexMatch "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+" $endpointName }}
{{- if .service.name }} {{- if .service.name }}

6
helm-toolkit/templates/manifests/_ingress.tpl
View File

@ -172,9 +172,9 @@ metadata:
{{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }} {{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }}
spec: spec:
rules: 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 := 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 }} {{- end }}
{{- if not ( hasSuffix ( printf ".%s.svc.%s" $envAll.Release.Namespace $envAll.Values.endpoints.cluster_domain_suffix) $hostNameFull) }} {{- if not ( hasSuffix ( printf ".%s.svc.%s" $envAll.Release.Namespace $envAll.Values.endpoints.cluster_domain_suffix) $hostNameFull) }}
{{- range $key2, $ingressController := tuple "namespace" "cluster" }} {{- range $key2, $ingressController := tuple "namespace" "cluster" }}
@ -202,7 +202,7 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
rules: rules:
{{ $hostNameFullRules | include "helm-toolkit.manifests.ingress._host_rules" | indent 4}} {{ $hostNameFullRules | include "helm-toolkit.manifests.ingress._host_rules" | indent 4 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

2
ingress/templates/deployment-error.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.deployment_error }} {{- if .Values.manifests.deployment_error }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "ingress-error-pages"}} {{- $serviceAccountName := "ingress-error-pages" }}
{{ tuple $envAll "error_pages" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "error_pages" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1

2
kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
View File

@ -20,7 +20,7 @@ set -ex
curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \ curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \
-XPOST "${ELASTICSEARCH_ENDPOINT}/.kibana/index-pattern/{{ . }}-*" -H 'Content-Type: application/json' \ -XPOST "${ELASTICSEARCH_ENDPOINT}/.kibana/index-pattern/{{ . }}-*" -H 'Content-Type: application/json' \
-d '{"title":"{{ . }}-*","timeFieldName":"@timestamp","notExpandable":true}' -d '{"title":"{{ . }}-*","timeFieldName":"@timestamp","notExpandable":true}'
{{- end}} {{- end }}
curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \ curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \
-XPOST "${ELASTICSEARCH_ENDPOINT}/.kibana/config/5.6.4" -H 'Content-Type: application/json' \ -XPOST "${ELASTICSEARCH_ENDPOINT}/.kibana/config/5.6.4" -H 'Content-Type: application/json' \
-d '{"defaultIndex" : "{{ .Values.conf.create_kibana_indexes.default_index }}-*"}' -d '{"defaultIndex" : "{{ .Values.conf.create_kibana_indexes.default_index }}-*"}'

26
mariadb/files/nginx.tmpl
View File

@ -25,7 +25,7 @@ worker_processes {{ $cfg.WorkerProcesses }};
pid /run/nginx.pid; pid /run/nginx.pid;
{{ if ne .MaxOpenFiles 0 }} {{ if ne .MaxOpenFiles 0 }}
worker_rlimit_nofile {{ .MaxOpenFiles }}; worker_rlimit_nofile {{ .MaxOpenFiles }};
{{ end}} {{ end }}
{{/* http://nginx.org/en/docs/ngx_core_module.html#worker_shutdown_timeout */}} {{/* http://nginx.org/en/docs/ngx_core_module.html#worker_shutdown_timeout */}}
{{/* avoid waiting too long during a reload */}} {{/* avoid waiting too long during a reload */}}
@ -228,7 +228,7 @@ http {
{{ else }} {{ else }}
default "$http_x_forwarded_for, $realip_remote_addr"; default "$http_x_forwarded_for, $realip_remote_addr";
'' "$realip_remote_addr"; '' "$realip_remote_addr";
{{ end}} {{ end }}
} }
{{ end }} {{ end }}
@ -581,15 +581,15 @@ stream {
{{ $all := .First }} {{ $all := .First }}
{{ $server := .Second }} {{ $server := .Second }}
{{ range $address := $all.Cfg.BindAddressIpv4 }} {{ 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 }} {{ 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 }}
{{ if $all.IsIPV6Enabled }} {{ if $all.IsIPV6Enabled }}
{{ range $address := $all.Cfg.BindAddressIpv6 }} {{ 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 }} {{ 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 }}
{{ end }} {{ end }}
set $proxy_upstream_name "-"; 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. */}} {{/* This listener must always have proxy_protocol enabled, because the SNI listener forwards on source IP info in it. */}}
{{ if not (empty $server.SSLCertificate) }} {{ if not (empty $server.SSLCertificate) }}
{{ range $address := $all.Cfg.BindAddressIpv4 }} {{ 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 }} {{ 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 }} {{ end }}
{{ if $all.IsIPV6Enabled }} {{ if $all.IsIPV6Enabled }}
{{ range $address := $all.Cfg.BindAddressIpv6 }} {{ 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 }} {{ 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 }}
{{ end }} {{ end }}
{{/* comment PEM sha is required to detect changes in the generated configuration and force a reload */}} {{/* comment PEM sha is required to detect changes in the generated configuration and force a reload */}}
# PEM sha: {{ $server.SSLPemChecksum }} # PEM sha: {{ $server.SSLPemChecksum }}
ssl_certificate {{ $server.SSLCertificate }}; ssl_certificate {{ $server.SSLCertificate }};
ssl_certificate_key {{ $server.SSLCertificate }}; ssl_certificate_key {{ $server.SSLCertificate }};
{{ if not (empty $server.SSLFullChainCertificate)}} {{ if not (empty $server.SSLFullChainCertificate) }}
ssl_trusted_certificate {{ $server.SSLFullChainCertificate }}; ssl_trusted_certificate {{ $server.SSLFullChainCertificate }};
ssl_stapling on; ssl_stapling on;
ssl_stapling_verify on; ssl_stapling_verify on;
@ -630,7 +630,7 @@ stream {
ssl_client_certificate {{ $server.CertificateAuth.CAFileName }}; ssl_client_certificate {{ $server.CertificateAuth.CAFileName }};
ssl_verify_client {{ $server.CertificateAuth.VerifyClient }}; ssl_verify_client {{ $server.CertificateAuth.VerifyClient }};
ssl_verify_depth {{ $server.CertificateAuth.ValidationDepth }}; 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 }}; error_page 495 496 = {{ $server.CertificateAuth.ErrorPage }};
{{ end }} {{ end }}
{{ end }} {{ end }}
@ -643,7 +643,7 @@ stream {
{{ $path := buildLocation $location }} {{ $path := buildLocation $location }}
{{ $authPath := buildAuthLocation $location }} {{ $authPath := buildAuthLocation $location }}
{{ if not (empty $location.Rewrite.AppRoot)}} {{ if not (empty $location.Rewrite.AppRoot) }}
if ($uri = /) { if ($uri = /) {
return 302 {{ $location.Rewrite.AppRoot }}; return 302 {{ $location.Rewrite.AppRoot }};
} }

2
mariadb/templates/deployment-error.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.deployment_error }} {{- if .Values.manifests.deployment_error }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "mariadb-ingress-error-pages"}} {{- $serviceAccountName := "mariadb-ingress-error-pages" }}
{{ tuple $envAll "error_pages" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "error_pages" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1

2
mariadb/templates/monitoring/prometheus/exporter-deployment.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }} {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "prometheus-mysql-exporter"}} {{- $serviceAccountName := "prometheus-mysql-exporter" }}
{{ tuple $envAll "prometheus_mysql_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "prometheus_mysql_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1

2
nagios/templates/utils/_object_definition.tpl
View File

@ -20,7 +20,7 @@ limitations under the License.
{{- range $object := $objects }} {{- range $object := $objects }}
{{ range $config := $object }} {{ range $config := $object }}
define {{ $type }} { define {{ $type }} {
{{- range $key, $value := $config}} {{- range $key, $value := $config }}
{{ $key }} {{ $value }} {{ $key }} {{ $value }}
{{- end }} {{- end }}
} }

2
nfs-provisioner/templates/deployment.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.deployment }} {{- if .Values.manifests.deployment }}
{{- $envAll := . }} {{- $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" }} {{ tuple $envAll "nfs" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
kind: ClusterRole kind: ClusterRole

2
prometheus-alertmanager/templates/clusterrolebinding.yaml
View File

@ -16,7 +16,7 @@ limitations under the License.
{{- if .Values.manifests.clusterrolebinding }} {{- if .Values.manifests.clusterrolebinding }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := printf "%s-%s" .Release.Name "alertmanager"}} {{- $serviceAccountName := printf "%s-%s" .Release.Name "alertmanager" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding

2
prometheus-alertmanager/templates/statefulset.yaml
View File

@ -20,7 +20,7 @@ limitations under the License.
{{- $mounts_alertmanager := .Values.pod.mounts.alertmanager.alertmanager }} {{- $mounts_alertmanager := .Values.pod.mounts.alertmanager.alertmanager }}
{{- $mounts_alertmanager_init := .Values.pod.mounts.alertmanager.init_container }} {{- $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" }} {{ tuple $envAll "alertmanager" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1

2
prometheus-kube-state-metrics/templates/deployment.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.deployment }} {{- if .Values.manifests.deployment }}
{{- $envAll := . }} {{- $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" }} {{ tuple $envAll "kube_state_metrics" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1

2
prometheus-node-exporter/templates/daemonset.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.daemonset }} {{- if .Values.manifests.daemonset }}
{{- $envAll := . }} {{- $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" }} {{ tuple $envAll "node_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1

2
prometheus-process-exporter/templates/daemonset.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.daemonset }} {{- if .Values.manifests.daemonset }}
{{- $envAll := . }} {{- $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" }} {{ tuple $envAll "process_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1

2
prometheus/templates/statefulset.yaml
View File

@ -21,7 +21,7 @@ limitations under the License.
{{- $mounts_prometheus_init := .Values.pod.mounts.prometheus.init_container }} {{- $mounts_prometheus_init := .Values.pod.mounts.prometheus.init_container }}
{{- $promUserSecret := .Values.secrets.prometheus.admin }} {{- $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" }} {{ tuple $envAll "prometheus" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1

2
prometheus/values.yaml
View File

@ -1072,7 +1072,7 @@ conf:
labels: labels:
severity: warning severity: warning
annotations: 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 summary: Alertmanager configuration reload has failed
etcd3: etcd3:
groups: groups:

2
redis/templates/deployment.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.deployment }} {{- if .Values.manifests.deployment }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "redis"}} {{- $serviceAccountName := "redis" }}
{{ tuple $envAll "redis" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "redis" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1

2
registry/templates/daemonset-registry-proxy.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.daemonset_registry_proxy }} {{- if .Values.manifests.daemonset_registry_proxy }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "docker-registry-proxy"}} {{- $serviceAccountName := "docker-registry-proxy" }}
{{ tuple $envAll "registry_proxy" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "registry_proxy" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1

2
registry/templates/deployment-registry.yaml
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.deployment_registry }} {{- if .Values.manifests.deployment_registry }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $serviceAccountName := "docker-registry"}} {{- $serviceAccountName := "docker-registry" }}
{{ tuple $envAll "registry" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "registry" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1

2
registry/templates/job-bootstrap.yaml
View File

@ -18,7 +18,7 @@ limitations under the License.
{{- $envAll := . }} {{- $envAll := . }}
{{- if .Values.bootstrap.enabled }} {{- if .Values.bootstrap.enabled }}
{{- $serviceAccountName := "docker-bootstrap"}} {{- $serviceAccountName := "docker-bootstrap" }}
{{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "bootstrap" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1