From a932b6c30255749bf3d5ebcd55f266f2ad3ba80f Mon Sep 17 00:00:00 2001
From: Jonathan Sharman <jon.w.sharman@gmail.com>
Date: Wed, 12 Oct 2022 13:04:35 -0700
Subject: [PATCH 1/2] chore: timeout

---
 helm/keycloak/README.md               | 2 +-
 helm/keycloak/templates/route.yaml    | 3 +++
 helm/keycloak/values-3d5c3f-prod.yaml | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/helm/keycloak/README.md b/helm/keycloak/README.md
index 77216a2c..65489baa 100644
--- a/helm/keycloak/README.md
+++ b/helm/keycloak/README.md
@@ -66,7 +66,7 @@ The following table lists the configurable parameters of the Keycloak chart and
 | `nodeSelector`                       | node labels for pod assignment                 | `{}`                                                                                       |
 | `tolerations`                        | toleration settings                            | `[]`                                                                                       |
 | `affinity`                           | affinity settings                              | `{}`                                                                                       |
-
+| `annotations.timeout`                | route timeout                                  | null                                                                                       |
 ### Notes
 
 - The helm chart installs two `Secret` k8s objects:
diff --git a/helm/keycloak/templates/route.yaml b/helm/keycloak/templates/route.yaml
index b1da5072..98d8a688 100644
--- a/helm/keycloak/templates/route.yaml
+++ b/helm/keycloak/templates/route.yaml
@@ -6,6 +6,9 @@ metadata:
   annotations:
     haproxy.router.openshift.io/balance: roundrobin
     haproxy.router.openshift.io/disable_cookies: 'true'
+    {{ if .Values.annotations.timeout }}
+    haproxy.router.openshift.io/timeout: {{ .Values.annotations.timeout }}
+    {{ end }}
 spec:
   tls:
     insecureEdgeTerminationPolicy: Redirect
diff --git a/helm/keycloak/values-3d5c3f-prod.yaml b/helm/keycloak/values-3d5c3f-prod.yaml
index 6b632abc..b3727526 100644
--- a/helm/keycloak/values-3d5c3f-prod.yaml
+++ b/helm/keycloak/values-3d5c3f-prod.yaml
@@ -15,6 +15,9 @@ postgres:
     usernameKey: app-db-username
     passwordKey: app-db-password
 
+annotations:
+  timeout: 60s
+
 tls:
   enabled: true
 

From 4d53c92f4cc59c61e1d6ae0dede5b678c80f30f2 Mon Sep 17 00:00:00 2001
From: Jonathan Sharman <jon.w.sharman@gmail.com>
Date: Wed, 12 Oct 2022 13:59:00 -0700
Subject: [PATCH 2/2] chore: timeout

---
 helm/keycloak/values-3d5c3f-prod.yaml | 12 +++++++-----
 helm/keycloak/values-6d70e7-prod.yaml |  3 +++
 helm/keycloak/values.yaml             |  3 +++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/helm/keycloak/values-3d5c3f-prod.yaml b/helm/keycloak/values-3d5c3f-prod.yaml
index b3727526..54e83f89 100644
--- a/helm/keycloak/values-3d5c3f-prod.yaml
+++ b/helm/keycloak/values-3d5c3f-prod.yaml
@@ -1,7 +1,9 @@
-replicaCount: 1
+replicaCount: 7
+
+project: sso-keycloak
 
 image:
-  tag: 7.4-37-rc.2
+  tag: 7.4-37-rc.3
 
 service:
   type: ClusterIP
@@ -24,7 +26,7 @@ tls:
 resources:
   limits:
     cpu: 2
-    memory: 2Gi
+    memory: 4Gi
   requests:
-    cpu: 1250m
-    memory: 2Gi
+    cpu: 250m
+    memory: 4Gi
diff --git a/helm/keycloak/values-6d70e7-prod.yaml b/helm/keycloak/values-6d70e7-prod.yaml
index fd920a22..638ee488 100644
--- a/helm/keycloak/values-6d70e7-prod.yaml
+++ b/helm/keycloak/values-6d70e7-prod.yaml
@@ -17,6 +17,9 @@ postgres:
     usernameKey: username
     passwordKey: password
 
+annotations:
+  timeout: 60s
+
 persistentLog:
   storageClassSize: 15Gi
 
diff --git a/helm/keycloak/values.yaml b/helm/keycloak/values.yaml
index eb3e3bf7..c00810c1 100644
--- a/helm/keycloak/values.yaml
+++ b/helm/keycloak/values.yaml
@@ -38,6 +38,9 @@ postgres:
     min: 5
     max: 20
 
+annotations:
+  timeout: null
+
 # see https://github.com/keycloak/keycloak-containers/blob/master/server/README.md#start-a-keycloak-instance-with-custom-command-line-options
 additionalServerOptions: "-Dkeycloak.profile.feature.authorization=enabled -Djboss.persistent.log.dir=/var/log/eap"