Merge pull request #106 from banzaicloud/remove-old-k8s-version

Remove deprecated k8s versions
banzaicloud · Jun 23, 2020 · 462671b · 462671b
2 parents e420d8f + 89be01a
commit 462671b
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 435 deletions.
diff --git a/cmd/pke/app/phases/kubeadm/controlplane/controlplane_test.go b/cmd/pke/app/phases/kubeadm/controlplane/controlplane_test.go
@@ -35,7 +35,7 @@ func TestWriteKubeadmConfig(t *testing.T) {
 		apiServerHostPort:               "192.168.64.11:6443",
 		kubeletCertificateAuthority:     "/etc/kubernetes/pki/ca.crt",
 		clusterName:                     "my-cluster",
-		kubernetesVersion:               "1.14.0",
+		kubernetesVersion:               "1.18.0",
 		serviceCIDR:                     "10.32.0.0/24",
 		podNetworkCIDR:                  "10.200.0.0/16",
 		cloudProvider:                   constants.CloudProviderAmazon,

diff --git a/cmd/pke/app/phases/kubeadm/controlplane/kubeadm.go b/cmd/pke/app/phases/kubeadm/controlplane/kubeadm.go
@@ -33,7 +33,6 @@ import (
 	"github.com/pbnjay/memory"
 )
 
-//go:generate templify -t ${GOTMPL} -p controlplane -f kubeadmConfigV1Alpha3 kubeadm_v1alpha3.yaml.tmpl
 //go:generate templify -t ${GOTMPL} -p controlplane -f kubeadmConfigV1Beta1 kubeadm_v1beta1.yaml.tmpl
 //go:generate templify -t ${GOTMPL} -p controlplane -f kubeadmConfigV1Beta2 kubeadm_v1beta2.yaml.tmpl
 
@@ -64,16 +63,10 @@ func (c ControlPlane) WriteKubeadmConfig(out io.Writer, filename string) error {
 	}
 
 	encryptionProviderPrefix := ""
-	if ver.LessThan(semver.MustParse("1.13.0")) {
-		encryptionProviderPrefix = "experimental-"
-	}
 
 	var conf string
 	switch ver.Minor() {
-	case 12, 13:
-		// see https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3
-		conf = kubeadmConfigV1Alpha3Template()
-	case 14, 15, 16, 17:
+	case 15, 16, 17:
 		// see https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1
 		conf = kubeadmConfigV1Beta1Template()
 	case 18:

diff --git a/cmd/pke/app/phases/kubeadm/controlplane/kubeadm_v1alpha3.yaml.go b/cmd/pke/app/phases/kubeadm/controlplane/kubeadm_v1alpha3.yaml.go
diff --git a/cmd/pke/app/phases/kubeadm/controlplane/kubeadm_v1alpha3.yaml.tmpl b/cmd/pke/app/phases/kubeadm/controlplane/kubeadm_v1alpha3.yaml.tmpl
diff --git a/cmd/pke/app/phases/kubeadm/node/kubeadm.go b/cmd/pke/app/phases/kubeadm/node/kubeadm.go
@@ -29,7 +29,6 @@ import (
 	"github.com/pbnjay/memory"
 )
 
-//go:generate templify -t ${GOTMPL} -p node -f kubeadmConfigV1Alpha3 kubeadm_v1alpha3.yaml.tmpl
 //go:generate templify -t ${GOTMPL} -p node -f kubeadmConfigV1Beta1 kubeadm_v1beta1.yaml.tmpl
 //go:generate templify -t ${GOTMPL} -p node -f kubeadmConfigV1Beta2 kubeadm_v1beta2.yaml.tmpl
 
@@ -61,10 +60,7 @@ func (n Node) writeKubeadmConfig(out io.Writer, filename string) error {
 
 	var conf string
 	switch ver.Minor() {
-	case 12, 13:
-		// see https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3
-		conf = kubeadmConfigV1Alpha3Template()
-	case 14, 15, 16, 17:
+	case 15, 16, 17:
 		// see https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1
 		conf = kubeadmConfigV1Beta1Template()
 	case 18: