From 79dd60e20133ec4d4b7d46bc74176ac1b33ac86e Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 5 Oct 2019 19:10:53 +0300 Subject: [PATCH 1/2] kubeadm: use CertificateRenewal constant for "upgrade apply" --- cmd/kubeadm/app/cmd/upgrade/apply.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/cmd/upgrade/apply.go b/cmd/kubeadm/app/cmd/upgrade/apply.go index 6f178ea8bf4..79f33b33e8e 100644 --- a/cmd/kubeadm/app/cmd/upgrade/apply.go +++ b/cmd/kubeadm/app/cmd/upgrade/apply.go @@ -90,7 +90,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command { cmd.Flags().BoolVarP(&flags.force, "force", "f", flags.force, "Force upgrading although some requirements might not be met. This also implies non-interactive mode.") cmd.Flags().BoolVar(&flags.dryRun, options.DryRun, flags.dryRun, "Do not change any state, just output what actions would be performed.") cmd.Flags().BoolVar(&flags.etcdUpgrade, "etcd-upgrade", flags.etcdUpgrade, "Perform the upgrade of etcd.") - cmd.Flags().BoolVar(&flags.renewCerts, "certificate-renewal", flags.renewCerts, "Perform the renewal of certificates used by component changed during upgrades.") + cmd.Flags().BoolVar(&flags.renewCerts, options.CertificateRenewal, flags.renewCerts, "Perform the renewal of certificates used by component changed during upgrades.") cmd.Flags().DurationVar(&flags.imagePullTimeout, "image-pull-timeout", flags.imagePullTimeout, "The maximum amount of time to wait for the control plane pods to be downloaded.") options.AddKustomizePodsFlag(cmd.Flags(), &flags.kustomizeDir) From 218e9a5f77f722959b1249c2cccfa977d4e3743e Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 5 Oct 2019 19:13:57 +0300 Subject: [PATCH 2/2] kubeadm: renew certificates on "upgrade node" by default --- cmd/kubeadm/app/cmd/upgrade/node.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/kubeadm/app/cmd/upgrade/node.go b/cmd/kubeadm/app/cmd/upgrade/node.go index 57419938ba8..fe13d0a8d28 100644 --- a/cmd/kubeadm/app/cmd/upgrade/node.go +++ b/cmd/kubeadm/app/cmd/upgrade/node.go @@ -106,6 +106,7 @@ func newNodeOptions() *nodeOptions { return &nodeOptions{ kubeConfigPath: constants.GetKubeletKubeConfigPath(), dryRun: false, + renewCerts: true, } }