From a666003b362dc8984d4bcd285f938f1be4959308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Fri, 16 Nov 2018 23:52:56 +0800 Subject: [PATCH] kubeadm: Allow customizing the image repository via flags --- cmd/kubeadm/app/cmd/init.go | 2 +- cmd/kubeadm/app/cmd/phases/controlplane.go | 1 + cmd/kubeadm/app/cmd/phases/etcd.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index ba40ca46e6..3b4a6444cf 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -152,11 +152,11 @@ func NewCmdInit(out io.Writer) *cobra.Command { AddInitOtherFlags(cmd.Flags(), &initOptions.cfgPath, &initOptions.skipTokenPrint, &initOptions.dryRun, &initOptions.ignorePreflightErrors) initOptions.bto.AddTokenFlag(cmd.Flags()) initOptions.bto.AddTTLFlag(cmd.Flags()) + options.AddImageMetaFlags(cmd.Flags(), &initOptions.externalcfg.ImageRepository) // defines additional flag that are not used by the init command but that could be eventually used // by the sub-commands automatically generated for phases initRunner.SetAdditionalFlags(func(flags *flag.FlagSet) { - options.AddImageMetaFlags(flags, &initOptions.externalcfg.ImageRepository) options.AddKubeConfigFlag(flags, &initOptions.kubeconfigPath) options.AddKubeConfigDirFlag(flags, &initOptions.kubeconfigDir) options.AddControlPlanExtraArgsFlags(flags, &initOptions.externalcfg.APIServer.ExtraArgs, &initOptions.externalcfg.ControllerManager.ExtraArgs, &initOptions.externalcfg.Scheduler.ExtraArgs) diff --git a/cmd/kubeadm/app/cmd/phases/controlplane.go b/cmd/kubeadm/app/cmd/phases/controlplane.go index 7960e5c84c..818be79cb2 100644 --- a/cmd/kubeadm/app/cmd/phases/controlplane.go +++ b/cmd/kubeadm/app/cmd/phases/controlplane.go @@ -98,6 +98,7 @@ func getControlPlanePhaseFlags(name string) []string { options.CfgPath, options.CertificatesDir, options.KubernetesVersion, + options.ImageRepository, } if name == "all" || name == kubeadmconstants.KubeAPIServer { flags = append(flags, diff --git a/cmd/kubeadm/app/cmd/phases/etcd.go b/cmd/kubeadm/app/cmd/phases/etcd.go index 85a82c54be..80c6619c9a 100644 --- a/cmd/kubeadm/app/cmd/phases/etcd.go +++ b/cmd/kubeadm/app/cmd/phases/etcd.go @@ -74,6 +74,7 @@ func getEtcdPhaseFlags() []string { flags := []string{ options.CertificatesDir, options.CfgPath, + options.ImageRepository, } return flags }