From f79c819387b93af7b32a09b60652195f850d0574 Mon Sep 17 00:00:00 2001
From: ewolinetz <ewolinet@redhat.com>
Date: Wed, 14 Dec 2016 16:34:55 -0600
Subject: Updating to use deployer pod to generate JKS chain instead

---
 roles/openshift_logging/templates/jks_pod.j2 | 28 ++++++++++++++++++++++++++++
 roles/openshift_logging/templates/job.j2     | 26 --------------------------
 2 files changed, 28 insertions(+), 26 deletions(-)
 create mode 100644 roles/openshift_logging/templates/jks_pod.j2
 delete mode 100644 roles/openshift_logging/templates/job.j2

(limited to 'roles/openshift_logging/templates')

diff --git a/roles/openshift_logging/templates/jks_pod.j2 b/roles/openshift_logging/templates/jks_pod.j2
new file mode 100644
index 000000000..8b1c74211
--- /dev/null
+++ b/roles/openshift_logging/templates/jks_pod.j2
@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    logging-infra: support
+  generateName: jks-cert-gen-
+spec:
+  containers:
+  - name: jks-cert-gen
+    image: {{openshift_logging_image_prefix}}logging-deployer:{{openshift_logging_image_version}}
+    imagePullPolicy: Always
+    command: ["sh",  "{{generated_certs_dir}}/generate-jks.sh"]
+    securityContext:
+      privileged: true
+    volumeMounts:
+    - mountPath: {{generated_certs_dir}}
+      name: certmount
+    env:
+    - name: PROJECT
+      value: {{openshift_logging_namespace}}
+    - name: CERT_DIR
+      value: {{generated_certs_dir}}
+  restartPolicy: Never
+  serviceAccount: jks-generator
+  volumes:
+  - hostPath:
+      path: "{{generated_certs_dir}}"
+    name: certmount
diff --git a/roles/openshift_logging/templates/job.j2 b/roles/openshift_logging/templates/job.j2
deleted file mode 100644
index d7794a407..000000000
--- a/roles/openshift_logging/templates/job.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    logging-infra: support
-  generateName: jks-cert-gen-
-spec:
-  containers:
-  - name: jks-cert-gen
-    image: {{openshift_logging_image_prefix}}logging-deployer:{{openshift_logging_image_version}}
-    imagePullPolicy: Always
-    command: ["sh",  "generate-jks.sh"]
-    securityContext:
-      privileged: true
-    volumeMounts:
-    - mountPath: /opt/deploy
-      name: certmount
-    env:
-    - name: PROJECT
-      value: {{openshift_logging_namespace}}
-  restartPolicy: Never
-  serviceAccount: aggregated-logging-fluentd
-  volumes:
-  - hostPath:
-      path: "{{generated_certs_dir}}"
-    name: certmount
-- 
cgit v1.2.1