Upgrade Confluence to v7.6.0 (#38)

stevehipwell · Jul 3, 2020 · 0a41d87 · 0a41d87
1 parent 8c332ed
commit 0a41d87
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/charts/confluence-server/Chart.yaml b/charts/confluence-server/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: confluence-server
-version: 2.2.5
-appVersion: 7.5.2
+version: 2.3.0
+appVersion: 7.6.0
 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:
 - confluence

diff --git a/charts/confluence-server/README.md b/charts/confluence-server/README.md
@@ -46,11 +46,11 @@ The following table lists the configurable parameters of the _Confluence Server_
 | Parameter                    | Description                                                                                        | Default                                                 |
 | ---------------------------- | -------------------------------------------------------------------------------------------------- | ------------------------------------------------------- |
 | `image.repository`           | Docker repository to use                                                                           | `atlassian/confluence-server`                           |
-| `image.tag`                  | Docker tag to use                                                                                  | `7.5.2`                                                 |
+| `image.tag`                  | Docker tag to use                                                                                  | `7.6.0`                                                 |
 | `image.pullPolicy`           | Docker image pull policy                                                                           | `IfNotPresent`                                          |
 | `nameOverride`               | String to partially override `confluence-server.fullname` template (will prepend the release name) | `nil`                                                   |
 | `fullnameOverride`           | String to fully override `confluence-server.fullname` template                                     | `nil`                                                   |
-| `securityContext`            | Security context for the _Confluence Server_ container                                             | `fsGroup: 2002`                                         |
+| `securityContext`            | The pod security context (all containers in the pod )                                              | `fsGroup: 2002`                                         |
 | `service.type`               | Type of service                                                                                    | `ClusterIP`                                             |
 | `service.port`               | Service port                                                                                       | `8080`                                                  |
 | `caCerts.secret`             | Name of the secret containing additional CA certificates                                           | `nil`                                                   |

diff --git a/charts/confluence-server/templates/deployment.yaml b/charts/confluence-server/templates/deployment.yaml
@@ -25,10 +25,14 @@ spec:
         {{- . | toYaml | trim | nindent 8 }}
       {{- end }}
     spec:
+      {{- with .Values.securityContext }}
+      securityContext:
+        {{- . | toYaml | trim | nindent 8 }}
+      {{- end }}
       {{- if .Values.caCerts }}
       initContainers:
         - name: ca-certs
-          image: adoptopenjdk/openjdk11:alpine
+          image: adoptopenjdk:11-jdk-hotspot
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           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;"]
@@ -127,10 +131,6 @@ spec:
             {{- end }}
           resources:
             {{- .Values.resources | toYaml | trim | nindent 12 }}
-      {{- with .Values.securityContext }}
-      securityContext:
-        {{- . | toYaml | trim | nindent 8 }}
-      {{- end }}
       volumes:
         - name: {{ include "confluence-server.pvcname" . }}
           {{- if .Values.persistence.enabled }}

diff --git a/charts/confluence-server/values.yaml b/charts/confluence-server/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: atlassian/confluence-server
-  tag: 7.5.2
+  tag: 7.6.0
   pullPolicy: IfNotPresent
 
 nameOverride: ""