diff options
Diffstat (limited to 'kubernetes/common')
| -rwxr-xr-x | kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/common/network-name-gen/templates/secrets.yaml | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml index 1fec55caca..2e04b15561 100755 --- a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml +++ b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml @@ -63,7 +63,7 @@ spec: fieldPath: metadata.namespace # War Container - name: "{{ .Chart.Name }}-war" - image: "{{ .Values.repository }}/{{ .Values.warImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.warImage }}" command: ["cp","/app/MUSIC.war","/webapps"] imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: @@ -73,7 +73,7 @@ spec: containers: # Tomcat Container - name: "{{ include "common.name" . }}" - image: "{{ .Values.repository }}/{{ .Values.image }}" + image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} diff --git a/kubernetes/common/network-name-gen/templates/secrets.yaml b/kubernetes/common/network-name-gen/templates/secrets.yaml index 4b6d97acad..c8630a2535 100644 --- a/kubernetes/common/network-name-gen/templates/secrets.yaml +++ b/kubernetes/common/network-name-gen/templates/secrets.yaml @@ -28,8 +28,14 @@ data: --- apiVersion: v1 data: -{{ tpl (.Files.Glob "resources/config/aai_keystore").AsConfig . | indent 2 }} +{{ tpl (.Files.Glob "resources/config/aai_keystore").AsSecrets . | indent 2 }} metadata: name: {{ .Release.Name}}-aai-keystore namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.fullname" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} kind: Secret +type: Opaque
\ No newline at end of file |