From 9de782e719d6a616bcccd8e73ea4d8ba71bffa89 Mon Sep 17 00:00:00 2001 From: Floppy Disk Date: Thu, 16 Jan 2025 13:23:56 +0300 Subject: [PATCH 1/4] fix --- packages/system/kubevirt-operator/alerts/PrometheusRule.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/system/kubevirt-operator/alerts/PrometheusRule.yaml b/packages/system/kubevirt-operator/alerts/PrometheusRule.yaml index bf8604d0a..f20762dfb 100644 --- a/packages/system/kubevirt-operator/alerts/PrometheusRule.yaml +++ b/packages/system/kubevirt-operator/alerts/PrometheusRule.yaml @@ -2,7 +2,6 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: vm-not-running-alert - namespace: monitoring spec: groups: - name: kubevirt-alerts From 7afb85e5a3394a0da5c4e9b136927fa6daf04a63 Mon Sep 17 00:00:00 2001 From: Floppy Disk Date: Fri, 17 Jan 2025 16:59:02 +0300 Subject: [PATCH 2/4] bugfix/fix-kk-configure-reconciliation --- packages/core/platform/bundles/paas-full.yaml | 3 +++ packages/core/platform/bundles/paas-hosted.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/core/platform/bundles/paas-full.yaml b/packages/core/platform/bundles/paas-full.yaml index 5ec849f3f..7e826c298 100644 --- a/packages/core/platform/bundles/paas-full.yaml +++ b/packages/core/platform/bundles/paas-full.yaml @@ -299,4 +299,7 @@ releases: chart: cozy-keycloak-configure namespace: cozy-keycloak dependsOn: [keycloak-operator] + values: + cozyValues: | + {{ (lookup "v1" "ConfigMap" "cozy-system" "cozystack").data | toJson | sha256sum }} {{- end }} diff --git a/packages/core/platform/bundles/paas-hosted.yaml b/packages/core/platform/bundles/paas-hosted.yaml index 7a92453b0..2ce050103 100644 --- a/packages/core/platform/bundles/paas-hosted.yaml +++ b/packages/core/platform/bundles/paas-hosted.yaml @@ -195,4 +195,7 @@ releases: chart: cozy-keycloak-configure namespace: cozy-keycloak dependsOn: [keycloak-operator] + values: + cozyValues: | + {{ (lookup "v1" "ConfigMap" "cozy-system" "cozystack").data | toJson | sha256sum }} {{- end }} From 2b3c1d3a304643faf07ea2261ef13aabd2873a17 Mon Sep 17 00:00:00 2001 From: klinch0 <68821526+klinch0@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:03:31 +0300 Subject: [PATCH 3/4] Update packages/core/platform/bundles/paas-hosted.yaml Co-authored-by: Andrei Kvapil --- packages/core/platform/bundles/paas-hosted.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/platform/bundles/paas-hosted.yaml b/packages/core/platform/bundles/paas-hosted.yaml index 2ce050103..3b1085cda 100644 --- a/packages/core/platform/bundles/paas-hosted.yaml +++ b/packages/core/platform/bundles/paas-hosted.yaml @@ -196,6 +196,6 @@ releases: namespace: cozy-keycloak dependsOn: [keycloak-operator] values: - cozyValues: | - {{ (lookup "v1" "ConfigMap" "cozy-system" "cozystack").data | toJson | sha256sum }} + cozystack: + configHash: {{ $cozyConfig | toJson | sha256sum }} {{- end }} From b33d3482d400525e1ab0ece15249fec23d2db92e Mon Sep 17 00:00:00 2001 From: klinch0 <68821526+klinch0@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:03:48 +0300 Subject: [PATCH 4/4] Update packages/core/platform/bundles/paas-full.yaml Co-authored-by: Andrei Kvapil --- packages/core/platform/bundles/paas-full.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/platform/bundles/paas-full.yaml b/packages/core/platform/bundles/paas-full.yaml index 7e826c298..6b73f6ef0 100644 --- a/packages/core/platform/bundles/paas-full.yaml +++ b/packages/core/platform/bundles/paas-full.yaml @@ -300,6 +300,6 @@ releases: namespace: cozy-keycloak dependsOn: [keycloak-operator] values: - cozyValues: | - {{ (lookup "v1" "ConfigMap" "cozy-system" "cozystack").data | toJson | sha256sum }} + cozystack: + configHash: {{ $cozyConfig | toJson | sha256sum }} {{- end }}