From 688e805822969bea8d533b6a17181f629f8b1d42 Mon Sep 17 00:00:00 2001 From: Alexander Schwartz Date: Wed, 24 Jan 2024 17:31:48 +0100 Subject: [PATCH] Removing all places where the patch is sed Related to #522 Signed-off-by: Alexander Schwartz --- provision/minikube/Taskfile.yaml | 6 ------ provision/minikube/keycloak/operator-patch.yaml | 11 ----------- provision/openshift/Taskfile.yaml | 6 ------ 3 files changed, 23 deletions(-) delete mode 100644 provision/minikube/keycloak/operator-patch.yaml diff --git a/provision/minikube/Taskfile.yaml b/provision/minikube/Taskfile.yaml index 9a264e6e..daf179e5 100644 --- a/provision/minikube/Taskfile.yaml +++ b/provision/minikube/Taskfile.yaml @@ -199,12 +199,6 @@ tasks: - kubectl -n keycloak apply -f https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/{{.KC_OPERATOR_TAG}}/kubernetes/keycloaks.k8s.keycloak.org-v1.yml - kubectl -n keycloak apply -f https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/{{.KC_OPERATOR_TAG}}/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml - kubectl -n keycloak apply -f https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/{{.KC_OPERATOR_TAG}}/kubernetes/kubernetes.yml || (kubectl -n keycloak delete deployment/keycloak-operator && kubectl -n keycloak apply -f https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/{{.KC_OPERATOR_TAG}}/kubernetes/kubernetes.yml) - - > - bash -c ' - if [ "{{.KC_CONTAINER_IMAGE}}" != "" ]; then - envsubst < keycloak/operator-patch.yaml > .task/subtask-{{.TASK}}-operator-patchfile.yaml - kubectl patch deployment keycloak-operator -n keycloak --patch-file .task/subtask-{{.TASK}}-operator-patchfile.yaml - fi' - > helm upgrade --install keycloak --set hostname={{.IP}}.nip.io diff --git a/provision/minikube/keycloak/operator-patch.yaml b/provision/minikube/keycloak/operator-patch.yaml deleted file mode 100644 index 957ac827..00000000 --- a/provision/minikube/keycloak/operator-patch.yaml +++ /dev/null @@ -1,11 +0,0 @@ -spec: - strategy: - rollingUpdate: ~ - type: Recreate - template: - spec: - containers: - - name: keycloak-operator - env: - - name: OPERATOR_KEYCLOAK_IMAGE - value: ${KC_CONTAINER_IMAGE} diff --git a/provision/openshift/Taskfile.yaml b/provision/openshift/Taskfile.yaml index fb96bd05..62b03624 100644 --- a/provision/openshift/Taskfile.yaml +++ b/provision/openshift/Taskfile.yaml @@ -223,12 +223,6 @@ tasks: - kubectl -n {{.KC_NAMESPACE_PREFIX}}keycloak apply -f https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/{{.KC_OPERATOR_TAG}}/kubernetes/keycloaks.k8s.keycloak.org-v1.yml - kubectl -n {{.KC_NAMESPACE_PREFIX}}keycloak apply -f https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/{{.KC_OPERATOR_TAG}}/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml - kubectl -n {{.KC_NAMESPACE_PREFIX}}keycloak apply -f https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/{{.KC_OPERATOR_TAG}}/kubernetes/kubernetes.yml || (kubectl -n {{.KC_NAMESPACE_PREFIX}}keycloak delete deployment/keycloak-operator && kubectl -n {{.KC_NAMESPACE_PREFIX}}keycloak apply -f https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/{{.KC_OPERATOR_TAG}}/kubernetes/kubernetes.yml) - - > - bash -c ' - if [ "{{.KC_CONTAINER_IMAGE}}" != "" ]; then - envsubst < ../minikube/keycloak/operator-patch.yaml > .task/subtask-{{.TASK}}-operator-patchfile.yaml - kubectl patch deployment keycloak-operator -n {{.KC_NAMESPACE_PREFIX}}keycloak --patch-file .task/subtask-{{.TASK}}-operator-patchfile.yaml - fi' # TODO: sqlpad is disabled as it runs as root in the container, see https://github.com/sqlpad/sqlpad/issues/1171 - > helm upgrade --install keycloak --namespace {{.KC_NAMESPACE_PREFIX}}keycloak