diff options
author | Borislav Glozman <Borislav.Glozman@amdocs.com> | 2020-02-02 13:29:30 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-02-02 13:29:30 +0000 |
commit | 284aa85f5b5b3ad1b13f07d6fee3ed163a22eb13 (patch) | |
tree | b3aff333a7f203d9dd3ed5baf6a5a3ce08bff188 /kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml | |
parent | 239bb3e18494584587ee1a6eb482f022b9e32d44 (diff) | |
parent | 894aafb845ca5169fa47fcff9fe8fe29c9e4a208 (diff) |
Merge "[Modeling] Use common secret template for mariadb root password"
Diffstat (limited to 'kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml')
-rw-r--r-- | kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml index d8790e7d5b..a2e03b8bf6 100644 --- a/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml @@ -49,6 +49,11 @@ spec: name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} + command: + - bash + args: + - -c + - 'MYSQL_AUTH=root:${MYSQL_ROOT_PASSWORD} ./docker-entrypoint.sh' image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: @@ -68,14 +73,14 @@ spec: initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} env: - - name: MSB_ADDR - value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" - - name: MYSQL_ADDR - value: "{{ .Values.config.dbServiceName }}:{{ .Values.config.dbPort }}" - - name: MYSQL_AUTH - value: "{{ .Values.config.dbUser }}:{{ index .Values "mariadb-galera" "config" "mariadbRootPassword" }}" - - name: REDIS_ADDR - value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}" + - name: MSB_ADDR + value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}" + - name: MYSQL_ADDR + value: {{ (index .Values "mariadb-galera" "service" "name") }}:{{ (index .Values "mariadb-galera" "service" "internalPort") }} + - name: MYSQL_ROOT_PASSWORD + {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-root-pass" "key" "password") | indent 12}} + - name: REDIS_ADDR + value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}" volumeMounts: - name: {{ include "common.fullname" . }}-etsicatalog mountPath: /service/modeling/etsicatalog/static |