Skip to content

Commit

Permalink
updated IBIO component to GA status (#889)
Browse files Browse the repository at this point in the history
Signed-off-by: dislbenn <[email protected]>
  • Loading branch information
dislbenn authored Aug 8, 2024
1 parent 2fca979 commit 2dc05ea
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 20 deletions.
32 changes: 17 additions & 15 deletions api/v1/multiclusterengine_methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -56,6 +57,7 @@ var allComponents = []string{
ManagedServiceAccountPreview,
ServerFoundation,
ImageBasedInstallOperator,
ImageBasedInstallOperatorPreview,
}

// MCEComponents is a slice containing component names specific to the "MCE" category.
Expand Down
9 changes: 7 additions & 2 deletions controllers/backplaneconfig_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
5 changes: 2 additions & 3 deletions pkg/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 2dc05ea

Please sign in to comment.