Commit 5e33647f authored by Pantelis Malekas's avatar Pantelis Malekas
Browse files

Merge branch 'new-keycloak' into 'develop' 

feat: New keycloak chart

See merge request !43
parents 89dc1834 ba386981

charts/hypo/Chart.yaml

+5 −4
Changes for charts/hypo/Chart.yaml: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ dependencies: 
  version: 0.60.0

  repository: https://open-telemetry.github.io/opentelemetry-helm-charts

  condition: otel-collector.enabled

- name: keycloak

  version: ~17.3.1

  repository: oci://registry-1.docker.io/bitnamicharts

  condition: keycloak.setup

- name: kong

  version: ~2.31.0

  repository: https://charts.konghq.com
@@ -85,3 +81,8 @@ dependencies: 
  version: 4.12.2

  repository: https://kubernetes.github.io/ingress-nginx

  condition: ingress-nginx.setup

- name: keycloakx

  alias: keycloak

  version: ~7.4.0

  repository: https://codecentric.github.io/helm-charts

  condition: keycloak.setup

charts/hypo/charts/keycloak-17.3.6.tgz

deleted100644 → 0
−107 KiB

File deleted.

View file

charts/hypo/charts/keycloakx-7.4.0.tgz

0 → 100644
+28.3 KiB

File added.

No diff preview for this file type.

View file

charts/hypo/templates/config/keycloak-cm.yaml

+12 −12
Changes for charts/hypo/templates/config/keycloak-cm.yaml: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -1020,9 +1020,9 @@ data: 
          "name": "grafana",

          "description": "",

          {{ if eq .Values.installation "dev" }} 

          "rootUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}",

          "adminUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}",

          "baseUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}",

          "rootUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}",

          "adminUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}",

          "baseUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}",

          {{ else }} 

          "rootUrl": "{{ .Values.keycloak.domain }}",

          "adminUrl": "{{ .Values.keycloak.domain }}",
@@ -1035,12 +1035,12 @@ data: 
          "secret": "{{ $kubePrometheusStack.grafana.oauth.clientSecret }}",

          {{ if eq .Values.installation "dev" }} 

          "redirectUris": [

            "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}/login/generic_oauth",

            "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}/grafana/*"

            "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}/login/generic_oauth",

            "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}/grafana/*"

          ],

          "webOrigins": [

            "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}",

            "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}"

            "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}",

            "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}"

          ],

          {{ else }} 

          "redirectUris": [
@@ -1297,8 +1297,8 @@ data: 
          "clientId": "vault",

          "name": "vault",

          "description": "",

          "rootUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}/ui/vault/auth/oidc/oidc/callback",

          "adminUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}/ui/vault/auth/oidc/oidc/callback",

          "rootUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}/ui/vault/auth/oidc/oidc/callback",

          "adminUrl": "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}/ui/vault/auth/oidc/oidc/callback",

          "baseUrl": "",

          "surrogateAuthRequired": false,

          "enabled": true,
@@ -1306,11 +1306,11 @@ data: 
          "clientAuthenticatorType": "client-secret",

          "secret": "{{ .Values.keycloak.clients.vault.secret }}",

          "redirectUris": [

            "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}/oidc/oidc/callback",

            "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}/ui/vault/auth/oidc/oidc/callback"

            "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}/oidc/oidc/callback",

            "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}/ui/vault/auth/oidc/oidc/callback"

          ],

          "webOrigins": [

            "http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}"

            "http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}"

          ],

          "notBefore": 0,

          "bearerOnly": false,

charts/hypo/templates/config/keycloak-secret.yaml

+3 −1
Changes for charts/hypo/templates/config/keycloak-secret.yaml: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,9 +5,11 @@ kind: Secret 
metadata:

  name: keycloak-db

stringData:

  admin_user: {{ .Values.keycloak.auth.adminUser | quote }}

  admin_password: {{ .Values.keycloak.auth.adminPassword | quote }}

  pg_host: {{ include "hypo.postgresql.url" . }}

  pg_port: {{ include "hypo.postgresql.port" . | quote }}

  pg_user: {{ $postgresqlDb.auth.username }}

  pg_database: KEYCLOAK

  pg_password: {{ $postgresqlDb.auth.password }}

  password: {{ $postgresqlDb.auth.password }}

{{- end -}}