mirror of https://github.com/k3s-io/k3s
remove-kubeadm-alpha-preflight
fabriziopandini
parent
9d6ebf6c78
commit
7333cc79d6
|
|
@ -7,7 +7,6 @@ go_library(
|
||||||
"certs.go",
|
"certs.go",
|
||||||
"kubeconfig.go",
|
"kubeconfig.go",
|
||||||
"kubelet.go",
|
"kubelet.go",
|
||||||
"preflight.go",
|
|
||||||
"selfhosting.go",
|
"selfhosting.go",
|
||||||
],
|
],
|
||||||
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha",
|
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha",
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@ func NewCmdAlpha(in io.Reader, out io.Writer) *cobra.Command {
|
||||||
cmd.AddCommand(newCmdCertsUtility())
|
cmd.AddCommand(newCmdCertsUtility())
|
||||||
cmd.AddCommand(newCmdKubeletUtility())
|
cmd.AddCommand(newCmdKubeletUtility())
|
||||||
cmd.AddCommand(newCmdKubeConfigUtility(out))
|
cmd.AddCommand(newCmdKubeConfigUtility(out))
|
||||||
cmd.AddCommand(newCmdPreFlightUtility())
|
|
||||||
cmd.AddCommand(NewCmdSelfhosting(in))
|
cmd.AddCommand(NewCmdSelfhosting(in))
|
||||||
|
|
||||||
// TODO: This command should be removed as soon as the kubeadm init phase refactoring is completed.
|
// TODO: This command should be removed as soon as the kubeadm init phase refactoring is completed.
|
||||||
|
|
|
||||||
|
|
@ -1,103 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright 2018 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package alpha
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme"
|
|
||||||
kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1"
|
|
||||||
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation"
|
|
||||||
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/options"
|
|
||||||
cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util"
|
|
||||||
"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
|
|
||||||
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
|
|
||||||
configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config"
|
|
||||||
"k8s.io/kubernetes/pkg/util/normalizer"
|
|
||||||
utilsexec "k8s.io/utils/exec"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
nodePreflightLongDesc = normalizer.LongDesc(`
|
|
||||||
Run node pre-flight checks, functionally equivalent to what implemented by kubeadm join.
|
|
||||||
` + cmdutil.AlphaDisclaimer)
|
|
||||||
|
|
||||||
nodePreflightExample = normalizer.Examples(`
|
|
||||||
# Run node pre-flight checks.
|
|
||||||
kubeadm alpha preflight node
|
|
||||||
`)
|
|
||||||
|
|
||||||
errorMissingConfigFlag = errors.New("the --config flag is mandatory")
|
|
||||||
)
|
|
||||||
|
|
||||||
// newCmdPreFlightUtility calls cobra.Command for preflight checks
|
|
||||||
func newCmdPreFlightUtility() *cobra.Command {
|
|
||||||
cmd := &cobra.Command{
|
|
||||||
Use: "preflight",
|
|
||||||
Short: "Commands related to pre-flight checks",
|
|
||||||
Long: cmdutil.MacroCommandLongDescription,
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd.AddCommand(newCmdPreFlightNode())
|
|
||||||
|
|
||||||
return cmd
|
|
||||||
}
|
|
||||||
|
|
||||||
// newCmdPreFlightNode calls cobra.Command for node preflight checks
|
|
||||||
func newCmdPreFlightNode() *cobra.Command {
|
|
||||||
var cfgPath string
|
|
||||||
var ignorePreflightErrors []string
|
|
||||||
|
|
||||||
cmd := &cobra.Command{
|
|
||||||
Use: "node",
|
|
||||||
Short: "Run node pre-flight checks",
|
|
||||||
Long: nodePreflightLongDesc,
|
|
||||||
Example: nodePreflightExample,
|
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
|
||||||
if len(cfgPath) == 0 {
|
|
||||||
kubeadmutil.CheckErr(errorMissingConfigFlag)
|
|
||||||
}
|
|
||||||
ignorePreflightErrorsSet, err := validation.ValidateIgnorePreflightErrors(ignorePreflightErrors)
|
|
||||||
kubeadmutil.CheckErr(err)
|
|
||||||
|
|
||||||
cfg := &kubeadmapiv1beta1.JoinConfiguration{}
|
|
||||||
kubeadmscheme.Scheme.Default(cfg)
|
|
||||||
|
|
||||||
internalcfg, err := configutil.JoinConfigFileAndDefaultsToInternalConfig(cfgPath, cfg)
|
|
||||||
kubeadmutil.CheckErr(err)
|
|
||||||
|
|
||||||
if internalcfg.ControlPlane != nil {
|
|
||||||
err = configutil.VerifyAPIServerBindAddress(internalcfg.ControlPlane.LocalAPIEndpoint.AdvertiseAddress)
|
|
||||||
kubeadmutil.CheckErr(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Println("[preflight] running pre-flight checks")
|
|
||||||
|
|
||||||
err = preflight.RunJoinNodeChecks(utilsexec.New(), internalcfg, ignorePreflightErrorsSet)
|
|
||||||
kubeadmutil.CheckErr(err)
|
|
||||||
|
|
||||||
fmt.Println("[preflight] pre-flight checks passed")
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
options.AddConfigFlag(cmd.PersistentFlags(), &cfgPath)
|
|
||||||
options.AddIgnorePreflightErrorsFlag(cmd.PersistentFlags(), &ignorePreflightErrors)
|
|
||||||
|
|
||||||
return cmd
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue