Commit ee0337d2 authored by Pantelis Malekas's avatar Pantelis Malekas
Browse files

feat: continued operator setup, realm import remains

parent 0b47754a

charts/hypo/crds/keycloak-operator-crds.yaml

0 → 100644
+18744 −0

File added.

Preview size limit exceeded, changes collapsed.

charts/hypo/files/keycloak/realm.json

0 → 100644
+2901 −0

File added.

Preview size limit exceeded, changes collapsed.

charts/hypo/files/keycloak/realm.json.tpl

0 → 100644
+2907 −0

File added.

Preview size limit exceeded, changes collapsed.

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.instance.service.nodePort }}",

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

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

          {{ 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.instance.service.nodePort }}/login/generic_oauth",

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

          ],

          "webOrigins": [

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

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

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

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

          ],

          {{ 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.instance.service.nodePort }}/ui/vault/auth/oidc/oidc/callback",

          "adminUrl": "http://$(NODE_IP):{{ .Values.keycloak.instance.service.nodePort }}/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.instance.service.nodePort }}/oidc/oidc/callback",

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

          ],

          "webOrigins": [

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

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

          ],

          "notBefore": 0,

          "bearerOnly": false,

charts/hypo/templates/fabric-api/deployment.yaml

+2 −2
Changes for charts/hypo/templates/fabric-api/deployment.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ spec: 
              valueFrom:

                fieldRef:

                  fieldPath: status.hostIP

          args: [ 'sh', '-c', 'until nc -z -w 1 $NODE_IP {{ .Values.keycloak.service.nodePorts.http }}; do echo "Sleeping for Keycloak"; sleep 1; done; echo "ready!";' ]

          args: [ 'sh', '-c', 'until nc -z -w 1 $NODE_IP {{ .Values.keycloak.instance.service.nodePort }}; do echo "Sleeping for Keycloak"; sleep 1; done; echo "ready!";' ]

          {{- end }}

      {{- with $fabricApi.imagePullSecrets }}

      imagePullSecrets:
@@ -74,7 +74,7 @@ spec: 
                  fieldPath: status.hostIP

            - name: _PROD_QUARKUS_OIDC_AUTH_SERVER_URL

              {{- if and .Values.keycloak.setup (eq .Values.installation "dev") }}

              value: http://$(NODE_IP):{{ .Values.keycloak.service.nodePorts.http }}/realms/tmf

              value: http://$(NODE_IP):{{ .Values.keycloak.instance.service.nodePort }}/realms/tmf

              {{ else if and .Values.keycloak.setup (eq .Values.installation "prod") }}

              value: {{ .Values.keycloak.domain }}/realms/tmf

              {{ else }}