fix bootstrapToken (#737)

install/constants.go

@@ -53,7 +53,6 @@ Add InitConfiguration.patches.directory, JoinConfiguration.patches.directory to
 Move the BootstrapToken∗ API and related utilities out of the "kubeadm" API group to a new group "bootstraptoken". The kubeadm API version v1beta3 no longer contains the BootstrapToken∗ structures.
 
 */
-	Bootstraptokenv1 = "bootstraptoken/v1"
 )
 
 const (
@@ -65,11 +64,7 @@ const (
 		JoinConfigurationDefault +
 		kubeletConfigDefault)
 
-	bootstrapTokenDefault = `{{- if eq .BootstrapApi "bootstraptoken/v1" }}
-apiVersion: {{.BootstrapApi}}
-  {{- else}}
-apiVersion: {{.KubeadmApi}}
-{{- end}}
+	bootstrapTokenDefault = `apiVersion: {{.KubeadmApi}}
 caCertPath: /etc/kubernetes/pki/ca.crt
 discovery:
   bootstrapToken:

install/generator.go

@@ -24,11 +24,9 @@ func setKubeadmApi(version string) {
 	case major >= 123:
 		KubeadmApi = KubeadmV1beta3
 		CriSocket = DefaultContainerdCRISocket
-		BootstrapApi = Bootstraptokenv1
 	default:
 		KubeadmApi = KubeadmV1beta3
 		CriSocket = DefaultContainerdCRISocket
-		BootstrapApi = Bootstraptokenv1
 	}
 	logger.Debug("KubeadmApi: %s", KubeadmApi)
 	logger.Debug("CriSocket: %s", CriSocket)
@@ -94,7 +92,6 @@ func JoinTemplateFromTemplateContent(templateContent, ip, cgroup string) []byte
 	envMap["VIP"] = VIP
 	envMap["KubeadmApi"] = KubeadmApi
 	envMap["CriSocket"] = CriSocket
-	envMap["BootstrapApi"] = BootstrapApi
 	envMap["CgroupDriver"] = cgroup
 	var buffer bytes.Buffer
 	_ = tmpl.Execute(&buffer, envMap)

install/vars.go

@@ -32,7 +32,6 @@ var (
 	CriSocket    string
 	CgroupDriver string
 	KubeadmApi   string
-	BootstrapApi string
 
 	VIP     string
 	PkgUrl  string