From 5e48a5e523b77ad250a2b49a589c86431beaf867 Mon Sep 17 00:00:00 2001 From: Andrej Petras Date: Tue, 18 Jun 2024 16:19:41 +0200 Subject: [PATCH] fix(keycloak-operator): change from operator. to kc.operator. keys (#1277) --- charts/keycloak-operator/Chart.yaml | 7 ++---- charts/keycloak-operator/README.md | 2 +- .../templates/operator/deployment.yaml | 2 +- .../tests/__snapshot__/default_test.yaml.snap | 22 +++++++++---------- .../tests/__snapshot__/operand_test.yaml.snap | 4 ++-- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/charts/keycloak-operator/Chart.yaml b/charts/keycloak-operator/Chart.yaml index 746b37a19..9a25878f2 100644 --- a/charts/keycloak-operator/Chart.yaml +++ b/charts/keycloak-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: keycloak-operator description: Deploy Keycloak Operator and Keycloak type: application -version: 1.2.0 +version: 1.2.1 appVersion: "24.0.4" icon: https://www.keycloak.org/resources/images/logo-stacked.svg home: https://www.keycloak.org @@ -16,7 +16,4 @@ maintainers: annotations: artifacthub.io/changes: | - kind: changed - description: "New feature: disable Operator templates generation" - links: - - name: "Issue 1270" - url: https://github.com/adfinis/helm-charts/issues/1270 + description: "Fix: change from operator. to kc.operator. keys" diff --git a/charts/keycloak-operator/README.md b/charts/keycloak-operator/README.md index 267ef4f69..52f2e98f5 100644 --- a/charts/keycloak-operator/README.md +++ b/charts/keycloak-operator/README.md @@ -1,6 +1,6 @@ # keycloak-operator -![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 24.0.4](https://img.shields.io/badge/AppVersion-24.0.4-informational?style=flat-square) +![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 24.0.4](https://img.shields.io/badge/AppVersion-24.0.4-informational?style=flat-square) Deploy Keycloak Operator and Keycloak diff --git a/charts/keycloak-operator/templates/operator/deployment.yaml b/charts/keycloak-operator/templates/operator/deployment.yaml index 860c497f6..ee5bbdbcd 100644 --- a/charts/keycloak-operator/templates/operator/deployment.yaml +++ b/charts/keycloak-operator/templates/operator/deployment.yaml @@ -37,7 +37,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: OPERATOR_KEYCLOAK_IMAGE + - name: KC_OPERATOR_KEYCLOAK_IMAGE value: "{{ .Values.operator.config.keycloakImage.repository }}:{{ .Values.operator.config.keycloakImage.tag | default .Chart.AppVersion }}" ports: - name: http diff --git a/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap b/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap index 2ec0ad566..39681869d 100644 --- a/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap +++ b/charts/keycloak-operator/tests/__snapshot__/default_test.yaml.snap @@ -9,7 +9,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: keycloakcontroller-cluster-role rules: - apiGroups: @@ -36,7 +36,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: keycloakrealmimportcontroller-cluster-role rules: - apiGroups: @@ -63,7 +63,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: RELEASE-NAME-keycloak-operator-operator spec: replicas: 1 @@ -85,7 +85,7 @@ should match snapshot: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: OPERATOR_KEYCLOAK_IMAGE + - name: KC_OPERATOR_KEYCLOAK_IMAGE value: quay.io/keycloak/keycloak:24.0.4 image: quay.io/keycloak/keycloak-operator:24.0.4 imagePullPolicy: IfNotPresent @@ -128,7 +128,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: keycloak-operator-role-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -147,7 +147,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: keycloak-operator-view roleRef: apiGroup: rbac.authorization.k8s.io @@ -166,7 +166,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: keycloakcontroller-role-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -185,7 +185,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: keycloakrealmimportcontroller-role-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -204,7 +204,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: keycloak-operator-role rules: - apiGroups: @@ -267,7 +267,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: RELEASE-NAME-keycloak-operator-operator spec: ports: @@ -290,5 +290,5 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: keycloak-operator app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: RELEASE-NAME-keycloak-operator diff --git a/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap b/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap index e4590e6b2..8b8e5b422 100644 --- a/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap +++ b/charts/keycloak-operator/tests/__snapshot__/operand_test.yaml.snap @@ -7,7 +7,7 @@ should match snapshot: app.kubernetes.io/component: keycloak app.kubernetes.io/managed-by: Helm app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: keycloak spec: features: @@ -35,7 +35,7 @@ should match snapshot: labels: app.kubernetes.io/managed-by: Helm app.kubernetes.io/version: 24.0.4 - helm.sh/chart: keycloak-operator-1.2.0 + helm.sh/chart: keycloak-operator-1.2.1 name: RELEASE-NAME-keycloak-operator-test spec: keycloakCRName: keycloak