f97770b175
In order to allow for a smoother UX with CRIs different than Docker, we have to make the --cri-socket command line flag optional when just one CRI is installed. This change does that by doing the following: - Introduce a new runtime function (DetectCRISocket) that will attempt to detect a CRI socket, or return an appropriate error. - Default to using the above function if --cri-socket is not specified and CRISocket in NodeRegistrationOptions is empty. - Stop static defaulting to DefaultCRISocket. And rename it to DefaultDockerCRISocket. Its use is now narrowed to "Docker or not" distinguishment and tests. - Introduce AddCRISocketFlag function that adds --cri-socket flag to a flagSet. Use that in all commands, that support --cri-socket. - Remove the deprecated --cri-socket-path flag from kubeadm config images pull and deprecate --cri-socket in kubeadm upgrade apply. Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
86 lines
3.2 KiB
Go
86 lines
3.2 KiB
Go
/*
|
|
Copyright 2017 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 util
|
|
|
|
import (
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/pflag"
|
|
|
|
"k8s.io/client-go/tools/clientcmd"
|
|
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/options"
|
|
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
|
)
|
|
|
|
// SubCmdRunE returns a function that handles a case where a subcommand must be specified
|
|
// Without this callback, if a user runs just the command without a subcommand,
|
|
// or with an invalid subcommand, cobra will print usage information, but still exit cleanly.
|
|
// We want to return an error code in these cases so that the
|
|
// user knows that their command was invalid.
|
|
func SubCmdRunE(name string) func(*cobra.Command, []string) error {
|
|
return func(_ *cobra.Command, args []string) error {
|
|
if len(args) < 1 {
|
|
return errors.Errorf("missing subcommand; %q is not meant to be run on its own", name)
|
|
}
|
|
|
|
return errors.Errorf("invalid subcommand: %q", args[0])
|
|
}
|
|
}
|
|
|
|
// ValidateExactArgNumber validates that the required top-level arguments are specified
|
|
func ValidateExactArgNumber(args []string, supportedArgs []string) error {
|
|
lenSupported := len(supportedArgs)
|
|
validArgs := 0
|
|
// Disregard possible "" arguments; they are invalid
|
|
for _, arg := range args {
|
|
if len(arg) > 0 {
|
|
validArgs++
|
|
}
|
|
// break early for too many arguments
|
|
if validArgs > lenSupported {
|
|
return errors.Errorf("too many arguments. Required arguments: %v", supportedArgs)
|
|
}
|
|
}
|
|
|
|
if validArgs < lenSupported {
|
|
return errors.Errorf("missing one or more required arguments. Required arguments: %v", supportedArgs)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// FindExistingKubeConfig returns the localtion of kubeconfig
|
|
func FindExistingKubeConfig(file string) string {
|
|
// The user did provide a --kubeconfig flag. Respect that and threat it as an
|
|
// explicit path without building a DefaultClientConfigLoadingRules object.
|
|
if file != kubeadmconstants.GetAdminKubeConfigPath() {
|
|
return file
|
|
}
|
|
// The user did not provide a --kubeconfig flag. Find a config in the standard
|
|
// locations using DefaultClientConfigLoadingRules, but also consider the default config path.
|
|
rules := clientcmd.NewDefaultClientConfigLoadingRules()
|
|
rules.Precedence = append(rules.Precedence, kubeadmconstants.GetAdminKubeConfigPath())
|
|
return rules.GetDefaultFilename()
|
|
}
|
|
|
|
// AddCRISocketFlag adds the cri-socket flag to the supplied flagSet
|
|
func AddCRISocketFlag(flagSet *pflag.FlagSet, criSocket *string) {
|
|
flagSet.StringVar(
|
|
criSocket, options.NodeCRISocket, *criSocket,
|
|
"Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this value; use this option only if you have more than one CRI installed or if you have non-standard CRI socket.",
|
|
)
|
|
}
|