diff options
Diffstat (limited to 'kubernetes/so/charts/so-openstack-adapter')
3 files changed, 13 insertions, 13 deletions
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml index b94f35f553..d873beb62c 100755 --- a/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml @@ -22,7 +22,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 @@ -33,7 +33,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-openstack-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml index 9211571c8a..931a89516b 100755 --- a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml @@ -19,7 +19,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 }} @@ -32,14 +32,14 @@ spec: metadata: labels: app: {{ include "common.name" . }} - release: {{ .Release.Name }} + release: {{ include "common.release" . }} spec: initContainers: - command: - /root/job_complete.py args: - --job-name - - {{ .Release.Name }}-so-mariadb-config-job + - {{ include "common.release" . }}-so-mariadb-config-job env: - name: NAMESPACE valueFrom: @@ -58,32 +58,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-openstack-adapter/templates/service.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml index 741614886c..6711c3b2e7 100755 --- a/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml @@ -19,7 +19,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 }} @@ -35,4 +35,4 @@ spec: {{- end}} selector: app: {{ include "common.name" . }} - release: {{ .Release.Name }} + release: {{ include "common.release" . }} |