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

Merge pull request #121280 from chendave/removecfg

Browse Source 
kubeadm: remove `ClusterConfiguration` parameter from preflight check
This commit is contained in:
Kubernetes Prow Robot 2023-10-17 12:15:58 +02:00 committed by GitHub
commit c46d737ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/upgrade/common.go
View File

@ -184,7 +184,7 @@ func enforceRequirements(flags *applyPlanFlags, args []string, dryRun bool, upgr
// Ensure the user is root // Ensure the user is root
klog.V(1).Info("running preflight checks") klog.V(1).Info("running preflight checks")
if err := runPreflightChecks(client, ignorePreflightErrorsSet, &cfg.ClusterConfiguration, printer); err != nil { if err := runPreflightChecks(client, ignorePreflightErrorsSet, printer); err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }
@ -236,7 +236,7 @@ func printConfiguration(clustercfg *kubeadmapi.ClusterConfiguration, w io.Writer
} }
// runPreflightChecks runs the root preflight check // runPreflightChecks runs the root preflight check
func runPreflightChecks(client clientset.Interface, ignorePreflightErrors sets.Set[string], cfg *kubeadmapi.ClusterConfiguration, printer output.Printer) error { func runPreflightChecks(client clientset.Interface, ignorePreflightErrors sets.Set[string], printer output.Printer) error {
printer.Printf("[preflight] Running pre-flight checks.\n") printer.Printf("[preflight] Running pre-flight checks.\n")
err := preflight.RunRootCheckOnly(ignorePreflightErrors) err := preflight.RunRootCheckOnly(ignorePreflightErrors)
if err != nil { if err != nil {