From 0951204298ad41835f3f60258ec997683e6517b1 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Fri, 26 May 2023 16:03:06 +0800 Subject: [PATCH] kubeadm: Supports() return true for all alpha/beta/ga/deprecated --- cmd/kubeadm/app/cmd/upgrade/common.go | 1 - cmd/kubeadm/app/features/features.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/cmd/upgrade/common.go b/cmd/kubeadm/app/cmd/upgrade/common.go index fef9b36785d..f2095cb2001 100644 --- a/cmd/kubeadm/app/cmd/upgrade/common.go +++ b/cmd/kubeadm/app/cmd/upgrade/common.go @@ -205,7 +205,6 @@ func enforceRequirements(flags *applyPlanFlags, args []string, dryRun bool, upgr for _, m := range msg { printer.Printf("[upgrade/config] %s\n", m) } - return nil, nil, nil, errors.New("[upgrade/config] FATAL. Unable to upgrade a cluster using deprecated feature-gate flags. Please see the release notes") } // If the user told us to print this information out; do it! diff --git a/cmd/kubeadm/app/features/features.go b/cmd/kubeadm/app/features/features.go index 28a1a3e0021..a8878e1a426 100644 --- a/cmd/kubeadm/app/features/features.go +++ b/cmd/kubeadm/app/features/features.go @@ -91,9 +91,9 @@ func Enabled(featureList map[string]bool, featureName string) bool { // Supports indicates whether a feature name is supported on the given // feature set func Supports(featureList FeatureList, featureName string) bool { - for k, v := range featureList { + for k := range featureList { if featureName == k { - return v.PreRelease != featuregate.Deprecated + return true } } return false