add JoinCPTemplateTextV1beate2Container when version >=1.20

Signed-off-by: oldthreefeng <[email protected]>
MrYangyt · Dec 21, 2020 · 90d4f4a · 90d4f4a
1 parent e62345c
commit 90d4f4a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/install/constants.go b/install/constants.go
@@ -89,6 +89,23 @@ ipvs:
   excludeCIDRs:
   - "{{.VIP}}/32"`)
 
+const JoinCPTemplateTextV1beate2Container = string(`apiVersion: kubeadm.k8s.io/v1beta2	
+caCertPath: /etc/kubernetes/pki/ca.crt
+discovery:
+  bootstrapToken:
+    apiServerEndpoint: {{.Master0}}:6443
+    token: {{.TokenDiscovery}}
+    caCertHashes:
+    - {{.TokenDiscoveryCAHash}}
+  timeout: 5m0s
+kind: JoinConfiguration
+controlPlane:
+  localAPIEndpoint:
+    advertiseAddress: {{.Master}}
+    bindPort: 6443
+nodeRegistration:
+  criSocket: /run/containerd/containerd.sock`)
+
 const JoinCPTemplateTextV1beta2 = string(`apiVersion: kubeadm.k8s.io/v1beta2
 caCertPath: /etc/kubernetes/pki/ca.crt
 discovery:

diff --git a/install/generator.go b/install/generator.go
@@ -24,7 +24,11 @@ func Config() {
 
 func joinKubeadmConfig() string {
 	var sb strings.Builder
-	sb.Write([]byte(JoinCPTemplateTextV1beta2))
+	if For120(Version) {
+		sb.Write([]byte(JoinCPTemplateTextV1beate2Container))
+	} else {
+		sb.Write([]byte(JoinCPTemplateTextV1beta2))
+	}
 	return sb.String()
 }