From 468cfdf94a5ff18c83999c8b70009742b87d3a4f Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Tue, 13 Feb 2018 15:09:53 -0500
Subject: [PATCH] Ironic: Keystone Jobs: convert jobs to helm-toolkit macros

This PS converts the Keystone jobs in the ironic chart to macros

Change-Id: Iade84b9bb20dec909006c1082d82c757f06368b3
---
 ironic/templates/job-ks-endpoints.yaml | 57 +-------------------------
 ironic/templates/job-ks-service.yaml   | 51 +----------------------
 ironic/templates/job-ks-user.yaml      | 52 +----------------------
 3 files changed, 6 insertions(+), 154 deletions(-)

diff --git a/ironic/templates/job-ks-endpoints.yaml b/ironic/templates/job-ks-endpoints.yaml
index 135be427e0..0658aee9fc 100644
--- a/ironic/templates/job-ks-endpoints.yaml
+++ b/ironic/templates/job-ks-endpoints.yaml
@@ -15,59 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_ks_endpoints }}
-{{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.ks_endpoints }}
-
-{{- $serviceAccountName := "ironic-ks-endpoints" }}
-{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: ironic-ks-endpoints
-spec:
-  template:
-    metadata:
-      labels:
-{{ tuple $envAll "ironic" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
-    spec:
-      serviceAccountName: {{ $serviceAccountName }}
-      restartPolicy: OnFailure
-      nodeSelector:
-        {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
-      initContainers:
-{{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
-      containers:
-{{- range $key1, $osServiceType := tuple "baremetal" }}
-{{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
-        - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
-          image: {{ $envAll.Values.images.tags.ks_endpoints }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          command:
-            - /tmp/ks-endpoints.sh
-          volumeMounts:
-            - name: ks-endpoints-sh
-              mountPath: /tmp/ks-endpoints.sh
-              subPath: ks-endpoints.sh
-              readOnly: true
-          env:
-{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.admin }}
-{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
-{{- end }}
-            - name: OS_SVC_ENDPOINT
-              value: {{ $osServiceEndPoint }}
-            - name: OS_SERVICE_NAME
-              value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }}
-            - name: OS_SERVICE_TYPE
-              value: {{ $osServiceType }}
-            - name: OS_SERVICE_ENDPOINT
-              value: {{ tuple $osServiceType $osServiceEndPoint "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
-{{- end }}
-{{- end }}
-      volumes:
-        - name: ks-endpoints-sh
-          configMap:
-            name: ironic-bin
-            defaultMode: 0555
+{{- $ksServiceJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) -}}
+{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }}
 {{- end }}
diff --git a/ironic/templates/job-ks-service.yaml b/ironic/templates/job-ks-service.yaml
index 9592935ed1..f2a84be607 100644
--- a/ironic/templates/job-ks-service.yaml
+++ b/ironic/templates/job-ks-service.yaml
@@ -15,53 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_ks_service }}
-{{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.ks_service }}
-
-{{- $serviceAccountName := "ironic-ks-service" }}
-{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: ironic-ks-service
-spec:
-  template:
-    metadata:
-      labels:
-{{ tuple $envAll "ironic" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
-    spec:
-      serviceAccountName: {{ $serviceAccountName }}
-      restartPolicy: OnFailure
-      nodeSelector:
-        {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
-      initContainers:
-{{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
-      containers:
-{{- range $key1, $osServiceType := tuple "baremetal" }}
-        - name: {{ $osServiceType }}-ks-service-registration
-          image: {{ $envAll.Values.images.tags.ks_service }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          command:
-            - /tmp/ks-service.sh
-          volumeMounts:
-            - name: ks-service-sh
-              mountPath: /tmp/ks-service.sh
-              subPath: ks-service.sh
-              readOnly: true
-          env:
-{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.admin }}
-{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
-{{- end }}
-            - name: OS_SERVICE_NAME
-              value: {{ tuple $osServiceType $envAll | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" }}
-            - name: OS_SERVICE_TYPE
-              value: {{ $osServiceType }}
-{{- end }}
-      volumes:
-        - name: ks-service-sh
-          configMap:
-            name: ironic-bin
-            defaultMode: 0555
+{{- $ksServiceJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) -}}
+{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }}
 {{- end }}
diff --git a/ironic/templates/job-ks-user.yaml b/ironic/templates/job-ks-user.yaml
index ebc3825a3f..12e5f2dff1 100644
--- a/ironic/templates/job-ks-user.yaml
+++ b/ironic/templates/job-ks-user.yaml
@@ -15,54 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.job_ks_user }}
-{{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.ks_user }}
-
-{{- $serviceAccountName := "ironic-ks-user" }}
-{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: ironic-ks-user
-spec:
-  template:
-    metadata:
-      labels:
-{{ tuple $envAll "ironic" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
-    spec:
-      serviceAccountName: {{ $serviceAccountName }}
-      restartPolicy: OnFailure
-      nodeSelector:
-        {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
-      initContainers:
-{{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
-      containers:
-        - name: ironic-ks-user
-          image: {{ .Values.images.tags.ks_user }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          command:
-            - /tmp/ks-user.sh
-          volumeMounts:
-            - name: ks-user-sh
-              mountPath: /tmp/ks-user.sh
-              subPath: ks-user.sh
-              readOnly: true
-          env:
-{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.admin }}
-{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
-{{- end }}
-            - name: SERVICE_OS_SERVICE_NAME
-              value: "ironic"
-{{- with $env := dict "ksUserSecret" .Values.secrets.identity.ironic }}
-{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 12 }}
-{{- end }}
-            - name: SERVICE_OS_ROLE
-              value: {{ .Values.endpoints.identity.auth.ironic.role | quote }}
-      volumes:
-        - name: ks-user-sh
-          configMap:
-            name: ironic-bin
-            defaultMode: 0555
+{{- $ksUserJob := dict "envAll" . "serviceName" "ironic" -}}
+{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
 {{- end }}