From ed5bfc626100e2a8dced1b4f4142acdd9f3a618a Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Mon, 9 Dec 2024 15:32:23 +0800 Subject: [PATCH] Add cluster importer feature and promote addonManagement feature to beta Signed-off-by: Jian Qiu --- feature/feature.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/feature/feature.go b/feature/feature.go index 1e658be5a..81a8384df 100644 --- a/feature/feature.go +++ b/feature/feature.go @@ -80,6 +80,9 @@ const ( // ClusterProfile will start new controller in the Hub that can be used to sync ManagedCluster to ClusterProfile. ClusterProfile featuregate.Feature = "ClusterProfile" + + // ClusterImporter will enable the auto import of managed cluster for certain cluster providers, e.g. cluster-api. + ClusterImporter featuregate.Feature = "ClusterImporter" ) // DefaultSpokeRegistrationFeatureGates consists of all known ocm-registration @@ -87,7 +90,7 @@ const ( // add it here. var DefaultSpokeRegistrationFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ ClusterClaim: {Default: true, PreRelease: featuregate.Beta}, - AddonManagement: {Default: true, PreRelease: featuregate.Alpha}, + AddonManagement: {Default: true, PreRelease: featuregate.Beta}, V1beta1CSRAPICompatibility: {Default: false, PreRelease: featuregate.Alpha}, MultipleHubs: {Default: false, PreRelease: featuregate.Alpha}, } @@ -101,10 +104,11 @@ var DefaultHubRegistrationFeatureGates = map[featuregate.Feature]featuregate.Fea ManagedClusterAutoApproval: {Default: false, PreRelease: featuregate.Alpha}, ResourceCleanup: {Default: false, PreRelease: featuregate.Alpha}, ClusterProfile: {Default: false, PreRelease: featuregate.Alpha}, + ClusterImporter: {Default: false, PreRelease: featuregate.Alpha}, } var DefaultHubAddonManagerFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ - AddonManagement: {Default: true, PreRelease: featuregate.Alpha}, + AddonManagement: {Default: true, PreRelease: featuregate.Beta}, } // DefaultHubWorkFeatureGates consists of all known acm work wehbook feature keys.