From 8bceed58951e4a7eeeabe002e3ec8d12815f6585 Mon Sep 17 00:00:00 2001
From: Varditn <38429204+TAvardit@users.noreply.github.com>
Date: Wed, 12 Dec 2018 20:36:40 +0100
Subject: [PATCH] updating images' tags and support org verification toggle
 (#9945)

* updating images' tags and support org verification toggle

Signed-off-by: Vardit Natanson <v.natanson@travelaudience.com>

* fixing trailing space

Signed-off-by: Vardit Natanson <v.natanson@travelaudience.com>
---
 stable/sonatype-nexus/Chart.yaml                           | 4 ++--
 stable/sonatype-nexus/README.md                            | 1 +
 .../sonatype-nexus/templates/deployment-statefulset.yaml   | 6 ++++--
 stable/sonatype-nexus/values.yaml                          | 7 ++++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/stable/sonatype-nexus/Chart.yaml b/stable/sonatype-nexus/Chart.yaml
index 919e47a85b..d89f45656e 100644
--- a/stable/sonatype-nexus/Chart.yaml
+++ b/stable/sonatype-nexus/Chart.yaml
@@ -1,6 +1,6 @@
 name: sonatype-nexus
-version: 1.14.1
-appVersion: 3.13.0-01
+version: 1.15.0
+appVersion: 3.14.0-04
 description: Sonatype Nexus is an open source repository manager
 keywords:
   - artifacts
diff --git a/stable/sonatype-nexus/README.md b/stable/sonatype-nexus/README.md
index ac102be86e..efe4772202 100644
--- a/stable/sonatype-nexus/README.md
+++ b/stable/sonatype-nexus/README.md
@@ -152,6 +152,7 @@ If `nexusProxy.env.cloudIamAuthEnabled` is set to `true` the following variables
 | `nexusProxy.env.clientSecret`    | GCP OAuth client Secret            | `nil`                                                |
 | `nexusProxy.env.organizationId`  | GCP organization ID                | `nil`                                                |
 | `nexusProxy.env.redirectUrl`     | OAuth callback url. example `https://nexus.example.com/oauth/callback` | `nil`            |
+| `nexusProxy.env.requiredMembershipVerification` | Whether users presenting valid JWT tokens must still be verified for membership within the GCP organization. | `true`    |
 | `nexusProxy.secrets.keystore`    | base-64 encoded value of the keystore file needed for the proxy to sign user tokens. Example: cat keystore.jceks &#124; base64 | `nil`  |
 | `nexusProxy.secrets.password`    | Password to the Java Keystore file | `nil`                                                |
 
diff --git a/stable/sonatype-nexus/templates/deployment-statefulset.yaml b/stable/sonatype-nexus/templates/deployment-statefulset.yaml
index bc6e661f2e..fa32dc875f 100644
--- a/stable/sonatype-nexus/templates/deployment-statefulset.yaml
+++ b/stable/sonatype-nexus/templates/deployment-statefulset.yaml
@@ -1,8 +1,8 @@
 {{- if .Values.statefulset.enabled }}
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 {{- else }}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 {{- end }}
 metadata:
@@ -155,6 +155,8 @@ spec:
               value: "60000"
             - name: SESSION_TTL
               value: "86400000"
+            - name: JWT_REQUIRES_MEMBERSHIP_VERIFICATION
+              value: {{ .Values.nexusProxy.env.requiredMembershipVerification | quote }}
             {{- end }}
           ports:
             - containerPort: {{ .Values.nexusProxy.targetPort }}
diff --git a/stable/sonatype-nexus/values.yaml b/stable/sonatype-nexus/values.yaml
index d7310d56fe..c7d59e6462 100644
--- a/stable/sonatype-nexus/values.yaml
+++ b/stable/sonatype-nexus/values.yaml
@@ -10,7 +10,7 @@ deploymentStrategy: {}
 
 nexus:
   imageName: quay.io/travelaudience/docker-nexus
-  imageTag: 3.13.0_alpine_3.8.1
+  imageTag: 3.14.0
   imagePullPolicy: IfNotPresent
   env:
     - name: install4jAddVmParams
@@ -63,7 +63,7 @@ nexusProxy:
   enabled: true
   # svcName: proxy-svc
   imageName: quay.io/travelaudience/docker-nexus-proxy
-  imageTag: 2.3.0
+  imageTag: 2.4.0
   imagePullPolicy: IfNotPresent
   port: 8080
   targetPort: 8080
@@ -78,6 +78,7 @@ nexusProxy:
   #   clientSecret: ""
   #   organizationId: ""
   #   redirectUrl: ""
+  #   requiredMembershipVerification: "true"
   # secrets:
   #   keystore: ""
   #   password: ""
@@ -109,7 +110,7 @@ persistence:
 nexusBackup:
   enabled: false
   imageName: quay.io/travelaudience/docker-nexus-backup
-  imageTag: 1.3.0
+  imageTag: 1.4.0
   imagePullPolicy: IfNotPresent
   env:
     targetBucket: