From 78d65c54d6baf5982686a9b1a1cbaeb05823943c Mon Sep 17 00:00:00 2001 From: Igor Soares Date: Thu, 10 Oct 2024 16:00:34 -0300 Subject: [PATCH] Rename Helm repository to avoid naming collision Rename the Helm repository to avoid using the same name used by other applications in the kube-system namespace. This fixes a bug where HelmRepository objects belonging to multiple apps were being removed from the cluster when running "system application-remove". Test Plan: PASS: build-pkgs && build-image PASS: AIO-SX fresh install PASS: upload/apply/update/remove/delete app Depends-on: https://review.opendev.org/c/starlingx/config/+/932120 Change-Id: Iaabeb5865cbae84944900d46cd742a8572a1eccf Signed-off-by: Igor Soares --- .../fluxcd-manifests/base/helmrepository.yaml | 2 +- .../stx-oidc-auth-helm/fluxcd-manifests/dex/helmrelease.yaml | 2 +- .../fluxcd-manifests/oidc-client/helmrelease.yaml | 2 +- .../fluxcd-manifests/secret-observer/helmrelease.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/base/helmrepository.yaml b/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/base/helmrepository.yaml index 7cc6118..bc91ea6 100644 --- a/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/base/helmrepository.yaml +++ b/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/base/helmrepository.yaml @@ -7,7 +7,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: - name: stx-platform + name: stx-platform-oidc spec: url: http://192.168.206.1:8080/helm_charts/stx-platform interval: 1m diff --git a/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/dex/helmrelease.yaml b/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/dex/helmrelease.yaml index a95a5a2..3462b7d 100644 --- a/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/dex/helmrelease.yaml +++ b/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/dex/helmrelease.yaml @@ -18,7 +18,7 @@ spec: version: REPLACE_HELM_CHART_VERSION sourceRef: kind: HelmRepository - name: stx-platform + name: stx-platform-oidc interval: 1m timeout: 30m test: diff --git a/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/oidc-client/helmrelease.yaml b/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/oidc-client/helmrelease.yaml index a092b39..944dde3 100644 --- a/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/oidc-client/helmrelease.yaml +++ b/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/oidc-client/helmrelease.yaml @@ -18,7 +18,7 @@ spec: version: REPLACE_HELM_CHART_VERSION sourceRef: kind: HelmRepository - name: stx-platform + name: stx-platform-oidc dependsOn: - name: dex namespace: kube-system diff --git a/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/secret-observer/helmrelease.yaml b/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/secret-observer/helmrelease.yaml index 5dc3337..d488c8c 100644 --- a/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/secret-observer/helmrelease.yaml +++ b/stx-oidc-auth-helm/stx-oidc-auth-helm/fluxcd-manifests/secret-observer/helmrelease.yaml @@ -18,7 +18,7 @@ spec: version: REPLACE_HELM_CHART_VERSION sourceRef: kind: HelmRepository - name: stx-platform + name: stx-platform-oidc interval: 1m timeout: 30m test: