From 0f944efc75b46a45bbcec456f7bf0c8f931bb464 Mon Sep 17 00:00:00 2001
From: Steve Hipwell <steve.hipwell@gmail.com>
Date: Thu, 20 Feb 2020 16:03:15 +0000
Subject: [PATCH] Upgrade nexus to v3.21 (#4)

* Upgrade nexus to v3.21
---
 charts/confluence-server/Chart.yaml                | 2 +-
 charts/confluence-server/templates/deployment.yaml | 1 -
 charts/nexus3/Chart.yaml                           | 4 ++--
 charts/nexus3/README.md                            | 2 +-
 charts/nexus3/values.yaml                          | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/charts/confluence-server/Chart.yaml b/charts/confluence-server/Chart.yaml
index 899e484d..f4d0c569 100644
--- a/charts/confluence-server/Chart.yaml
+++ b/charts/confluence-server/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: confluence-server
-version: 1.3.1
+version: 1.3.2
 appVersion: 7.3.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
index 0f9eea85..4dd1d6f1 100644
--- a/charts/confluence-server/templates/deployment.yaml
+++ b/charts/confluence-server/templates/deployment.yaml
@@ -32,7 +32,6 @@ spec:
           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;"]
-
           volumeMounts:
             - mountPath: /var/atlassian/application-data/confluence
               name: {{ include "confluence-server.pvcname" . }}
diff --git a/charts/nexus3/Chart.yaml b/charts/nexus3/Chart.yaml
index c0e73734..4f54f423 100644
--- a/charts/nexus3/Chart.yaml
+++ b/charts/nexus3/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: nexus3
-version: 1.2.4
-appVersion: 3.20.1
+version: 1.3.0
+appVersion: 3.21.1
 description: Sonatype Nexus OSS is an open source repository manager
 keywords:
 - artifacts
diff --git a/charts/nexus3/README.md b/charts/nexus3/README.md
index f0367752..33ba67b6 100644
--- a/charts/nexus3/README.md
+++ b/charts/nexus3/README.md
@@ -45,7 +45,7 @@ The following table lists the configurable parameters of the _Nexus3_ chart and
 | Parameter                        | Description                                                                             | Default           |
 | -------------------------------- | --------------------------------------------------------------------------------------- | ----------------- |
 | `image.repository`               | Docker repository to use                                                                | `sonatype/nexus3` |
-| `image.tag`                      | Docker tag to use                                                                       | `3.20.1`          |
+| `image.tag`                      | Docker tag to use                                                                       | `3.21.1`          |
 | `image.pullPolicy`               | Docker image pull policy                                                                | `IfNotPresent`    |
 | `nameOverride`                   | String to partially override `nexus3.fullname` template (will prepend the release name) | `nil`             |
 | `fullnameOverride`               | String to fully override `nexus3.fullname` template                                     | `nil`             |
diff --git a/charts/nexus3/values.yaml b/charts/nexus3/values.yaml
index 9c7d40c5..88da8678 100644
--- a/charts/nexus3/values.yaml
+++ b/charts/nexus3/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: sonatype/nexus3
-  tag: 3.20.1
+  tag: 3.21.1
   pullPolicy: IfNotPresent
 
 nameOverride: ""