From e4fa91b5fc6f3cf77a0a7faf2abe5b472386c369 Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Fri, 1 Sep 2017 19:37:24 +0000 Subject: fixing failed SDC FE and BE startup - a new sdcfe/be image was failing because of a file conflict with the keystore file that was mounted into the pods. fix was to remove mount and let chef do its thing inside the pods Issue-ID: OOM-259 Change-Id: Ib7937da71adf0a20c90d6efca71ccfb7c550f42d Signed-off-by: Mandeep Khinda --- .../config/docker/init/src/config/sdc/jetty/keystore | Bin 1416 -> 0 bytes kubernetes/sdc/templates/sdc-be.yaml | 5 ----- kubernetes/sdc/templates/sdc-fe.yaml | 5 ----- 3 files changed, 10 deletions(-) delete mode 100755 kubernetes/config/docker/init/src/config/sdc/jetty/keystore diff --git a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore deleted file mode 100755 index 08f6cda8a7..0000000000 Binary files a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore and /dev/null differ diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml index 38a239e714..d853f18f91 100644 --- a/kubernetes/sdc/templates/sdc-be.yaml +++ b/kubernetes/sdc/templates/sdc-be.yaml @@ -79,8 +79,6 @@ spec: name: sdc-sdc-es-es - mountPath: /root/chef-solo/environments/ name: sdc-environments - - mountPath: /var/lib/jetty/etc/keystore - name: sdc-jetty-keystore - mountPath: /etc/localtime name: sdc-localtime - mountPath: /var/lib/jetty/logs @@ -100,9 +98,6 @@ spec: - name: sdc-environments hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments - - name: sdc-jetty-keystore - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore - name: sdc-localtime hostPath: path: /etc/localtime diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml index 53759dc685..915d18b786 100644 --- a/kubernetes/sdc/templates/sdc-fe.yaml +++ b/kubernetes/sdc/templates/sdc-fe.yaml @@ -63,8 +63,6 @@ spec: name: sdc-sdc-es-es - mountPath: /root/chef-solo/environments/ name: sdc-environments - - mountPath: /var/lib/jetty/etc/keystore - name: sdc-jetty-keystore - mountPath: /etc/localtime name: sdc-localtime - mountPath: /var/lib/jetty/logs @@ -86,9 +84,6 @@ spec: - name: sdc-environments hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments - - name: sdc-jetty-keystore - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore - name: sdc-localtime hostPath: path: /etc/localtime -- cgit 1.2.3-korg