Modify ca cert behaviour (#51)

stevehipwell · Jul 23, 2020 · 8c7edbd · 8c7edbd
1 parent 3affdbf
commit 8c7edbd
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/charts/confluence-server/Chart.yaml b/charts/confluence-server/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: confluence-server
-version: 2.4.1
+version: 2.4.2
 appVersion: 7.6.1
 description: Atlassian Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence - where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
 keywords:

diff --git a/charts/confluence-server/templates/deployment.yaml b/charts/confluence-server/templates/deployment.yaml
@@ -34,17 +34,17 @@ spec:
         - name: ca-certs
           image: adoptopenjdk:11-jdk-hotspot
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- with .Values.env }}
+          env:
+            {{- . | toYaml | trim | nindent 12 }}
+          {{- end }}
           command: ["sh"]
           args: ["-c", "cp -f \"${JAVA_HOME}/lib/security/cacerts\" /var/atlassian/application-data/confluence/cacerts; for f in /var/atlassian/application-data/confluence/secrets/cas/*; do keytool -importcert -file \"${f}\" -alias \"$(basename \"${f}\")\" -keystore /var/atlassian/application-data/confluence/cacerts -storepass changeit -trustcacerts -noprompt; done;"]
           volumeMounts:
             - mountPath: /var/atlassian/application-data/confluence
               name: {{ include "confluence-server.pvcname" . }}
             - mountPath: /var/atlassian/application-data/confluence/secrets/cas
               name: confluence-cas
-          {{- with .Values.env }}
-          env:
-            {{- . | toYaml | trim | nindent 12 }}
-          {{- end }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}

diff --git a/charts/jira-software/Chart.yaml b/charts/jira-software/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: jira-software
-version: 2.4.0
+version: 2.4.1
 appVersion: 8.11.0
 description: Atlassian Jira Software is built for every member of your software team to plan, track, and release great software.
 keywords:

diff --git a/charts/jira-software/templates/deployment.yaml b/charts/jira-software/templates/deployment.yaml
@@ -28,19 +28,19 @@ spec:
       {{- if .Values.caCerts }}
       initContainers:
         - name: ca-certs
-          image: adoptopenjdk/openjdk8:alpine
+          image: adoptopenjdk:11-jdk-hotspot
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- with .Values.env }}
+          env:
+            {{- . | toYaml | trim | nindent 12 }}
+          {{- end }}
           command: ["sh"]
           args: ["-c", "cp -f \"${JAVA_HOME}/jre/lib/security/cacerts\" /var/atlassian/application-data/jira/cacerts; for f in /var/atlassian/application-data/jira/secrets/cas/*; do keytool -importcert -file \"${f}\" -alias \"$(basename \"${f}\")\" -keystore /var/atlassian/application-data/jira/cacerts -storepass changeit -trustcacerts -noprompt; done;"]
           volumeMounts:
             - mountPath: /var/atlassian/application-data/jira
               name: {{ include "jira-software.pvcname" . }}
             - mountPath: /var/atlassian/application-data/jira/secrets/cas
               name: jira-cas
-          {{- with .Values.env }}
-          env:
-            {{- . | toYaml | trim | nindent 12 }}
-          {{- end }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}

diff --git a/charts/nexus3/Chart.yaml b/charts/nexus3/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nexus3
-version: 2.5.3
+version: 2.5.4
 appVersion: 3.25.0
 description: Sonatype Nexus OSS is an open source repository manager
 keywords:

diff --git a/charts/nexus3/templates/deployment.yaml b/charts/nexus3/templates/deployment.yaml
@@ -31,30 +31,30 @@ spec:
         - name: volume-mount
           image: busybox
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- with .Values.env }}
+          env:
+            {{- . | toYaml | trim | nindent 12 }}
+          {{- end }}
           command: ["sh"]
           args: ["-c", "mkdir -p /nexus-data/etc; chown -R 200:200 /nexus-data;"]
           volumeMounts:
             - mountPath: /nexus-data
               name: {{ include "nexus3.pvcname" . }}
+        {{- if .Values.caCerts }}
+        - name: ca-certs
+          image: adoptopenjdk:8-jdk-hotspot
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- with .Values.env }}
           env:
             {{- . | toYaml | trim | nindent 12 }}
           {{- end }}
-        {{- if .Values.caCerts }}
-        - name: ca-certs
-          image: adoptopenjdk/openjdk8:alpine
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["sh"]
           args: ["-c", "mkdir -p /nexus-data/keystores; cp -f \"${JAVA_HOME}/jre/lib/security/cacerts\" /nexus-data/keystores/cacerts; for f in /nexus-data/secrets/cas/*; do keytool -importcert -file \"${f}\" -alias \"$(basename \"${f}\")\" -keystore /nexus-data/keystores/cacerts -storepass changeit -trustcacerts -noprompt; done;"]
           volumeMounts:
             - mountPath: /nexus-data
               name: {{ include "nexus3.pvcname" . }}
             - mountPath: /nexus-data/secrets/cas
               name: nexus3-cas
-          {{- with .Values.env }}
-          env:
-            {{- . | toYaml | trim | nindent 12 }}
-          {{- end }}
         {{- end }}
       containers:
         - name: {{ .Chart.Name }}