mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #98008 from RA489/min_support_ver
kubeadm: Update versions for 1.21
This commit is contained in:
commit
7791bbe978
@ -54,7 +54,7 @@ func generateTestKubeadmConfig(dir, id, certDir, clusterName string) (string, er
|
||||
},
|
||||
CertificatesDir: certDir,
|
||||
ClusterName: clusterName,
|
||||
KubernetesVersion: "v1.19.0",
|
||||
KubernetesVersion: kubeadmconstants.MinimumControlPlaneVersion.String(),
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
|
@ -330,7 +330,7 @@ func TestRunGenCSR(t *testing.T) {
|
||||
ServiceSubnet: "192.0.2.0/24",
|
||||
},
|
||||
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
|
||||
// auto-detection of config values at runtime.
|
||||
const kubeadmConfig = `
|
||||
var kubeadmConfig = `
|
||||
apiVersion: kubeadm.k8s.io/v1beta2
|
||||
kind: InitConfiguration
|
||||
localAPIEndpoint:
|
||||
@ -389,8 +389,7 @@ nodeRegistration:
|
||||
apiVersion: kubeadm.k8s.io/v1beta2
|
||||
kind: ClusterConfiguration
|
||||
certificatesDir: /custom/config/certificates-dir
|
||||
kubernetesVersion: v1.19.0
|
||||
`
|
||||
kubernetesVersion: ` + kubeadmconstants.MinimumControlPlaneVersion.String()
|
||||
|
||||
tmpDir := testutil.SetupTempDir(t)
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
@ -453,13 +453,13 @@ var (
|
||||
ControlPlaneComponents = []string{KubeAPIServer, KubeControllerManager, KubeScheduler}
|
||||
|
||||
// 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 = version.MustParseSemantic("v1.19.0")
|
||||
MinimumKubeletVersion = version.MustParseSemantic("v1.20.0")
|
||||
|
||||
// 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 = map[uint8]string{
|
||||
@ -472,6 +472,7 @@ var (
|
||||
19: "3.4.13-0",
|
||||
20: "3.4.13-0",
|
||||
21: "3.4.13-0",
|
||||
22: "3.4.13-0",
|
||||
}
|
||||
|
||||
// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows
|
||||
|
Loading…
Reference in New Issue
Block a user