Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kubeadm: Update versions for 1.21 #98008

Merged
merged 2 commits into from Jan 15, 2021
Merged

kubeadm: Update versions for 1.21 #98008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
546b0a7
kubeadm: Update versions for 1.21
Jan 13, 2021
fe91902
kubeadm: Update versions for 1.21
Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions cmd/kubeadm/app/cmd/certs_test.go
View file
Open in desktop
Expand Up @@ -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(),
},
},
}
Expand Down Expand Up @@ -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:
Expand All @@ -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)
Expand Down
7 changes: 4 additions & 3 deletions cmd/kubeadm/app/constants/constants.go
View file
Open in desktop
Expand Up @@ -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{
Expand All @@ -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
Expand Down