Skip to content

K
k3s
Commit 9e204fe7 authored by xiangpengzhao's avatar xiangpengzhao
Browse files
Options

Remove the kubeadm `--skip-preflight-checks` flag

parent db9545e6
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 68 deletions
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
View file @ 9e204fe7
...@@ -389,7 +389,7 @@ func ValidateAPIEndpoint(c *kubeadm.API, fldPath *field.Path) field.ErrorList { ...@@ -389,7 +389,7 @@ func ValidateAPIEndpoint(c *kubeadm.API, fldPath *field.Path) field.ErrorList {
} }
// ValidateIgnorePreflightErrors validates duplicates in ignore-preflight-errors flag. // ValidateIgnorePreflightErrors validates duplicates in ignore-preflight-errors flag.
func ValidateIgnorePreflightErrors(ignorePreflightErrors []string, skipPreflightChecks bool) (sets.String, error) { func ValidateIgnorePreflightErrors(ignorePreflightErrors []string) (sets.String, error) {
ignoreErrors := sets.NewString() ignoreErrors := sets.NewString()
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
...@@ -397,11 +397,6 @@ func ValidateIgnorePreflightErrors(ignorePreflightErrors []string, skipPreflight ...@@ -397,11 +397,6 @@ func ValidateIgnorePreflightErrors(ignorePreflightErrors []string, skipPreflight
ignoreErrors.Insert(strings.ToLower(item)) // parameters are case insensitive ignoreErrors.Insert(strings.ToLower(item)) // parameters are case insensitive
} }
// TODO: remove once deprecated flag --skip-preflight-checks is removed.
if skipPreflightChecks {
ignoreErrors.Insert("all")
}
if ignoreErrors.Has("all") && ignoreErrors.Len() > 1 { if ignoreErrors.Has("all") && ignoreErrors.Len() > 1 {
allErrs = append(allErrs, field.Invalid(field.NewPath("ignore-preflight-errors"), strings.Join(ignoreErrors.List(), ","), "don't specify individual checks if 'all' is used")) allErrs = append(allErrs, field.Invalid(field.NewPath("ignore-preflight-errors"), strings.Join(ignoreErrors.List(), ","), "don't specify individual checks if 'all' is used"))
} }
......
cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go
View file @ 9e204fe7
...@@ -591,22 +591,23 @@ func TestValidateMixedArguments(t *testing.T) { ...@@ -591,22 +591,23 @@ func TestValidateMixedArguments(t *testing.T) {
// Expected to succeed, --config is mixed with skip-* flags only or no other flags // Expected to succeed, --config is mixed with skip-* flags only or no other flags
{[]string{"--foo=bar"}, true}, {[]string{"--foo=bar"}, true},
{[]string{"--config=hello"}, true}, {[]string{"--config=hello"}, true},
{[]string{"--config=hello", "--skip-preflight-checks=true"}, true}, {[]string{"--config=hello", "--ignore-preflight-errors=all"}, true},
{[]string{"--config=hello", "--skip-token-print=true"}, true}, {[]string{"--config=hello", "--skip-token-print=true"}, true},
{[]string{"--config=hello", "--skip-preflight-checks", "--skip-token-print"}, true}, {[]string{"--config=hello", "--ignore-preflight-errors=baz", "--skip-token-print"}, true},
// Expected to fail, --config is mixed with the --foo flag // Expected to fail, --config is mixed with the --foo flag
{[]string{"--config=hello", "--skip-preflight-checks", "--foo=bar"}, false}, {[]string{"--config=hello", "--ignore-preflight-errors=baz", "--foo=bar"}, false},
{[]string{"--config=hello", "--foo=bar"}, false}, {[]string{"--config=hello", "--foo=bar"}, false},
} }
var cfgPath string var cfgPath string
var ignorePreflightErrors []string
for _, rt := range tests { for _, rt := range tests {
f := pflag.NewFlagSet("test", pflag.ContinueOnError) f := pflag.NewFlagSet("test", pflag.ContinueOnError)
if f.Parsed() { if f.Parsed() {
t.Error("f.Parse() = true before Parse") t.Error("f.Parse() = true before Parse")
} }
f.String("foo", "", "flag bound to config object") f.String("foo", "", "flag bound to config object")
f.Bool("skip-preflight-checks", false, "flag not bound to config object") f.StringSliceVar(&ignorePreflightErrors, "ignore-preflight-errors", ignorePreflightErrors, "flag not bound to config object")
f.Bool("skip-token-print", false, "flag not bound to config object") f.Bool("skip-token-print", false, "flag not bound to config object")
f.StringVar(&cfgPath, "config", cfgPath, "Path to kubeadm config file") f.StringVar(&cfgPath, "config", cfgPath, "Path to kubeadm config file")
if err := f.Parse(rt.args); err != nil { if err := f.Parse(rt.args); err != nil {
...@@ -652,28 +653,25 @@ func TestValidateFeatureGates(t *testing.T) { ...@@ -652,28 +653,25 @@ func TestValidateFeatureGates(t *testing.T) {
func TestValidateIgnorePreflightErrors(t *testing.T) { func TestValidateIgnorePreflightErrors(t *testing.T) {
var tests = []struct { var tests = []struct {
ignorePreflightErrors []string ignorePreflightErrors []string
skipPreflightChecks bool
expectedLen int expectedLen int
expectedError bool expectedError bool
}{ }{
{[]string{}, false, 0, false}, // empty list, no old skip-preflight-checks {[]string{}, 0, false}, // empty list
{[]string{}, true, 1, false}, // empty list, old skip-preflight-checks {[]string{"check1", "check2"}, 2, false}, // non-duplicate
{[]string{"check1", "check2"}, false, 2, false}, // non-duplicate {[]string{"check1", "check2", "check1"}, 2, false}, // duplicates
{[]string{"check1", "check2"}, true, 3, true}, // non-duplicate, but skip-preflight-checks {[]string{"check1", "check2", "all"}, 3, true}, // non-duplicate, but 'all' present together wth individual checks
{[]string{"check1", "check2", "check1"}, false, 2, false}, // duplicates {[]string{"all"}, 1, false}, // skip all checks by using new flag
{[]string{"check1", "check2", "all"}, false, 3, true}, // non-duplicate, but 'all' present together wth individual checks {[]string{"all"}, 1, false}, // skip all checks by using both old and new flags at the same time
{[]string{"all"}, false, 1, false}, // skip all checks by using new flag
{[]string{"all"}, true, 1, false}, // skip all checks by using both old and new flags at the same time
} }
for _, rt := range tests { for _, rt := range tests {
result, err := ValidateIgnorePreflightErrors(rt.ignorePreflightErrors, rt.skipPreflightChecks) result, err := ValidateIgnorePreflightErrors(rt.ignorePreflightErrors)
switch { switch {
case err != nil && !rt.expectedError: case err != nil && !rt.expectedError:
t.Errorf("ValidateIgnorePreflightErrors: unexpected error for input (%s, %v), error: %v", rt.ignorePreflightErrors, rt.skipPreflightChecks, err) t.Errorf("ValidateIgnorePreflightErrors: unexpected error for input (%s), error: %v", rt.ignorePreflightErrors, err)
case err == nil && rt.expectedError: case err == nil && rt.expectedError:
t.Errorf("ValidateIgnorePreflightErrors: expected error for input (%s, %v) but got: %v", rt.ignorePreflightErrors, rt.skipPreflightChecks, result) t.Errorf("ValidateIgnorePreflightErrors: expected error for input (%s) but got: %v", rt.ignorePreflightErrors, result)
case result.Len() != rt.expectedLen: case result.Len() != rt.expectedLen:
t.Errorf("ValidateIgnorePreflightErrors: expected Len = %d for input (%s, %v) but got: %v, %v", rt.expectedLen, rt.ignorePreflightErrors, rt.skipPreflightChecks, result.Len(), result) t.Errorf("ValidateIgnorePreflightErrors: expected Len = %d for input (%s) but got: %v, %v", rt.expectedLen, rt.ignorePreflightErrors, result.Len(), result)
} }
} }
} }
......
cmd/kubeadm/app/cmd/init.go
View file @ 9e204fe7
...@@ -113,7 +113,6 @@ func NewCmdInit(out io.Writer) *cobra.Command { ...@@ -113,7 +113,6 @@ func NewCmdInit(out io.Writer) *cobra.Command {
kubeadmscheme.Scheme.Default(externalcfg) kubeadmscheme.Scheme.Default(externalcfg)
var cfgPath string var cfgPath string
var skipPreFlight bool
var skipTokenPrint bool var skipTokenPrint bool
var dryRun bool var dryRun bool
var featureGatesString string var featureGatesString string
...@@ -134,7 +133,7 @@ func NewCmdInit(out io.Writer) *cobra.Command { ...@@ -134,7 +133,7 @@ func NewCmdInit(out io.Writer) *cobra.Command {
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
} }
ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors, skipPreFlight) ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
err = validation.ValidateMixedArguments(cmd.Flags()) err = validation.ValidateMixedArguments(cmd.Flags())
...@@ -150,7 +149,7 @@ func NewCmdInit(out io.Writer) *cobra.Command { ...@@ -150,7 +149,7 @@ func NewCmdInit(out io.Writer) *cobra.Command {
} }
AddInitConfigFlags(cmd.PersistentFlags(), externalcfg, &featureGatesString) AddInitConfigFlags(cmd.PersistentFlags(), externalcfg, &featureGatesString)
AddInitOtherFlags(cmd.PersistentFlags(), &cfgPath, &skipPreFlight, &skipTokenPrint, &dryRun, &ignorePreflightErrors) AddInitOtherFlags(cmd.PersistentFlags(), &cfgPath, &skipTokenPrint, &dryRun, &ignorePreflightErrors)
bto.AddTokenFlag(cmd.PersistentFlags()) bto.AddTokenFlag(cmd.PersistentFlags())
bto.AddTTLFlag(cmd.PersistentFlags()) bto.AddTTLFlag(cmd.PersistentFlags())
...@@ -204,7 +203,7 @@ func AddInitConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.InitConfi ...@@ -204,7 +203,7 @@ func AddInitConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.InitConfi
} }
// AddInitOtherFlags adds init flags that are not bound to a configuration file to the given flagset // AddInitOtherFlags adds init flags that are not bound to a configuration file to the given flagset
func AddInitOtherFlags(flagSet *flag.FlagSet, cfgPath *string, skipPreFlight, skipTokenPrint, dryRun *bool, ignorePreflightErrors *[]string) { func AddInitOtherFlags(flagSet *flag.FlagSet, cfgPath *string, skipTokenPrint, dryRun *bool, ignorePreflightErrors *[]string) {
flagSet.StringVar( flagSet.StringVar(
cfgPath, "config", *cfgPath, cfgPath, "config", *cfgPath,
"Path to kubeadm config file. WARNING: Usage of a configuration file is experimental.", "Path to kubeadm config file. WARNING: Usage of a configuration file is experimental.",
...@@ -215,12 +214,6 @@ func AddInitOtherFlags(flagSet *flag.FlagSet, cfgPath *string, skipPreFlight, sk ...@@ -215,12 +214,6 @@ func AddInitOtherFlags(flagSet *flag.FlagSet, cfgPath *string, skipPreFlight, sk
) )
// Note: All flags that are not bound to the cfg object should be whitelisted in cmd/kubeadm/app/apis/kubeadm/validation/validation.go // Note: All flags that are not bound to the cfg object should be whitelisted in cmd/kubeadm/app/apis/kubeadm/validation/validation.go
flagSet.BoolVar( flagSet.BoolVar(
skipPreFlight, "skip-preflight-checks", *skipPreFlight,
"Skip preflight checks which normally run before modifying the system.",
)
flagSet.MarkDeprecated("skip-preflight-checks", "it is now equivalent to --ignore-preflight-errors=all")
// Note: All flags that are not bound to the cfg object should be whitelisted in cmd/kubeadm/app/apis/kubeadm/validation/validation.go
flagSet.BoolVar(
skipTokenPrint, "skip-token-print", *skipTokenPrint, skipTokenPrint, "skip-token-print", *skipTokenPrint,
"Skip printing of the default bootstrap token generated by 'kubeadm init'.", "Skip printing of the default bootstrap token generated by 'kubeadm init'.",
) )
......
cmd/kubeadm/app/cmd/join.go
View file @ 9e204fe7
...@@ -120,7 +120,6 @@ func NewCmdJoin(out io.Writer) *cobra.Command { ...@@ -120,7 +120,6 @@ func NewCmdJoin(out io.Writer) *cobra.Command {
cfg := &kubeadmapiv1alpha3.JoinConfiguration{} cfg := &kubeadmapiv1alpha3.JoinConfiguration{}
kubeadmscheme.Scheme.Default(cfg) kubeadmscheme.Scheme.Default(cfg)
var skipPreFlight bool
var cfgPath string var cfgPath string
var featureGatesString string var featureGatesString string
var ignorePreflightErrors []string var ignorePreflightErrors []string
...@@ -130,20 +129,20 @@ func NewCmdJoin(out io.Writer) *cobra.Command { ...@@ -130,20 +129,20 @@ func NewCmdJoin(out io.Writer) *cobra.Command {
Short: "Run this on any machine you wish to join an existing cluster", Short: "Run this on any machine you wish to join an existing cluster",
Long: joinLongDescription, Long: joinLongDescription,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
j, err := NewValidJoin(cmd.PersistentFlags(), cfg, args, skipPreFlight, cfgPath, featureGatesString, ignorePreflightErrors) j, err := NewValidJoin(cmd.PersistentFlags(), cfg, args, cfgPath, featureGatesString, ignorePreflightErrors)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
kubeadmutil.CheckErr(j.Run(out)) kubeadmutil.CheckErr(j.Run(out))
}, },
} }
AddJoinConfigFlags(cmd.PersistentFlags(), cfg, &featureGatesString) AddJoinConfigFlags(cmd.PersistentFlags(), cfg, &featureGatesString)
AddJoinOtherFlags(cmd.PersistentFlags(), &cfgPath, &skipPreFlight, &ignorePreflightErrors) AddJoinOtherFlags(cmd.PersistentFlags(), &cfgPath, &ignorePreflightErrors)
return cmd return cmd
} }
// NewValidJoin validates the command line that are passed to the cobra command // NewValidJoin validates the command line that are passed to the cobra command
func NewValidJoin(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.JoinConfiguration, args []string, skipPreFlight bool, cfgPath, featureGatesString string, ignorePreflightErrors []string) (*Join, error) { func NewValidJoin(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.JoinConfiguration, args []string, cfgPath, featureGatesString string, ignorePreflightErrors []string) (*Join, error) {
cfg.DiscoveryTokenAPIServers = args cfg.DiscoveryTokenAPIServers = args
var err error var err error
...@@ -155,7 +154,7 @@ func NewValidJoin(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.JoinConfigurati ...@@ -155,7 +154,7 @@ func NewValidJoin(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.JoinConfigurati
return nil, err return nil, err
} }
ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors, skipPreFlight) ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -197,7 +196,7 @@ func AddJoinConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.JoinConfi ...@@ -197,7 +196,7 @@ func AddJoinConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.JoinConfi
} }
// AddJoinOtherFlags adds join flags that are not bound to a configuration file to the given flagset // AddJoinOtherFlags adds join flags that are not bound to a configuration file to the given flagset
func AddJoinOtherFlags(flagSet *flag.FlagSet, cfgPath *string, skipPreFlight *bool, ignorePreflightErrors *[]string) { func AddJoinOtherFlags(flagSet *flag.FlagSet, cfgPath *string, ignorePreflightErrors *[]string) {
flagSet.StringVar( flagSet.StringVar(
cfgPath, "config", *cfgPath, cfgPath, "config", *cfgPath,
"Path to kubeadm config file.") "Path to kubeadm config file.")
...@@ -206,11 +205,6 @@ func AddJoinOtherFlags(flagSet *flag.FlagSet, cfgPath *string, skipPreFlight *bo ...@@ -206,11 +205,6 @@ func AddJoinOtherFlags(flagSet *flag.FlagSet, cfgPath *string, skipPreFlight *bo
ignorePreflightErrors, "ignore-preflight-errors", *ignorePreflightErrors, ignorePreflightErrors, "ignore-preflight-errors", *ignorePreflightErrors,
"A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.", "A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.",
) )
flagSet.BoolVar(
skipPreFlight, "skip-preflight-checks", false,
"Skip preflight checks which normally run before modifying the system.",
)
flagSet.MarkDeprecated("skip-preflight-checks", "it is now equivalent to --ignore-preflight-errors=all")
} }
// Join defines struct used by kubeadm join command // Join defines struct used by kubeadm join command
......
cmd/kubeadm/app/cmd/join_test.go
View file @ 9e204fe7
...@@ -163,7 +163,7 @@ func TestNewValidJoin(t *testing.T) { ...@@ -163,7 +163,7 @@ func TestNewValidJoin(t *testing.T) {
} }
} }
join, err := NewValidJoin(cmd.PersistentFlags(), cfg, tc.args, tc.skipPreFlight, tc.cfgPath, tc.featureGatesString, tc.ignorePreflightErrors) join, err := NewValidJoin(cmd.PersistentFlags(), cfg, tc.args, tc.cfgPath, tc.featureGatesString, tc.ignorePreflightErrors)
if tc.nodeConfig != nil { if tc.nodeConfig != nil {
join.cfg = tc.nodeConfig join.cfg = tc.nodeConfig
......
cmd/kubeadm/app/cmd/reset.go
View file @ 9e204fe7
...@@ -42,7 +42,6 @@ import ( ...@@ -42,7 +42,6 @@ import (
// NewCmdReset returns the "kubeadm reset" command // NewCmdReset returns the "kubeadm reset" command
func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command { func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
var skipPreFlight bool
var certsDir string var certsDir string
var criSocketPath string var criSocketPath string
var ignorePreflightErrors []string var ignorePreflightErrors []string
...@@ -52,7 +51,7 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command { ...@@ -52,7 +51,7 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
Use: "reset", Use: "reset",
Short: "Run this to revert any changes made to this host by 'kubeadm init' or 'kubeadm join'.", Short: "Run this to revert any changes made to this host by 'kubeadm init' or 'kubeadm join'.",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors, skipPreFlight) ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
r, err := NewReset(in, ignorePreflightErrorsSet, forceReset, certsDir, criSocketPath) r, err := NewReset(in, ignorePreflightErrorsSet, forceReset, certsDir, criSocketPath)
...@@ -65,11 +64,6 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command { ...@@ -65,11 +64,6 @@ func NewCmdReset(in io.Reader, out io.Writer) *cobra.Command {
&ignorePreflightErrors, "ignore-preflight-errors", ignorePreflightErrors, &ignorePreflightErrors, "ignore-preflight-errors", ignorePreflightErrors,
"A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.", "A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.",
) )
cmd.PersistentFlags().BoolVar(
&skipPreFlight, "skip-preflight-checks", false,
"Skip preflight checks which normally run before modifying the system.",
)
cmd.PersistentFlags().MarkDeprecated("skip-preflight-checks", "it is now equivalent to --ignore-preflight-errors=all")
cmd.PersistentFlags().StringVar( cmd.PersistentFlags().StringVar(
&certsDir, "cert-dir", kubeadmapiv1alpha3.DefaultCertificatesDir, &certsDir, "cert-dir", kubeadmapiv1alpha3.DefaultCertificatesDir,
......
cmd/kubeadm/app/cmd/reset_test.go
View file @ 9e204fe7
...@@ -57,15 +57,14 @@ func TestNewReset(t *testing.T) { ...@@ -57,15 +57,14 @@ func TestNewReset(t *testing.T) {
var in io.Reader var in io.Reader
certsDir := kubeadmapiv1alpha3.DefaultCertificatesDir certsDir := kubeadmapiv1alpha3.DefaultCertificatesDir
criSocketPath := kubeadmapiv1alpha3.DefaultCRISocket criSocketPath := kubeadmapiv1alpha3.DefaultCRISocket
skipPreFlight := false
forceReset := true forceReset := true
ignorePreflightErrors := []string{"all"} ignorePreflightErrors := []string{"all"}
ignorePreflightErrorsSet, _ := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors, skipPreFlight) ignorePreflightErrorsSet, _ := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors)
NewReset(in, ignorePreflightErrorsSet, forceReset, certsDir, criSocketPath) NewReset(in, ignorePreflightErrorsSet, forceReset, certsDir, criSocketPath)
ignorePreflightErrors = []string{} ignorePreflightErrors = []string{}
ignorePreflightErrorsSet, _ = validation.ValidateIgnorePreflightErrors(ignorePreflightErrors, skipPreFlight) ignorePreflightErrorsSet, _ = validation.ValidateIgnorePreflightErrors(ignorePreflightErrors)
NewReset(in, ignorePreflightErrorsSet, forceReset, certsDir, criSocketPath) NewReset(in, ignorePreflightErrorsSet, forceReset, certsDir, criSocketPath)
} }
......
cmd/kubeadm/app/cmd/upgrade/apply.go
View file @ 9e204fe7
...@@ -79,7 +79,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command { ...@@ -79,7 +79,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command {
Short: "Upgrade your Kubernetes cluster to the specified version.", Short: "Upgrade your Kubernetes cluster to the specified version.",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
var err error var err error
flags.ignorePreflightErrorsSet, err = validation.ValidateIgnorePreflightErrors(flags.ignorePreflightErrors, flags.skipPreFlight) flags.ignorePreflightErrorsSet, err = validation.ValidateIgnorePreflightErrors(flags.ignorePreflightErrors)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
// Ensure the user is root // Ensure the user is root
......
cmd/kubeadm/app/cmd/upgrade/plan.go
View file @ 9e204fe7
...@@ -54,7 +54,7 @@ func NewCmdPlan(apf *applyPlanFlags) *cobra.Command { ...@@ -54,7 +54,7 @@ func NewCmdPlan(apf *applyPlanFlags) *cobra.Command {
Short: "Check which versions are available to upgrade to and validate whether your current cluster is upgradeable. To skip the internet check, pass in the optional [version] parameter.", Short: "Check which versions are available to upgrade to and validate whether your current cluster is upgradeable. To skip the internet check, pass in the optional [version] parameter.",
Run: func(_ *cobra.Command, args []string) { Run: func(_ *cobra.Command, args []string) {
var err error var err error
flags.ignorePreflightErrorsSet, err = validation.ValidateIgnorePreflightErrors(flags.ignorePreflightErrors, flags.skipPreFlight) flags.ignorePreflightErrorsSet, err = validation.ValidateIgnorePreflightErrors(flags.ignorePreflightErrors)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
// Ensure the user is root // Ensure the user is root
err = runPreflightChecks(flags.ignorePreflightErrorsSet) err = runPreflightChecks(flags.ignorePreflightErrorsSet)
......
cmd/kubeadm/app/cmd/upgrade/upgrade.go
View file @ 9e204fe7
...@@ -37,7 +37,6 @@ type applyPlanFlags struct { ...@@ -37,7 +37,6 @@ type applyPlanFlags struct {
allowExperimentalUpgrades bool allowExperimentalUpgrades bool
allowRCUpgrades bool allowRCUpgrades bool
printConfig bool printConfig bool
skipPreFlight bool
ignorePreflightErrors []string ignorePreflightErrors []string
ignorePreflightErrorsSet sets.String ignorePreflightErrorsSet sets.String
out io.Writer out io.Writer
...@@ -52,7 +51,6 @@ func NewCmdUpgrade(out io.Writer) *cobra.Command { ...@@ -52,7 +51,6 @@ func NewCmdUpgrade(out io.Writer) *cobra.Command {
allowExperimentalUpgrades: false, allowExperimentalUpgrades: false,
allowRCUpgrades: false, allowRCUpgrades: false,
printConfig: false, printConfig: false,
skipPreFlight: false,
ignorePreflightErrorsSet: sets.NewString(), ignorePreflightErrorsSet: sets.NewString(),
out: out, out: out,
} }
...@@ -78,7 +76,6 @@ func addApplyPlanFlags(fs *pflag.FlagSet, flags *applyPlanFlags) { ...@@ -78,7 +76,6 @@ func addApplyPlanFlags(fs *pflag.FlagSet, flags *applyPlanFlags) {
fs.BoolVar(&flags.allowRCUpgrades, "allow-release-candidate-upgrades", flags.allowRCUpgrades, "Show release candidate versions of Kubernetes as an upgrade alternative and allow upgrading to a release candidate versions of Kubernetes.") fs.BoolVar(&flags.allowRCUpgrades, "allow-release-candidate-upgrades", flags.allowRCUpgrades, "Show release candidate versions of Kubernetes as an upgrade alternative and allow upgrading to a release candidate versions of Kubernetes.")
fs.BoolVar(&flags.printConfig, "print-config", flags.printConfig, "Specifies whether the configuration file that will be used in the upgrade should be printed or not.") fs.BoolVar(&flags.printConfig, "print-config", flags.printConfig, "Specifies whether the configuration file that will be used in the upgrade should be printed or not.")
fs.StringSliceVar(&flags.ignorePreflightErrors, "ignore-preflight-errors", flags.ignorePreflightErrors, "A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.") fs.StringSliceVar(&flags.ignorePreflightErrors, "ignore-preflight-errors", flags.ignorePreflightErrors, "A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.")
fs.BoolVar(&flags.skipPreFlight, "skip-preflight-checks", flags.skipPreFlight, "Skip preflight checks that normally run before modifying the system.")
fs.MarkDeprecated("skip-preflight-checks", "it is now equivalent to --ignore-preflight-errors=all") fs.MarkDeprecated("skip-preflight-checks", "it is now equivalent to --ignore-preflight-errors=all")
fs.StringVar(&flags.featureGatesString, "feature-gates", flags.featureGatesString, "A set of key=value pairs that describe feature gates for various features."+ fs.StringVar(&flags.featureGatesString, "feature-gates", flags.featureGatesString, "A set of key=value pairs that describe feature gates for various features."+
"Options are:\n"+strings.Join(features.KnownFeatures(&features.InitFeatureGates), "\n")) "Options are:\n"+strings.Join(features.KnownFeatures(&features.InitFeatureGates), "\n"))
......
cmd/kubeadm/test/cmd/join_test.go
View file @ 9e204fe7
...@@ -39,7 +39,7 @@ func TestCmdJoinConfig(t *testing.T) { ...@@ -39,7 +39,7 @@ func TestCmdJoinConfig(t *testing.T) {
} }
for _, rt := range initTest { for _, rt := range initTest {
_, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--skip-preflight-checks") _, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--ignore-preflight-errors=all")
if (actual == nil) != rt.expected { if (actual == nil) != rt.expected {
t.Errorf( t.Errorf(
"failed CmdJoinConfig running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t", "failed CmdJoinConfig running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t",
...@@ -68,7 +68,7 @@ func TestCmdJoinDiscoveryFile(t *testing.T) { ...@@ -68,7 +68,7 @@ func TestCmdJoinDiscoveryFile(t *testing.T) {
} }
for _, rt := range initTest { for _, rt := range initTest {
_, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--skip-preflight-checks") _, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--ignore-preflight-errors=all")
if (actual == nil) != rt.expected { if (actual == nil) != rt.expected {
t.Errorf( t.Errorf(
"failed CmdJoinDiscoveryFile running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t", "failed CmdJoinDiscoveryFile running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t",
...@@ -97,7 +97,7 @@ func TestCmdJoinDiscoveryToken(t *testing.T) { ...@@ -97,7 +97,7 @@ func TestCmdJoinDiscoveryToken(t *testing.T) {
} }
for _, rt := range initTest { for _, rt := range initTest {
_, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--skip-preflight-checks") _, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--ignore-preflight-errors=all")
if (actual == nil) != rt.expected { if (actual == nil) != rt.expected {
t.Errorf( t.Errorf(
"failed CmdJoinDiscoveryToken running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t", "failed CmdJoinDiscoveryToken running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t",
...@@ -125,7 +125,7 @@ func TestCmdJoinNodeName(t *testing.T) { ...@@ -125,7 +125,7 @@ func TestCmdJoinNodeName(t *testing.T) {
} }
for _, rt := range initTest { for _, rt := range initTest {
_, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--skip-preflight-checks") _, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--ignore-preflight-errors=all")
if (actual == nil) != rt.expected { if (actual == nil) != rt.expected {
t.Errorf( t.Errorf(
"failed CmdJoinNodeName running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t", "failed CmdJoinNodeName running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t",
...@@ -154,7 +154,7 @@ func TestCmdJoinTLSBootstrapToken(t *testing.T) { ...@@ -154,7 +154,7 @@ func TestCmdJoinTLSBootstrapToken(t *testing.T) {
} }
for _, rt := range initTest { for _, rt := range initTest {
_, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--skip-preflight-checks") _, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--ignore-preflight-errors=all")
if (actual == nil) != rt.expected { if (actual == nil) != rt.expected {
t.Errorf( t.Errorf(
"failed CmdJoinTLSBootstrapToken running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t", "failed CmdJoinTLSBootstrapToken running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t",
...@@ -183,7 +183,7 @@ func TestCmdJoinToken(t *testing.T) { ...@@ -183,7 +183,7 @@ func TestCmdJoinToken(t *testing.T) {
} }
for _, rt := range initTest { for _, rt := range initTest {
_, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--skip-preflight-checks") _, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--ignore-preflight-errors=all")
if (actual == nil) != rt.expected { if (actual == nil) != rt.expected {
t.Errorf( t.Errorf(
"failed CmdJoinToken running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t", "failed CmdJoinToken running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t",
...@@ -212,7 +212,7 @@ func TestCmdJoinBadArgs(t *testing.T) { ...@@ -212,7 +212,7 @@ func TestCmdJoinBadArgs(t *testing.T) {
} }
for _, rt := range initTest { for _, rt := range initTest {
_, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--skip-preflight-checks") _, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--ignore-preflight-errors=all")
if (actual == nil) != rt.expected { if (actual == nil) != rt.expected {
t.Errorf( t.Errorf(
"failed CmdJoinBadArgs 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t", "failed CmdJoinBadArgs 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t",
...@@ -240,7 +240,7 @@ func TestCmdJoinArgsMixed(t *testing.T) { ...@@ -240,7 +240,7 @@ func TestCmdJoinArgsMixed(t *testing.T) {
} }
for _, rt := range initTest { for _, rt := range initTest {
_, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--skip-preflight-checks") _, _, actual := RunCmd(*kubeadmPath, "join", rt.args, "--ignore-preflight-errors=all")
if (actual == nil) != rt.expected { if (actual == nil) != rt.expected {
t.Errorf( t.Errorf(
"failed CmdJoinArgsMixed running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t", "failed CmdJoinArgsMixed running 'kubeadm join %s' with an error: %v\n\texpected: %t\n\t actual: %t",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment