From 83f5ec2af4e601207695e0ff67d71cfde207af89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= <unguiculus@gmail.com>
Date: Sat, 7 Jul 2018 04:45:17 +0200
Subject: [PATCH] [stable/keycloak] Upgrade to 4.1.0.Final (#6498)

- Upgrade Keycloak to 4.1.0.Final
- Upgrade Postgres dependency to 0.15.0
- Fix default pod anti-affinity to not consider test pods
---
 stable/keycloak/Chart.yaml                   |  4 ++--
 stable/keycloak/README.md                    |  2 +-
 stable/keycloak/requirements.lock            |  6 +++---
 stable/keycloak/requirements.yaml            |  2 +-
 stable/keycloak/templates/test/test-pod.yaml |  1 +
 stable/keycloak/values.yaml                  | 12 +++++++++++-
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/stable/keycloak/Chart.yaml b/stable/keycloak/Chart.yaml
index 243933a9ff..a91d4d8f60 100644
--- a/stable/keycloak/Chart.yaml
+++ b/stable/keycloak/Chart.yaml
@@ -1,6 +1,6 @@
 name: keycloak
-version: 3.0.2
-appVersion: 4.0.0.Final
+version: 3.1.0
+appVersion: 4.1.0.Final
 description: Open Source Identity and Access Management For Modern Applications and Services
 keywords:
   - sso
diff --git a/stable/keycloak/README.md b/stable/keycloak/README.md
index 80d3b40b70..839e2585db 100644
--- a/stable/keycloak/README.md
+++ b/stable/keycloak/README.md
@@ -45,7 +45,7 @@ Parameter | Description | Default
 `init.image.pullPolicy` | Init image pull policy | `IfNotPresent`
 `keycloak.replicas` | The number of Keycloak replicas | `1`
 `keycloak.image.repository` | The Keycloak image repository | `jboss/keycloak`
-`keycloak.image.tag` | The Keycloak image tag | `4.0.0.Final`
+`keycloak.image.tag` | The Keycloak image tag | `4.1.0.Final`
 `keycloak.image.pullPolicy` | The Keycloak image pull policy | `IfNotPresent`
 `keycloak.image.pullSecrets` | Image pull secrets | `[]`
 `keycloak.username` | Username for the initial Keycloak admin user | `keycloak`
diff --git a/stable/keycloak/requirements.lock b/stable/keycloak/requirements.lock
index fbcfd73062..2d6fdf83ee 100644
--- a/stable/keycloak/requirements.lock
+++ b/stable/keycloak/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: postgresql
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 0.12.0
-digest: sha256:65c01bdcc4661db1599d2e54feb0c7084434c5ce8a46db842c16b58e41a452cc
-generated: 2018-05-14T09:04:06.443862206+02:00
+  version: 0.15.0
+digest: sha256:428d8302be9a566a3e77538af30c56b63e0bfc97dd01dd434f303f4434cb8100
+generated: 2018-07-06T08:41:15.715456938+02:00
diff --git a/stable/keycloak/requirements.yaml b/stable/keycloak/requirements.yaml
index 6aee43a499..f6909fe6ce 100644
--- a/stable/keycloak/requirements.yaml
+++ b/stable/keycloak/requirements.yaml
@@ -1,5 +1,5 @@
 dependencies:
   - name: postgresql
-    version: 0.12.0
+    version: 0.15.0
     repository: https://kubernetes-charts.storage.googleapis.com/
     condition: keycloak.persistence.deployPostgres
diff --git a/stable/keycloak/templates/test/test-pod.yaml b/stable/keycloak/templates/test/test-pod.yaml
index 6d9cd45ca3..c114c8d99b 100644
--- a/stable/keycloak/templates/test/test-pod.yaml
+++ b/stable/keycloak/templates/test/test-pod.yaml
@@ -7,6 +7,7 @@ metadata:
     chart: {{ template "keycloak.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+    role: test
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/stable/keycloak/values.yaml b/stable/keycloak/values.yaml
index 629a3e15f7..9d689cea98 100644
--- a/stable/keycloak/values.yaml
+++ b/stable/keycloak/values.yaml
@@ -9,7 +9,7 @@ keycloak:
 
   image:
     repository: jboss/keycloak
-    tag: 4.0.0.Final
+    tag: 4.1.0.Final
     pullPolicy: IfNotPresent
 
     ## Optionally specify an array of imagePullSecrets.
@@ -59,6 +59,11 @@ keycloak:
             matchLabels:
               app:  {{ template "keycloak.name" . }}
               release: "{{ .Release.Name }}"
+            matchExpressions:
+              - key: role
+                operator: NotIn
+                values:
+                  - test
           topologyKey: kubernetes.io/hostname
       preferredDuringSchedulingIgnoredDuringExecution:
         - weight: 100
@@ -67,6 +72,11 @@ keycloak:
               matchLabels:
                 app:  {{ template "keycloak.name" . }}
                 release: "{{ .Release.Name }}"
+              matchExpressions:
+                - key: role
+                  operator: NotIn
+                  values:
+                    - test
             topologyKey: failure-domain.beta.kubernetes.io/zone
 
   nodeSelector: {}