github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #118335 from pacoxu/revert-118316-fix-kubeadm-20230529

Browse Source 
Revert "kubeadm: add --feature-gates flag for kubeadm upgrade node"
This commit is contained in:
Kubernetes Prow Robot 2023-05-31 02:01:57 -07:00 committed by GitHub
commit 23698d3e9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/kubeadm/app/cmd/upgrade/node.go
View File

@ -33,7 +33,6 @@ import (
phases "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/upgrade/node" phases "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/upgrade/node"
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow"
"k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/kubernetes/cmd/kubeadm/app/features"
configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config"
) )
@ -48,7 +47,6 @@ type nodeOptions struct {
dryRun bool dryRun bool
patchesDir string patchesDir string
ignorePreflightErrors []string ignorePreflightErrors []string
featureGatesString string
} }
// compile-time assert that the local data object satisfies the phases data interface. // compile-time assert that the local data object satisfies the phases data interface.
@ -87,7 +85,6 @@ func newCmdNode(out io.Writer) *cobra.Command {
// flags could be eventually inherited by the sub-commands automatically generated for phases // flags could be eventually inherited by the sub-commands automatically generated for phases
addUpgradeNodeFlags(cmd.Flags(), nodeOptions) addUpgradeNodeFlags(cmd.Flags(), nodeOptions)
options.AddPatchesFlag(cmd.Flags(), &nodeOptions.patchesDir) options.AddPatchesFlag(cmd.Flags(), &nodeOptions.patchesDir)
options.AddFeatureGatesStringFlag(cmd.Flags(), &nodeOptions.featureGatesString)
// initialize the workflow runner with the list of phases // initialize the workflow runner with the list of phases
nodeRunner.AppendPhase(phases.NewPreflightPhase()) nodeRunner.AppendPhase(phases.NewPreflightPhase())
@ -162,15 +159,6 @@ func newNodeData(cmd *cobra.Command, args []string, options *nodeOptions, out io
} }
// Also set the union of pre-flight errors to JoinConfiguration, to provide a consistent view of the runtime configuration: // Also set the union of pre-flight errors to JoinConfiguration, to provide a consistent view of the runtime configuration:
cfg.NodeRegistration.IgnorePreflightErrors = sets.List(ignorePreflightErrorsSet) cfg.NodeRegistration.IgnorePreflightErrors = sets.List(ignorePreflightErrorsSet)
// If features gates are passed to the command line, use it (otherwise use featureGates from configuration)
if options.featureGatesString != "" {
cfg.FeatureGates, err = features.NewFeatureGate(&features.InitFeatureGates, options.featureGatesString)
if err != nil {
return nil, errors.Wrap(err, "[upgrade/config] FATAL")
}
}
return &nodeData{ return &nodeData{
etcdUpgrade: options.etcdUpgrade, etcdUpgrade: options.etcdUpgrade,
renewCerts: options.renewCerts, renewCerts: options.renewCerts,