Unconditionally renew certificates when upgrading the cluster (#990)

* Unconditionally renew certificates when upgrading the cluster * Update test fixtures
kubermatic · Jul 17, 2020 · eee277a · eee277a
1 parent de94e58
commit eee277a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pkg/scripts/kubeadm_test.go b/pkg/scripts/kubeadm_test.go
@@ -261,7 +261,7 @@ func TestKubeadmUpgradeLeader(t *testing.T) {
 			name: "v1beta2",
 			args: args{
 				workdir:    "test-wd",
-				kubeadmCmd: "kubeadm upgrade node",
+				kubeadmCmd: "kubeadm upgrade node --certificate-renewal=true",
 			},
 		},
 	}

diff --git a/pkg/scripts/testdata/TestKubeadmUpgradeLeader-v1beta2.golden b/pkg/scripts/testdata/TestKubeadmUpgradeLeader-v1beta2.golden
@@ -1,4 +1,4 @@
 set -xeu pipefail
 export "PATH=$PATH:/sbin:/usr/local/bin:/opt/bin"
 
-sudo kubeadm upgrade node --config=test-wd/cfg/master_0.yaml
+sudo kubeadm upgrade node --certificate-renewal=true --config=test-wd/cfg/master_0.yaml
diff --git a/pkg/templates/kubeadm/kubeadm.go b/pkg/templates/kubeadm/kubeadm.go
@@ -25,7 +25,7 @@ import (
 )
 
 const (
-	kubeadmUpgradeNodeCommand = "kubeadm upgrade node"
+	kubeadmUpgradeNodeCommand = "kubeadm upgrade node --certificate-renewal=true"
 )
 
 var (

diff --git a/pkg/templates/kubeadm/kubeadmv1beta2.go b/pkg/templates/kubeadm/kubeadmv1beta2.go
@@ -48,7 +48,7 @@ func (*kubeadmv1beta2) ConfigWorker(s *state.State, instance kubeoneapi.HostConf
 }
 
 func (k *kubeadmv1beta2) UpgradeLeaderCommand() string {
-	return fmt.Sprintf("kubeadm upgrade apply -y %s", k.version)
+	return fmt.Sprintf("kubeadm upgrade apply -y --certificate-renewal=true %s", k.version)
 }
 
 func (*kubeadmv1beta2) UpgradeFollowerCommand() string {
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ import ( @@
     )
     const (
-    	kubeadmUpgradeNodeCommand = "kubeadm upgrade node"
+    	kubeadmUpgradeNodeCommand = "kubeadm upgrade node --certificate-renewal=true"
     )
     var (
@@ Expand Down @@