From 2dc05ea872ebf13699714d8a246a359253c6cdcd Mon Sep 17 00:00:00 2001 From: Disaiah Bennett Date: Thu, 8 Aug 2024 12:23:15 -0400 Subject: [PATCH] updated IBIO component to GA status (#889) Signed-off-by: dislbenn --- api/v1/multiclusterengine_methods.go | 32 ++++++++++++----------- controllers/backplaneconfig_controller.go | 9 +++++-- pkg/utils/utils.go | 5 ++-- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/api/v1/multiclusterengine_methods.go b/api/v1/multiclusterengine_methods.go index 9f3f0eca..cc644a94 100644 --- a/api/v1/multiclusterengine_methods.go +++ b/api/v1/multiclusterengine_methods.go @@ -23,21 +23,22 @@ import ( ) const ( - AssistedService = "assisted-service" - ClusterLifecycle = "cluster-lifecycle" - ClusterManager = "cluster-manager" - ClusterProxyAddon = "cluster-proxy-addon" - ConsoleMCE = "console-mce" - Discovery = "discovery" - Hive = "hive" - HyperShift = "hypershift" - HypershiftLocalHosting = "hypershift-local-hosting" - HyperShiftPreview = "hypershift-preview" - LocalCluster = "local-cluster" - ManagedServiceAccount = "managedserviceaccount" - ManagedServiceAccountPreview = "managedserviceaccount-preview" - ServerFoundation = "server-foundation" - ImageBasedInstallOperator = "image-based-install-operator-preview" + AssistedService = "assisted-service" + ClusterLifecycle = "cluster-lifecycle" + ClusterManager = "cluster-manager" + ClusterProxyAddon = "cluster-proxy-addon" + ConsoleMCE = "console-mce" + Discovery = "discovery" + Hive = "hive" + HyperShift = "hypershift" + HypershiftLocalHosting = "hypershift-local-hosting" + HyperShiftPreview = "hypershift-preview" + LocalCluster = "local-cluster" + ManagedServiceAccount = "managedserviceaccount" + ManagedServiceAccountPreview = "managedserviceaccount-preview" + ServerFoundation = "server-foundation" + ImageBasedInstallOperator = "image-based-install-operator" + ImageBasedInstallOperatorPreview = "image-based-install-operator-preview" ) var allComponents = []string{ @@ -56,6 +57,7 @@ var allComponents = []string{ ManagedServiceAccountPreview, ServerFoundation, ImageBasedInstallOperator, + ImageBasedInstallOperatorPreview, } // MCEComponents is a slice containing component names specific to the "MCE" category. diff --git a/controllers/backplaneconfig_controller.go b/controllers/backplaneconfig_controller.go index cbb2cdda..365c3578 100644 --- a/controllers/backplaneconfig_controller.go +++ b/controllers/backplaneconfig_controller.go @@ -1412,7 +1412,7 @@ func (r *MultiClusterEngineReconciler) setDefaults(ctx context.Context, m *backp updateNecessary = true } - // hyper-shift preview component upgraded in 2.8.0 + // hypershift preview component upgraded in ACM 2.8.0 if m.Prune(backplanev1.HyperShiftPreview) { updateNecessary = true } @@ -1424,11 +1424,16 @@ func (r *MultiClusterEngineReconciler) setDefaults(ctx context.Context, m *backp updateNecessary = true } - // managedserviceaccount preview component upgraded in 2.9.0 + // managedserviceaccount preview component upgraded in ACM 2.9.0 if m.Prune(backplanev1.ManagedServiceAccountPreview) { updateNecessary = true } + // image based install operator preview component upgraded in ACM 2.12.0 + if m.Prune(backplanev1.ImageBasedInstallOperatorPreview) { + updateNecessary = true + } + if utils.DeduplicateComponents(m) { updateNecessary = true } diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index e2e3b04a..844fc4c5 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -45,13 +45,12 @@ var onComponents = []string{ backplanev1.LocalCluster, backplanev1.HypershiftLocalHosting, backplanev1.HyperShift, + backplanev1.ImageBasedInstallOperator, backplanev1.ManagedServiceAccount, // backplanev1.ConsoleMCE, // determined by OCP version } -var offComponents = []string{ - backplanev1.ImageBasedInstallOperator, -} +var offComponents = []string{} // SetDefaultComponents returns true if changes are made func SetDefaultComponents(m *backplanev1.MultiClusterEngine) bool {