[AAF] Uses new tpls for repos / images

[oom.git] / kubernetes / aaf / components / aaf-sshsm / components / aaf-sshsm-distcenter / templates / job.yaml

diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/job.yaml
similarity index 91%
rename from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml
rename to kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/job.yaml
index c40c6b0..f74b5c8 100644 (file)
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/job.yaml
@@ -14,8 +14,6 @@
 # limitations under the License.
 */}}
 
-{{- if .Values.global.distcenter.enabled -}}
-
 apiVersion: batch/v1
 kind: Job
 metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
@@ -27,7 +25,7 @@ spec:
       restartPolicy: Never
       initContainers:
 {{- if .Values.global.tpm.enabled }}
-      - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+      - image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
         command:
@@ -49,7 +47,7 @@ spec:
             cpu: 3m
             memory: 20Mi
 {{ else }}
-      - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-gen-passphrase
         command: ["sh", "-c", "/usr/bin/openssl rand -base64 12 >/distcenter/data/passphrase"]
@@ -74,7 +72,7 @@ spec:
             memory: 20Mi
 {{- end }}
       containers:
-      - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         name: {{ include "common.name" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command: ["/entrypoint.sh"]
@@ -101,5 +99,3 @@ spec:
           claimName: {{ include "common.release" . }}-aaf-sshsm
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
-
-{{- end -}}