From 3f835d6563ee3497d3906389abf229ecaaf42825 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Fri, 31 Jan 2025 10:45:10 +0100
Subject: [PATCH] Remove https related settings

---
 keycloak/base/keycloak-deployment.yaml        | 23 +--------
 keycloak/keycloak-application.yaml            |  2 +-
 keycloak/overlays/dev/kustomization.yaml      |  7 ---
 keycloak/overlays/prod/kustomization.yaml     |  7 ---
 .../overlays/test/keycloak-deployment.yaml    | 51 -------------------
 keycloak/overlays/test/kustomization.yaml     |  1 -
 6 files changed, 3 insertions(+), 88 deletions(-)
 delete mode 100644 keycloak/overlays/dev/kustomization.yaml
 delete mode 100644 keycloak/overlays/prod/kustomization.yaml
 delete mode 100644 keycloak/overlays/test/keycloak-deployment.yaml

diff --git a/keycloak/base/keycloak-deployment.yaml b/keycloak/base/keycloak-deployment.yaml
index 0185535..e86f38d 100644
--- a/keycloak/base/keycloak-deployment.yaml
+++ b/keycloak/base/keycloak-deployment.yaml
@@ -17,22 +17,11 @@ spec:
     spec:
       containers:
       - name: keycloak
-        # image: quay.io/keycloak/keycloak:23.0.1
         image: quay.io/keycloak/keycloak:26.1
         args:
         - "start"
         - "--verbose"
         env:
-        - name: KC_HTTP_ENABLED
-          value: "true"
-        - name: KC_HOSTNAME
-          value: "https://keycloak.streams.sunet.se"
-        - name: KC_HOSTNAME_ADMIN
-          value: "https://keycloak.streams.sunet.se"
-        - name: KC_HOSTNAME_STRICT
-          value: "false"
-        - name: KC_HOSTNAME_STRICT_HTTPS
-          value: "false"
         - name: KEYCLOAK_USER
           value: admin
         - name: KEYCLOAK_PASSWORD
@@ -54,8 +43,6 @@ spec:
         ports:
         - name: http
           containerPort: 8080
-        # - name: https
-        #   containerPort: 8443
         readinessProbe:
           httpGet:
             path: /health/ready
@@ -66,11 +53,8 @@ spec:
           successThreshold: 1 # Number of successful probes to consider the pod ready
           failureThreshold: 5
         volumeMounts:
-        # - mountPath: /opt/keycloak/data/h2/
-        #   name: storage
-        - name: keycloak-tls-secret
-          mountPath: /etc/ssl/certs
-          readOnly: true
+         - mountPath: /opt/keycloak/data/h2/
+           name: storage
         securityContext:
           runAsUser: 1000
           runAsGroup: 1000
@@ -78,6 +62,3 @@ spec:
       - name: storage
         persistentVolumeClaim:
           claimName: keycloak-pvc
-      - name: keycloak-tls-secret
-        secret:
-          secretName: keycloak-tls-secret
diff --git a/keycloak/keycloak-application.yaml b/keycloak/keycloak-application.yaml
index e420d57..31bcf6a 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-v13
+    targetRevision: streams-manifests-2025-01-31-v14
     path: keycloak/overlays/test
   destination:
     server: https://kubernetes.default.svc
diff --git a/keycloak/overlays/dev/kustomization.yaml b/keycloak/overlays/dev/kustomization.yaml
deleted file mode 100644
index fc82fb7..0000000
--- a/keycloak/overlays/dev/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: keycloak
-commonLabels:
-  env: dev
-resources:
-- ../../base/
diff --git a/keycloak/overlays/prod/kustomization.yaml b/keycloak/overlays/prod/kustomization.yaml
deleted file mode 100644
index c0cf978..0000000
--- a/keycloak/overlays/prod/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: keycloak
-commonLabels:
-  env: prod
-resources:
-- ../../base/
diff --git a/keycloak/overlays/test/keycloak-deployment.yaml b/keycloak/overlays/test/keycloak-deployment.yaml
deleted file mode 100644
index 2e9372e..0000000
--- a/keycloak/overlays/test/keycloak-deployment.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-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_DEBUG
-          value: "true"
-        - name: KC_HTTP_ENABLED
-          value: "true"
-        - name: KC_HOSTNAME
-          value: "https://keycloak-test.streams.sunet.se"
-        - name: KC_HOSTNAME_ADMIN
-          value: "https://keycloak-test.streams.sunet.se"
-        - name: KC_HOSTNAME_STRICT
-          value: "false"
-        - name: KC_HOSTNAME_STRICT_HTTPS
-          value: "false"
-        - name: KEYCLOAK_USER
-          value: admin
-        - name: KEYCLOAK_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: keycloak-admin-secret
-              key: password
-        - name: KEYCLOAK_ADMIN
-          value: "admin"
-        - name: KEYCLOAK_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/kustomization.yaml b/keycloak/overlays/test/kustomization.yaml
index dbb351c..dc58c91 100644
--- a/keycloak/overlays/test/kustomization.yaml
+++ b/keycloak/overlays/test/kustomization.yaml
@@ -7,4 +7,3 @@ resources:
 - ../../base/
 patches:
   - path: keycloak-ingress.yaml
-  - path: keycloak-deployment.yaml