github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #64177 from stewart-yu/stewart-kubeadconfigimage

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

add missing flag for command

**What this PR does / why we need it**:
add missing flag for `kubeadm config images pull` command

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:
/assign @luxas 
/cc @chuckha 

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-05-23 10:07:13 -07:00 committed by GitHub
commit 65a819338a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/kubeadm/app/cmd/config.go
View File

@ -274,7 +274,7 @@ func uploadConfiguration(client clientset.Interface, cfgPath string, defaultcfg
return uploadconfig.UploadConfiguration(internalcfg, client) return uploadconfig.UploadConfiguration(internalcfg, client)
} }
// NewCmdConfigImages returns the "config images" command // NewCmdConfigImages returns the "kubeadm config images" command
func NewCmdConfigImages(out io.Writer) *cobra.Command { func NewCmdConfigImages(out io.Writer) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "images", Use: "images",
@ -286,12 +286,13 @@ func NewCmdConfigImages(out io.Writer) *cobra.Command {
return cmd return cmd
} }
// NewCmdConfigImagesPull returns the `config images pull` command // NewCmdConfigImagesPull returns the `kubeadm config images pull` command
func NewCmdConfigImagesPull() *cobra.Command { func NewCmdConfigImagesPull() *cobra.Command {
cfg := &kubeadmapiv1alpha2.MasterConfiguration{} cfg := &kubeadmapiv1alpha2.MasterConfiguration{}
kubeadmscheme.Scheme.Default(cfg) kubeadmscheme.Scheme.Default(cfg)
var cfgPath, featureGatesString string var cfgPath, featureGatesString string
var err error var err error
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "pull", Use: "pull",
Short: "Pull images used by kubeadm.", Short: "Pull images used by kubeadm.",
@ -306,7 +307,9 @@ func NewCmdConfigImagesPull() *cobra.Command {
kubeadmutil.CheckErr(imagesPull.PullAll()) kubeadmutil.CheckErr(imagesPull.PullAll())
}, },
} }
AddImagesCommonConfigFlags(cmd.PersistentFlags(), cfg, &featureGatesString) AddImagesCommonConfigFlags(cmd.PersistentFlags(), cfg, &cfgPath, &featureGatesString)
AddImagesPullFlags(cmd.PersistentFlags(), cfg)
return cmd return cmd
} }
@ -316,7 +319,7 @@ type ImagesPull struct {
images []string images []string
} }
// NewImagesPull initializes and returns the `config images pull` command // NewImagesPull initializes and returns the `kubeadm config images pull` command
func NewImagesPull(puller images.Puller, images []string) *ImagesPull { func NewImagesPull(puller images.Puller, images []string) *ImagesPull {
return &ImagesPull{ return &ImagesPull{
puller: puller, puller: puller,
@ -353,8 +356,7 @@ func NewCmdConfigImagesList(out io.Writer) *cobra.Command {
kubeadmutil.CheckErr(imagesList.Run(out)) kubeadmutil.CheckErr(imagesList.Run(out))
}, },
} }
AddImagesCommonConfigFlags(cmd.PersistentFlags(), cfg, &featureGatesString) AddImagesCommonConfigFlags(cmd.PersistentFlags(), cfg, &cfgPath, &featureGatesString)
AddImagesListFlags(cmd.PersistentFlags(), &cfgPath)
return cmd return cmd
} }
@ -387,21 +389,17 @@ func (i *ImagesList) Run(out io.Writer) error {
} }
// AddImagesCommonConfigFlags adds the flags that configure kubeadm (and affect the images kubeadm will use) // AddImagesCommonConfigFlags adds the flags that configure kubeadm (and affect the images kubeadm will use)
func AddImagesCommonConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha2.MasterConfiguration, featureGatesString *string) { func AddImagesCommonConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha2.MasterConfiguration, cfgPath *string, featureGatesString *string) {
flagSet.StringVar( flagSet.StringVar(
&cfg.KubernetesVersion, "kubernetes-version", cfg.KubernetesVersion, &cfg.KubernetesVersion, "kubernetes-version", cfg.KubernetesVersion,
`Choose a specific Kubernetes version for the control plane.`, `Choose a specific Kubernetes version for the control plane.`,
) )
flagSet.StringVar(featureGatesString, "feature-gates", *featureGatesString, "A set of key=value pairs that describe feature gates for various features. "+ flagSet.StringVar(featureGatesString, "feature-gates", *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"))
}
// AddImagesListFlags adds the flag that defines the location of the config file
func AddImagesListFlags(flagSet *flag.FlagSet, cfgPath *string) {
flagSet.StringVar(cfgPath, "config", *cfgPath, "Path to kubeadm config file.") flagSet.StringVar(cfgPath, "config", *cfgPath, "Path to kubeadm config file.")
} }
// AddImagesPullFlags adds flags related to the `config images pull` command // AddImagesPullFlags adds flags related to the `kubeadm config images pull` command
func AddImagesPullFlags(flagSet *flag.FlagSet, criSocketPath *string) { func AddImagesPullFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha2.MasterConfiguration) {
flagSet.StringVar(criSocketPath, "cri-socket-path", *criSocketPath, "Path to the CRI socket.") flagSet.StringVar(&cfg.CRISocket, "cri-socket-path", cfg.CRISocket, "Path to the CRI socket.")
} }