github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98008 from RA489/min_support_ver

Browse Source 
kubeadm: Update versions for 1.21
This commit is contained in:
Kubernetes Prow Robot 2021-01-15 14:50:04 -08:00 committed by GitHub
commit 7791bbe978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go
View File

@ -54,7 +54,7 @@ func generateTestKubeadmConfig(dir, id, certDir, clusterName string) (string, er
}, },
CertificatesDir: certDir, CertificatesDir: certDir,
ClusterName: clusterName, ClusterName: clusterName,
KubernetesVersion: "v1.19.0", KubernetesVersion: kubeadmconstants.MinimumControlPlaneVersion.String(),
} }
var buf bytes.Buffer var buf bytes.Buffer

7
cmd/kubeadm/app/cmd/certs_test.go
View File

@ -330,7 +330,7 @@ func TestRunGenCSR(t *testing.T) {
ServiceSubnet: "192.0.2.0/24", ServiceSubnet: "192.0.2.0/24",
}, },
CertificatesDir: certDir, CertificatesDir: certDir,
KubernetesVersion: "v1.19.0", KubernetesVersion: kubeadmconstants.MinimumControlPlaneVersion.String(),
}, },
}, },
} }
@ -378,7 +378,7 @@ func TestGenCSRConfig(t *testing.T) {
// A minimal kubeadm config with just enough values to avoid triggering // A minimal kubeadm config with just enough values to avoid triggering
// auto-detection of config values at runtime. // auto-detection of config values at runtime.
const kubeadmConfig = ` var kubeadmConfig = `
apiVersion: kubeadm.k8s.io/v1beta2 apiVersion: kubeadm.k8s.io/v1beta2
kind: InitConfiguration kind: InitConfiguration
localAPIEndpoint: localAPIEndpoint:
@ -389,8 +389,7 @@ nodeRegistration:
apiVersion: kubeadm.k8s.io/v1beta2 apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
certificatesDir: /custom/config/certificates-dir certificatesDir: /custom/config/certificates-dir
kubernetesVersion: v1.19.0 kubernetesVersion: ` + kubeadmconstants.MinimumControlPlaneVersion.String()
`
tmpDir := testutil.SetupTempDir(t) tmpDir := testutil.SetupTempDir(t)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)

7
cmd/kubeadm/app/constants/constants.go
View File

@ -453,13 +453,13 @@ var (
ControlPlaneComponents = []string{KubeAPIServer, KubeControllerManager, KubeScheduler} ControlPlaneComponents = []string{KubeAPIServer, KubeControllerManager, KubeScheduler}
// MinimumControlPlaneVersion specifies the minimum control plane version kubeadm can deploy // MinimumControlPlaneVersion specifies the minimum control plane version kubeadm can deploy
MinimumControlPlaneVersion = version.MustParseSemantic("v1.19.0") MinimumControlPlaneVersion = version.MustParseSemantic("v1.20.0")
// MinimumKubeletVersion specifies the minimum version of kubelet which kubeadm supports // MinimumKubeletVersion specifies the minimum version of kubelet which kubeadm supports
MinimumKubeletVersion = version.MustParseSemantic("v1.19.0") MinimumKubeletVersion = version.MustParseSemantic("v1.20.0")
// CurrentKubernetesVersion specifies current Kubernetes version supported by kubeadm // CurrentKubernetesVersion specifies current Kubernetes version supported by kubeadm
CurrentKubernetesVersion = version.MustParseSemantic("v1.20.0") CurrentKubernetesVersion = version.MustParseSemantic("v1.21.0")
// SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases // SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases
SupportedEtcdVersion = map[uint8]string{ SupportedEtcdVersion = map[uint8]string{
@ -472,6 +472,7 @@ var (
19: "3.4.13-0", 19: "3.4.13-0",
20: "3.4.13-0", 20: "3.4.13-0",
21: "3.4.13-0", 21: "3.4.13-0",
22: "3.4.13-0",
} }
// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows