Merge pull request #70354 from yagonobre/kubeadm-init-addon

cmd/kubeadm/app/cmd/BUILD

@@ -36,8 +36,6 @@ go_library(
         "//cmd/kubeadm/app/discovery:go_default_library",
         "//cmd/kubeadm/app/features:go_default_library",
         "//cmd/kubeadm/app/images:go_default_library",
-        "//cmd/kubeadm/app/phases/addons/dns:go_default_library",
-        "//cmd/kubeadm/app/phases/addons/proxy:go_default_library",
         "//cmd/kubeadm/app/phases/bootstraptoken/node:go_default_library",
         "//cmd/kubeadm/app/phases/certs:go_default_library",
         "//cmd/kubeadm/app/phases/controlplane:go_default_library",

cmd/kubeadm/app/cmd/alpha/alpha.go

@@ -20,7 +20,6 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases"
 	cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util"
 )
 
@@ -52,7 +51,5 @@ func newCmdPhase(out io.Writer) *cobra.Command {
 		Long:  cmdutil.MacroCommandLongDescription,
 	}
 
-	cmd.AddCommand(phases.NewCmdAddon())
-
 	return cmd
 }

cmd/kubeadm/app/cmd/init.go

@@ -31,7 +31,6 @@ import (
 	flag "github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
-	"k8s.io/klog"
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
 	kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme"
 	kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1"
@@ -42,12 +41,8 @@ import (
 	cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util"
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/kubernetes/cmd/kubeadm/app/features"
-	dnsaddonphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns"
-	proxyaddonphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/proxy"
 	certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs"
 	kubeconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig"
-	kubeletphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubelet"
-	uploadconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/uploadconfig"
 	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient"
 	configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config"
@@ -146,11 +141,6 @@ func NewCmdInit(out io.Writer) *cobra.Command {
 			err = initRunner.Run()
 			kubeadmutil.CheckErr(err)
 
-			// TODO: the code in runInit should be progressively converted in phases; each phase will be exposed
-			// via the subcommands automatically created by initRunner.BindToCommand
-			err = runInit(&data, out)
-			kubeadmutil.CheckErr(err)
-
 			err = showJoinCommand(&data, out)
 			kubeadmutil.CheckErr(err)
 		},
@@ -166,6 +156,7 @@ func NewCmdInit(out io.Writer) *cobra.Command {
 	// 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.SetPhaseSubcommandsAdditionalFlags(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)
@@ -182,6 +173,7 @@ func NewCmdInit(out io.Writer) *cobra.Command {
 	initRunner.AppendPhase(phases.NewUploadConfigPhase())
 	initRunner.AppendPhase(phases.NewMarkControlPlanePhase())
 	initRunner.AppendPhase(phases.NewBootstrapTokenPhase())
+	initRunner.AppendPhase(phases.NewAddonPhase())
 	// TODO: add other phases to the runner.
 
 	// sets the data builder function, that will be used by the runner
@@ -460,57 +452,6 @@ func (d initData) Tokens() []string {
 	return tokens
 }
 
-// runInit executes master node provisioning
-func runInit(i *initData, out io.Writer) error {
-	// Get directories to write files to; can be faked if we're dry-running
-	klog.V(1).Infof("[init] Getting certificates directory from configuration")
-	certsDirToWriteTo, _, _, _, err := getDirectoriesToUse(i.dryRun, i.dryRunDir, i.cfg.CertificatesDir)
-	if err != nil {
-		return errors.Wrap(err, "error getting directories to use")
-	}
-
-	// certsDirToWriteTo is gonna equal cfg.CertificatesDir in the normal case, but gonna be a temp directory if dryrunning
-	i.cfg.CertificatesDir = certsDirToWriteTo
-
-	// TODO: client and waiter are temporary until the rest of the phases that use them
-	// are removed from this function.
-	client, err := i.Client()
-	if err != nil {
-		return errors.Wrap(err, "failed to create client")
-	}
-
-	// Upload currently used configuration to the cluster
-	// Note: This is done right in the beginning of cluster initialization; as we might want to make other phases
-	// depend on centralized information from this source in the future
-	klog.V(1).Infof("[init] uploading currently used configuration to the cluster")
-	if err := uploadconfigphase.UploadConfiguration(i.cfg, client); err != nil {
-		return errors.Wrap(err, "error uploading configuration")
-	}
-
-	klog.V(1).Infof("[init] creating kubelet configuration configmap")
-	if err := kubeletphase.CreateConfigMap(i.cfg, client); err != nil {
-		return errors.Wrap(err, "error creating kubelet configuration ConfigMap")
-	}
-
-	klog.V(1).Infof("[init] ensuring DNS addon")
-	if err := dnsaddonphase.EnsureDNSAddon(i.cfg, client); err != nil {
-		return errors.Wrap(err, "error ensuring dns addon")
-	}
-
-	klog.V(1).Infof("[init] ensuring proxy addon")
-	if err := proxyaddonphase.EnsureProxyAddon(i.cfg, client); err != nil {
-		return errors.Wrap(err, "error ensuring proxy addon")
-	}
-
-	// Exit earlier if we're dryrunning
-	if i.dryRun {
-		fmt.Println("[dryrun] finished dry-running successfully. Above are the resources that would be created")
-		return nil
-	}
-
-	return nil
-}
-
 func printJoinCommand(out io.Writer, adminKubeConfigPath, token string, skipTokenPrint bool) error {
 	joinCommand, err := cmdutil.GetJoinCommand(adminKubeConfigPath, token, skipTokenPrint)
 	if err != nil {

cmd/kubeadm/app/cmd/options/constant.go

@@ -46,6 +46,9 @@ const FeatureGatesString = "feature-gates"
 // IgnorePreflightErrors sets the path a list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.
 const IgnorePreflightErrors = "ignore-preflight-errors"
 
+// ImageRepository sets the container registry to pull control plane images from.
+const ImageRepository = "image-repository"
+
 // KubeconfigDir flag sets the path where to save the kubeconfig file.
 const KubeconfigDir = "kubeconfig-dir"
 

cmd/kubeadm/app/cmd/options/generic.go

@@ -50,3 +50,8 @@ func AddControlPlanExtraArgsFlags(fs *pflag.FlagSet, apiServerExtraArgs, control
 	fs.Var(utilflag.NewMapStringString(controllerManagerExtraArgs), ControllerManagerExtraArgs, "A set of extra flags to pass to the Controller Manager or override default ones in form of <flagname>=<value>")
 	fs.Var(utilflag.NewMapStringString(schedulerExtraArgs), SchedulerExtraArgs, "A set of extra flags to pass to the Scheduler or override default ones in form of <flagname>=<value>")
 }
+
+// AddImageMetaFlags adds the --image-repository flag to the given flagset
+func AddImageMetaFlags(fs *pflag.FlagSet, imageRepository *string) {
+	fs.StringVar(imageRepository, ImageRepository, *imageRepository, "Choose a container registry to pull control plane images from")
+}

cmd/kubeadm/app/cmd/phases/BUILD

@@ -27,7 +27,6 @@ go_library(
         "//cmd/kubeadm/app/cmd/phases/workflow:go_default_library",
         "//cmd/kubeadm/app/cmd/util:go_default_library",
         "//cmd/kubeadm/app/constants:go_default_library",
-        "//cmd/kubeadm/app/features:go_default_library",
         "//cmd/kubeadm/app/phases/addons/dns:go_default_library",
         "//cmd/kubeadm/app/phases/addons/proxy:go_default_library",
         "//cmd/kubeadm/app/phases/bootstraptoken/clusterinfo:go_default_library",
@@ -45,7 +44,6 @@ go_library(
         "//cmd/kubeadm/app/util/apiclient:go_default_library",
         "//cmd/kubeadm/app/util/config:go_default_library",
         "//cmd/kubeadm/app/util/dryrun:go_default_library",
-        "//cmd/kubeadm/app/util/kubeconfig:go_default_library",
         "//pkg/util/normalizer:go_default_library",
         "//pkg/version:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -61,14 +59,10 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = [
-        "addons_test.go",
-        "util_test.go",
-    ],
+    srcs = ["util_test.go"],
     embed = [":go_default_library"],
     deps = [
         "//cmd/kubeadm/app/apis/kubeadm/v1beta1:go_default_library",
-        "//cmd/kubeadm/test/cmd:go_default_library",
         "//pkg/version:go_default_library",
     ],
 )

cmd/kubeadm/app/cmd/phases/addons_test.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 phases
-
-import (
-	"testing"
-
-	cmdtestutil "k8s.io/kubernetes/cmd/kubeadm/test/cmd"
-)
-
-func TestAddonsSubCommandsHasFlags(t *testing.T) {
-
-	subCmds := getAddonsSubCommands()
-
-	commonFlags := []string{
-		"kubeconfig",
-		"config",
-		"kubernetes-version",
-		"image-repository",
-	}
-
-	var tests = []struct {
-		command         string
-		additionalFlags []string
-	}{
-		{
-			command: "all",
-			additionalFlags: []string{
-				"apiserver-advertise-address",
-				"apiserver-bind-port",
-				"pod-network-cidr",
-				"service-dns-domain",
-				"service-cidr",
-			},
-		},
-		{
-			command: "kube-proxy",
-			additionalFlags: []string{
-				"apiserver-advertise-address",
-				"apiserver-bind-port",
-				"pod-network-cidr",
-			},
-		},
-		{
-			command: "coredns",
-			additionalFlags: []string{
-				"service-dns-domain",
-				"service-cidr",
-			},
-		},
-	}
-
-	for _, test := range tests {
-		expectedFlags := append(commonFlags, test.additionalFlags...)
-		cmdtestutil.AssertSubCommandHasFlags(t, subCmds, test.command, expectedFlags...)
-	}
-}

docs/.generated_docs

@@ -22,11 +22,6 @@ docs/admin/kubeadm_alpha_kubelet.md
 docs/admin/kubeadm_alpha_kubelet_config.md
 docs/admin/kubeadm_alpha_kubelet_config_download.md
 docs/admin/kubeadm_alpha_kubelet_config_enable-dynamic.md
-docs/admin/kubeadm_alpha_phase.md
-docs/admin/kubeadm_alpha_phase_addon.md
-docs/admin/kubeadm_alpha_phase_addon_all.md
-docs/admin/kubeadm_alpha_phase_addon_coredns.md
-docs/admin/kubeadm_alpha_phase_addon_kube-proxy.md
 docs/admin/kubeadm_alpha_preflight.md
 docs/admin/kubeadm_alpha_preflight_node.md
 docs/admin/kubeadm_alpha_selfhosting.md
@@ -46,6 +41,9 @@ docs/admin/kubeadm_config_upload_from-flags.md
 docs/admin/kubeadm_config_view.md
 docs/admin/kubeadm_init.md
 docs/admin/kubeadm_init_phase.md
+docs/admin/kubeadm_init_phase_addon.md
+docs/admin/kubeadm_init_phase_addon_coredns.md
+docs/admin/kubeadm_init_phase_addon_kube-proxy.md
 docs/admin/kubeadm_init_phase_bootstrap-token.md
 docs/admin/kubeadm_init_phase_certs.md
 docs/admin/kubeadm_init_phase_certs_apiserver-etcd-client.md
@@ -113,10 +111,6 @@ docs/man/man1/kubeadm-alpha-kubelet-config-download.1
 docs/man/man1/kubeadm-alpha-kubelet-config-enable-dynamic.1
 docs/man/man1/kubeadm-alpha-kubelet-config.1
 docs/man/man1/kubeadm-alpha-kubelet.1
-docs/man/man1/kubeadm-alpha-phase-addon-all.1
-docs/man/man1/kubeadm-alpha-phase-addon-coredns.1
-docs/man/man1/kubeadm-alpha-phase-addon-kube-proxy.1
-docs/man/man1/kubeadm-alpha-phase-addon.1
 docs/man/man1/kubeadm-alpha-phase.1
 docs/man/man1/kubeadm-alpha-preflight-node.1
 docs/man/man1/kubeadm-alpha-preflight.1
@@ -137,6 +131,9 @@ docs/man/man1/kubeadm-config-upload-from-flags.1
 docs/man/man1/kubeadm-config-upload.1
 docs/man/man1/kubeadm-config-view.1
 docs/man/man1/kubeadm-config.1
+docs/man/man1/kubeadm-init-phase-addon-coredns.1
+docs/man/man1/kubeadm-init-phase-addon-kube-proxy.1
+docs/man/man1/kubeadm-init-phase-addon.1
 docs/man/man1/kubeadm-init-phase-bootstrap-token.1
 docs/man/man1/kubeadm-init-phase-certs-apiserver-etcd-client.1
 docs/man/man1/kubeadm-init-phase-certs-apiserver-kubelet-client.1

docs/man/man1/kubeadm-alpha-phase-addon-coredns.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/man/man1/kubeadm-alpha-phase-addon-kube-proxy.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/man/man1/kubeadm-alpha-phase-addon.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.