From 635b1b250f4d684eb6c5419b4bac4f9bcf72ecdf Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Fri, 31 Jan 2025 11:40:13 +0100
Subject: [PATCH] Use different urls

---
 keycloak/base/keycloak-deployment.yaml        |  4 ++
 keycloak/base/keycloak-ingress.yaml           | 38 +++++++++-----
 keycloak/keycloak-application.yaml            |  2 +-
 .../overlays/test/keycloak-deployment.yaml    | 49 +++++++++++++++++++
 keycloak/overlays/test/keycloak-ingress.yaml  | 38 +++++++++-----
 keycloak/overlays/test/kustomization.yaml     |  1 +
 6 files changed, 105 insertions(+), 27 deletions(-)
 create mode 100644 keycloak/overlays/test/keycloak-deployment.yaml

diff --git a/keycloak/base/keycloak-deployment.yaml b/keycloak/base/keycloak-deployment.yaml
index 42c99de..00bafe7 100644
--- a/keycloak/base/keycloak-deployment.yaml
+++ b/keycloak/base/keycloak-deployment.yaml
@@ -26,6 +26,10 @@ spec:
             - "start"
             - "--verbose"
           env:
+            - name: KC_HOSTNAME_ADMIN_URL
+              value: "https://kcadmin.streams.sunet.se"
+            - name: KC_HOSTNAME_URL
+              value: "https://keycloak.streams.sunet.se"
             - name: KC_HOSTNAME_STRICT
               value: "false"
             - name: KC_HOSTNAME_STRICT_HTTPS
diff --git a/keycloak/base/keycloak-ingress.yaml b/keycloak/base/keycloak-ingress.yaml
index f0acd30..d022ee9 100644
--- a/keycloak/base/keycloak-ingress.yaml
+++ b/keycloak/base/keycloak-ingress.yaml
@@ -14,17 +14,29 @@ spec:
       port:
         number: 80
   tls:
-  - hosts:
-    - keycloak.streams.sunet.se
-    secretName: keycloak-tls
+    - hosts:
+      - keycloak.streams.sunet.se
+        secretName: keycloak-tls
+      - kcadmin.streams.sunet.se
+        secretName: kcadmin-tls
   rules:
-  - host: keycloak.streams.sunet.se
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: keycloak
-            port:
-              number: 80
+    - host: keycloak.streams.sunet.se
+      http:
+        paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: keycloak
+              port:
+                number: 80
+    - host: kcadmin.streams.sunet.se
+      http:
+        paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: keycloak
+              port:
+                number: 80
diff --git a/keycloak/keycloak-application.yaml b/keycloak/keycloak-application.yaml
index 1e094cc..898b4b7 100644
--- a/keycloak/keycloak-application.yaml
+++ b/keycloak/keycloak-application.yaml
@@ -7,7 +7,7 @@ spec:
   project: default
   source:
     repoURL: https://platform.sunet.se/streams/streams-manifests.git
-    targetRevision: streams-manifests-2025-01-31-v18
+    targetRevision: streams-manifests-2025-01-31-v19
     path: keycloak/overlays/test
   destination:
     server: https://kubernetes.default.svc
diff --git a/keycloak/overlays/test/keycloak-deployment.yaml b/keycloak/overlays/test/keycloak-deployment.yaml
new file mode 100644
index 0000000..946dd23
--- /dev/null
+++ b/keycloak/overlays/test/keycloak-deployment.yaml
@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: keycloak
+  namespace: keycloak
+  labels:
+    app: keycloak
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: keycloak
+  template:
+    metadata:
+      labels:
+        app: keycloak
+    spec:
+      containers:
+        - name: keycloak
+          image: quay.io/keycloak/keycloak:26.1
+          env:
+            - name: KC_HOSTNAME_ADMIN_URL
+              value: "https://kcadmin-test.streams.sunet.se"
+            - name: KC_HOSTNAME_URL
+              value: "https://keycloak-test.streams.sunet.se"
+            - name: KC_HOSTNAME_STRICT
+              value: "false"
+            - name: KC_HOSTNAME_STRICT_HTTPS
+              value: "false"
+            - name: KC_HTTP_ENABLED
+              value: "true"
+            - name: KEYCLOAK_USER
+              value: admin
+            - name: KEYCLOAK_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-admin-secret
+                  key: password
+            - name: KC_BOOTSTRAP_ADMIN_USERNAME
+              value: "admin"
+            - name: KC_BOOTSTRAP_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-admin-secret
+                  key: password
+            - name: KC_HEALTH_ENABLED
+              value: "true"
+            - name: KC_PROXY
+              value: "edge"
diff --git a/keycloak/overlays/test/keycloak-ingress.yaml b/keycloak/overlays/test/keycloak-ingress.yaml
index 8cef25a..0c1f12e 100644
--- a/keycloak/overlays/test/keycloak-ingress.yaml
+++ b/keycloak/overlays/test/keycloak-ingress.yaml
@@ -14,17 +14,29 @@ spec:
       port:
         number: 80
   tls:
-  - hosts:
-    - keycloak-test.streams.sunet.se
-    secretName: keycloak-tls
+    - hosts:
+      - keycloak-test.streams.sunet.se
+        secretName: keycloak-tls
+      - kcadmin-test.streams.sunet.se
+        secretName: kcadmin-tls
   rules:
-  - host: keycloak-test.streams.sunet.se
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: keycloak
-            port:
-              number: 80
+    - host: keycloak-test.streams.sunet.se
+      http:
+        paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: keycloak
+              port:
+                number: 80
+    - host: kcadmin-test.streams.sunet.se
+      http:
+        paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: keycloak
+              port:
+                number: 80
diff --git a/keycloak/overlays/test/kustomization.yaml b/keycloak/overlays/test/kustomization.yaml
index dc58c91..2379afa 100644
--- a/keycloak/overlays/test/kustomization.yaml
+++ b/keycloak/overlays/test/kustomization.yaml
@@ -6,4 +6,5 @@ commonLabels:
 resources:
 - ../../base/
 patches:
+  - path: keycloak-deployment.yaml
   - path: keycloak-ingress.yaml