From f03f083c1ae0aa6d3d57def22825cfbb59ba6fb2 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 4 Apr 2024 15:54:14 +0200 Subject: [PATCH] Rename bundles (#65) - paas-full - paas-hosted - distro-full - distro-hosted Signed-off-by: Andrei Kvapil --- .../platform/bundles/{full-distro.yaml => distro-full.yaml} | 0 .../bundles/{hosted-distro.yaml => distro-hosted.yaml} | 0 .../core/platform/bundles/{full-paas.yaml => paas-full.yaml} | 0 .../platform/bundles/{hosted-paas.yaml => paas-hosted.yaml} | 0 scripts/installer.sh | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename packages/core/platform/bundles/{full-distro.yaml => distro-full.yaml} (100%) rename packages/core/platform/bundles/{hosted-distro.yaml => distro-hosted.yaml} (100%) rename packages/core/platform/bundles/{full-paas.yaml => paas-full.yaml} (100%) rename packages/core/platform/bundles/{hosted-paas.yaml => paas-hosted.yaml} (100%) diff --git a/packages/core/platform/bundles/full-distro.yaml b/packages/core/platform/bundles/distro-full.yaml similarity index 100% rename from packages/core/platform/bundles/full-distro.yaml rename to packages/core/platform/bundles/distro-full.yaml diff --git a/packages/core/platform/bundles/hosted-distro.yaml b/packages/core/platform/bundles/distro-hosted.yaml similarity index 100% rename from packages/core/platform/bundles/hosted-distro.yaml rename to packages/core/platform/bundles/distro-hosted.yaml diff --git a/packages/core/platform/bundles/full-paas.yaml b/packages/core/platform/bundles/paas-full.yaml similarity index 100% rename from packages/core/platform/bundles/full-paas.yaml rename to packages/core/platform/bundles/paas-full.yaml diff --git a/packages/core/platform/bundles/hosted-paas.yaml b/packages/core/platform/bundles/paas-hosted.yaml similarity index 100% rename from packages/core/platform/bundles/hosted-paas.yaml rename to packages/core/platform/bundles/paas-hosted.yaml diff --git a/scripts/installer.sh b/scripts/installer.sh index 85c4ba7d..4d7607b0 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -21,10 +21,10 @@ flux_is_ok() { install_basic_charts() { bundle=$(kubectl get configmap -n cozy-system cozystack -o 'go-template={{index .data "bundle-name"}}') - if [ "$bundle" = "full-paas" ] || [ "$bundle" = "full-distro" ]; then + if [ "$bundle" = "paas-full" ] || [ "$bundle" = "distro-full" ]; then make -C packages/system/cilium apply fi - if [ "$bundle" = "full-paas" ]; then + if [ "$bundle" = "paas-full" ]; then make -C packages/system/kubeovn apply fi }