From f3b5cb2145c3988cea03ee7fa3565acbe776e8ff Mon Sep 17 00:00:00 2001 From: fabriziopandini Date: Tue, 28 May 2019 22:16:03 +0200 Subject: [PATCH] rename-ha-flags --- .../app/apis/kubeadm/validation/validation.go | 1 + cmd/kubeadm/app/cmd/init.go | 7 ++++++- cmd/kubeadm/app/cmd/join.go | 5 +++++ cmd/kubeadm/app/cmd/options/constant.go | 12 ++++++++++-- cmd/kubeadm/app/cmd/phases/init/uploadcerts.go | 1 + cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go | 1 + .../app/cmd/phases/join/controlplaneprepare.go | 5 +++++ cmd/kubeadm/app/cmd/phases/join/preflight.go | 1 + 8 files changed, 30 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go index 37f62d026a..f1a30a2108 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go @@ -432,6 +432,7 @@ func isAllowedFlag(flagName string) bool { kubeadmcmdoptions.NodeCRISocket, kubeadmcmdoptions.KubeconfigDir, kubeadmcmdoptions.UploadCerts, + kubeadmcmdoptions.ExperimentalUploadCerts, kubeadmcmdoptions.CertificateKey, "print-join-command", "rootfs", "v") if knownFlags.Has(flagName) { diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index 8eb7467d45..6c37de8b40 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -69,7 +69,7 @@ var ( Please note that the certificate-key gives access to cluster sensitive data, keep it secret! As a safeguard, uploaded-certs will be deleted in two hours; If necessary, you can use - "kubeadm init phase upload-certs --experimental-upload-certs" to reload certs afterward. + "kubeadm init phase upload-certs --upload-certs" to reload certs afterward. {{else -}} You can now join any number of control-plane nodes by copying certificate authorities @@ -257,6 +257,11 @@ func AddInitOtherFlags(flagSet *flag.FlagSet, initOptions *initOptions) { &initOptions.uploadCerts, options.UploadCerts, initOptions.uploadCerts, "Upload control-plane certificates to the kubeadm-certs Secret.", ) + flagSet.BoolVar( + &initOptions.uploadCerts, options.ExperimentalUploadCerts, initOptions.uploadCerts, + "Upload control-plane certificates to the kubeadm-certs Secret.", + ) + flagSet.MarkDeprecated(options.ExperimentalUploadCerts, fmt.Sprintf("use --%s instead", options.UploadCerts)) flagSet.BoolVar( &initOptions.skipCertificateKeyPrint, options.SkipCertificateKeyPrint, initOptions.skipCertificateKeyPrint, "Don't print the key used to encrypt the control-plane certificates.", diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index a6ee510892..7dc5cb4d49 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -275,6 +275,11 @@ func addJoinOtherFlags(flagSet *flag.FlagSet, joinOptions *joinOptions) { &joinOptions.controlPlane, options.ControlPlane, joinOptions.controlPlane, "Create a new control plane instance on this node", ) + flagSet.BoolVar( + &joinOptions.controlPlane, options.ExperimentalControlPlane, joinOptions.controlPlane, + "Create a new control plane instance on this node", + ) + flagSet.MarkDeprecated(options.ExperimentalUploadCerts, fmt.Sprintf("use --%s instead", options.ControlPlane)) } // newJoinOptions returns a struct ready for being used for creating cmd join flags. diff --git a/cmd/kubeadm/app/cmd/options/constant.go b/cmd/kubeadm/app/cmd/options/constant.go index 72bab51859..2833aa895b 100644 --- a/cmd/kubeadm/app/cmd/options/constant.go +++ b/cmd/kubeadm/app/cmd/options/constant.go @@ -117,10 +117,18 @@ const ( FileDiscovery = "discovery-file" // ControlPlane flag instruct kubeadm to create a new control plane instance on this node - ControlPlane = "experimental-control-plane" + ControlPlane = "control-plane" // UploadCerts flag instruct kubeadm to upload certificates - UploadCerts = "experimental-upload-certs" + UploadCerts = "upload-certs" + + // ExperimentalControlPlane flag instruct kubeadm to create a new control plane instance on this node + // TODO: this flag should be removed in 1.16 cycle + ExperimentalControlPlane = "experimental-control-plane" + + // ExperimentalUploadCerts flag instruct kubeadm to upload certificates + // TODO: this flag should be removed in 1.16 cycle + ExperimentalUploadCerts = "experimental-upload-certs" // CertificateKey flag sets the key used to encrypt and decrypt certificate secrets CertificateKey = "certificate-key" diff --git a/cmd/kubeadm/app/cmd/phases/init/uploadcerts.go b/cmd/kubeadm/app/cmd/phases/init/uploadcerts.go index f62815a446..62b245ca28 100644 --- a/cmd/kubeadm/app/cmd/phases/init/uploadcerts.go +++ b/cmd/kubeadm/app/cmd/phases/init/uploadcerts.go @@ -38,6 +38,7 @@ func NewUploadCertsPhase() workflow.Phase { InheritFlags: []string{ options.CfgPath, options.UploadCerts, + options.ExperimentalUploadCerts, options.CertificateKey, options.SkipCertificateKeyPrint, }, diff --git a/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go b/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go index 8071f0596c..57f5bed1f6 100644 --- a/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go +++ b/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go @@ -40,6 +40,7 @@ func getControlPlaneJoinPhaseFlags(name string) []string { flags := []string{ options.CfgPath, options.ControlPlane, + options.ExperimentalControlPlane, options.NodeName, } if name != "mark-control-plane" { diff --git a/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go b/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go index 4ece87efe6..674c55dfb1 100644 --- a/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go +++ b/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go @@ -70,6 +70,7 @@ func getControlPlanePreparePhaseFlags(name string) []string { options.APIServerBindPort, options.CfgPath, options.ControlPlane, + options.ExperimentalControlPlane, options.NodeName, options.FileDiscovery, options.TokenDiscovery, @@ -83,6 +84,7 @@ func getControlPlanePreparePhaseFlags(name string) []string { flags = []string{ options.CfgPath, options.ControlPlane, + options.ExperimentalControlPlane, options.FileDiscovery, options.TokenDiscovery, options.TokenDiscoveryCAHash, @@ -96,6 +98,7 @@ func getControlPlanePreparePhaseFlags(name string) []string { options.APIServerAdvertiseAddress, options.CfgPath, options.ControlPlane, + options.ExperimentalControlPlane, options.NodeName, options.FileDiscovery, options.TokenDiscovery, @@ -108,6 +111,7 @@ func getControlPlanePreparePhaseFlags(name string) []string { flags = []string{ options.CfgPath, options.ControlPlane, + options.ExperimentalControlPlane, options.FileDiscovery, options.TokenDiscovery, options.TokenDiscoveryCAHash, @@ -122,6 +126,7 @@ func getControlPlanePreparePhaseFlags(name string) []string { options.APIServerBindPort, options.CfgPath, options.ControlPlane, + options.ExperimentalControlPlane, } default: flags = []string{} diff --git a/cmd/kubeadm/app/cmd/phases/join/preflight.go b/cmd/kubeadm/app/cmd/phases/join/preflight.go index d00b1fe627..9bf47b2f1e 100644 --- a/cmd/kubeadm/app/cmd/phases/join/preflight.go +++ b/cmd/kubeadm/app/cmd/phases/join/preflight.go @@ -65,6 +65,7 @@ func NewPreflightPhase() workflow.Phase { options.TLSBootstrapToken, options.TokenStr, options.ControlPlane, + options.ExperimentalControlPlane, options.APIServerAdvertiseAddress, options.APIServerBindPort, options.NodeCRISocket,