diff options
Diffstat (limited to 'kubernetes/so/charts/so-monitoring/templates')
3 files changed, 12 insertions, 12 deletions
diff --git a/kubernetes/so/charts/so-monitoring/templates/configmap.yaml b/kubernetes/so/charts/so-monitoring/templates/configmap.yaml index 489d5f48fc..a6d8b469f8 100644 --- a/kubernetes/so/charts/so-monitoring/templates/configmap.yaml +++ b/kubernetes/so/charts/so-monitoring/templates/configmap.yaml @@ -27,7 +27,7 @@ metadata: labels: app: {{ include "common.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} + release: {{ include "common.release" . }} heritage: {{ .Release.Service }} --- apiVersion: v1 @@ -38,7 +38,7 @@ metadata: labels: app: {{ include "common.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} + release: {{ include "common.release" . }} heritage: {{ .Release.Service }} data: {{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }} diff --git a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml index bfedc05a19..9afcddde36 100644 --- a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml +++ b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml @@ -24,7 +24,7 @@ metadata: labels: app: {{ include "common.fullname" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} + release: {{ include "common.release" . }} spec: replicas: {{ index .Values.replicaCount }} minReadySeconds: {{ index .Values.minReadySeconds }} @@ -37,7 +37,7 @@ spec: metadata: labels: app: {{ include "common.name" . }} - release: {{ .Release.Name }} + release: {{ include "common.release" . }} spec: initContainers: - name: so-chown @@ -57,32 +57,32 @@ spec: - name: DB_HOST valueFrom: secretKeyRef: - name: {{ .Release.Name}}-so-db-secrets + name: {{ include "common.release" . }}-so-db-secrets key: mariadb.readwrite.host - name: DB_PORT valueFrom: secretKeyRef: - name: {{ .Release.Name}}-so-db-secrets + name: {{ include "common.release" . }}-so-db-secrets key: mariadb.readwrite.port - name: DB_USERNAME valueFrom: secretKeyRef: - name: {{ .Release.Name}}-so-db-secrets + name: {{ include "common.release" . }}-so-db-secrets key: mariadb.readwrite.rolename - name: DB_PASSWORD valueFrom: secretKeyRef: - name: {{ .Release.Name}}-so-db-secrets + name: {{ include "common.release" . }}-so-db-secrets key: mariadb.readwrite.password - name: DB_ADMIN_USERNAME valueFrom: secretKeyRef: - name: {{ .Release.Name}}-so-db-secrets + name: {{ include "common.release" . }}-so-db-secrets key: mariadb.admin.rolename - name: DB_ADMIN_PASSWORD valueFrom: secretKeyRef: - name: {{ .Release.Name}}-so-db-secrets + name: {{ include "common.release" . }}-so-db-secrets key: mariadb.admin.password envFrom: - configMapRef: diff --git a/kubernetes/so/charts/so-monitoring/templates/service.yaml b/kubernetes/so/charts/so-monitoring/templates/service.yaml index 053af9b5c2..c4c2ae9d13 100644 --- a/kubernetes/so/charts/so-monitoring/templates/service.yaml +++ b/kubernetes/so/charts/so-monitoring/templates/service.yaml @@ -24,7 +24,7 @@ metadata: labels: app: {{ include "common.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} + release: {{ include "common.release" . }} heritage: {{ .Release.Service }} spec: type: {{ .Values.service.type }} @@ -40,6 +40,6 @@ spec: {{- end}} selector: app: {{ include "common.name" . }} - release: {{ .Release.Name }} + release: {{ include "common.release" . }} |