openstack/openstack-helm
Code Issues Proposed changes

MariaDB: Remove $dependencies for helm-toolkit

Browse Source 
This PS removes $dependencies from
 - monitoring/prometheus/exporter-deployment.yaml
 - monitoring/prometheus/exporter-job-create-user.yaml

as $dependencies cause render error.

Change-Id: I38e176d25f735c9a6712497d20a3310e438a48a1
This commit is contained in:
Siri Kim 2018-05-15 02:58:43 +00:00
parent 5cf6367525
commit bac3985306
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,10 +16,9 @@ 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 := . }}
{{- $dependencies := .Values.dependencies.static.prometheus_mysql_exporter }}
{{- $serviceAccountName := "prometheus-mysql-exporter"}} {{- $serviceAccountName := "prometheus-mysql-exporter"}}
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "prometheus_mysql_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
@ -39,7 +38,7 @@ spec:
{{ .Values.labels.prometheus_mysql_exporter.node_selector_key }}: {{ .Values.labels.prometheus_mysql_exporter.node_selector_value }} {{ .Values.labels.prometheus_mysql_exporter.node_selector_key }}: {{ .Values.labels.prometheus_mysql_exporter.node_selector_value }}
terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.prometheus_mysql_exporter.timeout | default "30" }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.prometheus_mysql_exporter.timeout | default "30" }}
initContainers: initContainers:
{{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll "prometheus_mysql_exporter" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: mysql-exporter - name: mysql-exporter
image: {{ .Values.images.tags.prometheus_mysql_exporter }} image: {{ .Values.images.tags.prometheus_mysql_exporter }}

5
mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
View File

@ -16,10 +16,9 @@ limitations under the License.
{{- if and .Values.manifests.monitoring.prometheus.job_user_create .Values.monitoring.prometheus.enabled }} {{- if and .Values.manifests.monitoring.prometheus.job_user_create .Values.monitoring.prometheus.enabled }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.static.prometheus_create_mysql_user }}
{{- $serviceAccountName := "exporter-create-sql-user" }} {{- $serviceAccountName := "exporter-create-sql-user" }}
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "prometheus_mysql_exporter" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
@ -36,7 +35,7 @@ spec:
nodeSelector: nodeSelector:
{{ .Values.labels.prometheus_mysql_exporter.node_selector_key }}: {{ .Values.labels.prometheus_mysql_exporter.node_selector_value }} {{ .Values.labels.prometheus_mysql_exporter.node_selector_key }}: {{ .Values.labels.prometheus_mysql_exporter.node_selector_value }}
initContainers: initContainers:
{{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll "prometheus_mysql_exporter" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: exporter-create-sql-user - name: exporter-create-sql-user
image: {{ .Values.images.tags.prometheus_create_mysql_user }} image: {{ .Values.images.tags.prometheus_create_mysql_user }}