From 5dcd6ff4eaef56f864fbf07a558c617d72ff0f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= Date: Wed, 13 Nov 2024 14:07:34 -0500 Subject: [PATCH] Remove specific configuration for MPC stone-prd-m01 (#4897) We user the same version on both m01 and rh01 clusters, no need to keep the configuration separate. Signed-off-by: Hugo Ares --- .../multi-platform-controller.yaml | 4 +--- .../production/common/kustomization.yaml | 8 -------- .../{common => }/external-secrets.yaml | 0 .../production/{common => }/host-config.yaml | 0 .../production/kustomization.yaml | 3 ++- .../stone-prd-m01/kustomization.yaml | 18 ------------------ 6 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 components/multi-platform-controller/production/common/kustomization.yaml rename components/multi-platform-controller/production/{common => }/external-secrets.yaml (100%) rename components/multi-platform-controller/production/{common => }/host-config.yaml (100%) delete mode 100644 components/multi-platform-controller/production/stone-prd-m01/kustomization.yaml diff --git a/argo-cd-apps/base/member/infra-deployments/multi-platform-controller/multi-platform-controller.yaml b/argo-cd-apps/base/member/infra-deployments/multi-platform-controller/multi-platform-controller.yaml index 6ecf188ee18..74959d844bf 100644 --- a/argo-cd-apps/base/member/infra-deployments/multi-platform-controller/multi-platform-controller.yaml +++ b/argo-cd-apps/base/member/infra-deployments/multi-platform-controller/multi-platform-controller.yaml @@ -14,9 +14,7 @@ spec: environment: staging clusterDir: "" - list: - elements: - - nameNormalized: stone-prd-m01 - values.clusterDir: stone-prd-m01 + elements: [] template: metadata: name: multi-platform-controller-{{nameNormalized}} diff --git a/components/multi-platform-controller/production/common/kustomization.yaml b/components/multi-platform-controller/production/common/kustomization.yaml deleted file mode 100644 index 6d9488fad3f..00000000000 --- a/components/multi-platform-controller/production/common/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: multi-platform-controller - -resources: -- host-config.yaml -- external-secrets.yaml diff --git a/components/multi-platform-controller/production/common/external-secrets.yaml b/components/multi-platform-controller/production/external-secrets.yaml similarity index 100% rename from components/multi-platform-controller/production/common/external-secrets.yaml rename to components/multi-platform-controller/production/external-secrets.yaml diff --git a/components/multi-platform-controller/production/common/host-config.yaml b/components/multi-platform-controller/production/host-config.yaml similarity index 100% rename from components/multi-platform-controller/production/common/host-config.yaml rename to components/multi-platform-controller/production/host-config.yaml diff --git a/components/multi-platform-controller/production/kustomization.yaml b/components/multi-platform-controller/production/kustomization.yaml index c7e5fbc660c..2182a6e22a0 100644 --- a/components/multi-platform-controller/production/kustomization.yaml +++ b/components/multi-platform-controller/production/kustomization.yaml @@ -5,9 +5,10 @@ namespace: multi-platform-controller resources: - ../base/common +- host-config.yaml +- external-secrets.yaml - https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=53a13363d5e6cffb1bb4b4c260cb151f1fea672f - https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=53a13363d5e6cffb1bb4b4c260cb151f1fea672f -- common images: - name: multi-platform-controller diff --git a/components/multi-platform-controller/production/stone-prd-m01/kustomization.yaml b/components/multi-platform-controller/production/stone-prd-m01/kustomization.yaml deleted file mode 100644 index f7186e62ddf..00000000000 --- a/components/multi-platform-controller/production/stone-prd-m01/kustomization.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: multi-platform-controller - -resources: -- ../../base/common -- https://github.com/konflux-ci/multi-platform-controller/deploy/operator?ref=53a13363d5e6cffb1bb4b4c260cb151f1fea672f -- https://github.com/konflux-ci/multi-platform-controller/deploy/otp?ref=53a13363d5e6cffb1bb4b4c260cb151f1fea672f -- ../common - -images: -- name: multi-platform-controller - newName: quay.io/konflux-ci/multi-platform-controller - newTag: 53a13363d5e6cffb1bb4b4c260cb151f1fea672f -- name: multi-platform-otp-server - newName: quay.io/konflux-ci/multi-platform-controller-otp-service - newTag: 53a13363d5e6cffb1bb4b4c260cb151f1fea672f