Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump annotation #188

Merged
merged 2 commits into from
Oct 12, 2022
+20 −6
Merged

Bump annotation #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a932b6c
chore: timeout
thegentlemanphysicist Oct 12, 2022
4d53c92
chore: timeout
thegentlemanphysicist Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helm/keycloak/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions helm/keycloak/templates/route.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 10 additions & 5 deletions helm/keycloak/values-3d5c3f-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -15,13 +17,16 @@ postgres:
usernameKey: app-db-username
passwordKey: app-db-password

annotations:
timeout: 60s

tls:
enabled: true

resources:
limits:
cpu: 2
memory: 2Gi
memory: 4Gi
requests:
cpu: 1250m
memory: 2Gi
cpu: 250m
memory: 4Gi
3 changes: 3 additions & 0 deletions helm/keycloak/values-6d70e7-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ postgres:
usernameKey: username
passwordKey: password

annotations:
timeout: 60s

persistentLog:
storageClassSize: 15Gi

Expand Down
3 changes: 3 additions & 0 deletions helm/keycloak/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down