From e5f389410b9114a69df354ab53e040fe02e34aef Mon Sep 17 00:00:00 2001 From: Aisuko Date: Sun, 25 Aug 2019 05:40:22 +0800 Subject: [PATCH] Replace the chart name with template and reformat chart's ObjectMeta resource (#16083) Signed-off-by: Aisuko --- stable/influxdb/Chart.yaml | 2 +- stable/influxdb/templates/backup-cronjob.yaml | 6 +++--- stable/influxdb/templates/config.yaml | 6 +++--- stable/influxdb/templates/deployment.yaml | 6 +++--- stable/influxdb/templates/ingress.yaml | 6 +++--- stable/influxdb/templates/init-config.yaml | 6 +++--- stable/influxdb/templates/post-install-set-auth.yaml | 4 ++-- stable/influxdb/templates/pvc.yaml | 2 +- stable/influxdb/templates/secret.yaml | 4 ++-- stable/influxdb/templates/service.yaml | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/stable/influxdb/Chart.yaml b/stable/influxdb/Chart.yaml index 97a12ff62a..d19a25134a 100755 --- a/stable/influxdb/Chart.yaml +++ b/stable/influxdb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: influxdb -version: 1.3.2 +version: 1.3.3 appVersion: 1.7.6 description: Scalable datastore for metrics, events, and real-time analytics. keywords: diff --git a/stable/influxdb/templates/backup-cronjob.yaml b/stable/influxdb/templates/backup-cronjob.yaml index 8918de1082..619b3a1cd2 100644 --- a/stable/influxdb/templates/backup-cronjob.yaml +++ b/stable/influxdb/templates/backup-cronjob.yaml @@ -2,10 +2,10 @@ apiVersion: batch/v1beta1 kind: CronJob metadata: - name: {{ template "influxdb.fullname" . }}-backup + name: "{{ template "influxdb.fullname" . }}-backup" labels: - app: {{ template "influxdb.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "influxdb.fullname" . }}" + chart: "{{ template "influxdb.chart" . }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" annotations: diff --git a/stable/influxdb/templates/config.yaml b/stable/influxdb/templates/config.yaml index 1a5cfa80d2..2cc83da80a 100644 --- a/stable/influxdb/templates/config.yaml +++ b/stable/influxdb/templates/config.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "influxdb.fullname" . }} + name: "{{ template "influxdb.fullname" . }}" labels: - app: {{ template "influxdb.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "influxdb.fullname" . }}" + chart: "{{ template "influxdb.chart" . }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" data: diff --git a/stable/influxdb/templates/deployment.yaml b/stable/influxdb/templates/deployment.yaml index e74e250c40..687917cce0 100644 --- a/stable/influxdb/templates/deployment.yaml +++ b/stable/influxdb/templates/deployment.yaml @@ -1,10 +1,10 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "influxdb.fullname" . }} + name: "{{ template "influxdb.fullname" . }}" labels: - app: {{ template "influxdb.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "influxdb.fullname" . }}" + chart: "{{ template "influxdb.chart" . }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: diff --git a/stable/influxdb/templates/ingress.yaml b/stable/influxdb/templates/ingress.yaml index 089c65c13e..4cf5e6f525 100644 --- a/stable/influxdb/templates/ingress.yaml +++ b/stable/influxdb/templates/ingress.yaml @@ -2,10 +2,10 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: {{ template "influxdb.fullname" . }} + name: "{{ template "influxdb.fullname" . }}" labels: - app: {{ template "influxdb.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "influxdb.fullname" . }}" + chart: "{{ template "influxdb.chart" . }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" annotations: diff --git a/stable/influxdb/templates/init-config.yaml b/stable/influxdb/templates/init-config.yaml index 8f611fb11d..1184b5ea48 100644 --- a/stable/influxdb/templates/init-config.yaml +++ b/stable/influxdb/templates/init-config.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "influxdb.fullname" . }}-init + name: "{{ template "influxdb.fullname" . }}-init" labels: - app: {{ template "influxdb.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "influxdb.fullname" . }}" + chart: "{{ template "influxdb.chart" . }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" data: diff --git a/stable/influxdb/templates/post-install-set-auth.yaml b/stable/influxdb/templates/post-install-set-auth.yaml index 582b44ff0d..f0e0288d22 100644 --- a/stable/influxdb/templates/post-install-set-auth.yaml +++ b/stable/influxdb/templates/post-install-set-auth.yaml @@ -3,8 +3,8 @@ apiVersion: batch/v1 kind: Job metadata: labels: - app: {{ template "influxdb.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "influxdb.fullname" . }}" + chart: "{{ template "influxdb.chart" . }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" name: {{ template "influxdb.fullname" . }}-set-auth diff --git a/stable/influxdb/templates/pvc.yaml b/stable/influxdb/templates/pvc.yaml index 94a8d7a281..36b10702eb 100644 --- a/stable/influxdb/templates/pvc.yaml +++ b/stable/influxdb/templates/pvc.yaml @@ -5,7 +5,7 @@ metadata: name: "{{- if not (empty .Values.persistence.name) }}{{ .Values.persistence.name }}{{- else }}{{ template "influxdb.fullname" . }}{{- end }}" labels: app: "{{- if not (empty .Values.persistence.name) }}{{ .Values.persistence.name }}{{- else }}{{ template "influxdb.fullname" . }}{{- end }}" - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + chart: "{{ template "influxdb.chart" . }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: diff --git a/stable/influxdb/templates/secret.yaml b/stable/influxdb/templates/secret.yaml index 703c7f0409..4ebfad206c 100644 --- a/stable/influxdb/templates/secret.yaml +++ b/stable/influxdb/templates/secret.yaml @@ -3,8 +3,8 @@ apiVersion: v1 kind: Secret metadata: labels: - app: {{ template "influxdb.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "influxdb.fullname" . }}" + chart: "{{ template "influxdb.chart" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" name: {{ template "influxdb.fullname" . }}-auth diff --git a/stable/influxdb/templates/service.yaml b/stable/influxdb/templates/service.yaml index b6dfb66161..ac9bed618b 100644 --- a/stable/influxdb/templates/service.yaml +++ b/stable/influxdb/templates/service.yaml @@ -5,10 +5,10 @@ metadata: annotations: {{ toYaml .Values.service.annotations | indent 4 }} {{- end }} - name: {{ template "influxdb.fullname" . }} + name: "{{ template "influxdb.fullname" . }}" labels: - app: {{ template "influxdb.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "influxdb.fullname" . }}" + chart: "{{ template "influxdb.chart" . }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: