github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #57233 from xiangpengzhao/kubeadm-support-version

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 57287, 57233, 57305). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update kubeadm's minimum supported kubernetes to 1.9.

**What this PR does / why we need it**:
Update it in 1.10 cycle.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:
/cc @kubernetes/sig-cluster-lifecycle-pr-reviews

**Release note**:

```release-note
Update kubeadm's minimum supported Kubernetes version in v1.10.x to v1.9.0
```
This commit is contained in:
Kubernetes Submit Queue 2017-12-18 02:19:33 -08:00 committed by GitHub
commit a6891528a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/phases/certs_test.go
View File

@ -34,7 +34,7 @@ import (
) )
// phaseTestK8sVersion is a fake kubernetes version to use when testing // phaseTestK8sVersion is a fake kubernetes version to use when testing
const phaseTestK8sVersion = "v1.8.0" const phaseTestK8sVersion = "v1.9.0"
func TestCertsSubCommandsHasFlags(t *testing.T) { func TestCertsSubCommandsHasFlags(t *testing.T) {

8
cmd/kubeadm/app/cmd/phases/controlplane_test.go
View File

@ -93,7 +93,7 @@ func TestControlPlaneCreateFilesWithFlags(t *testing.T) {
{ {
command: "all", command: "all",
additionalFlags: []string{ additionalFlags: []string{
"--kubernetes-version=v1.8.0", "--kubernetes-version=v1.9.0",
"--apiserver-advertise-address=1.2.3.4", "--apiserver-advertise-address=1.2.3.4",
"--apiserver-bind-port=6443", "--apiserver-bind-port=6443",
"--service-cidr=1.2.3.4/16", "--service-cidr=1.2.3.4/16",
@ -108,7 +108,7 @@ func TestControlPlaneCreateFilesWithFlags(t *testing.T) {
{ {
command: "apiserver", command: "apiserver",
additionalFlags: []string{ additionalFlags: []string{
"--kubernetes-version=v1.8.0", "--kubernetes-version=v1.9.0",
"--apiserver-advertise-address=1.2.3.4", "--apiserver-advertise-address=1.2.3.4",
"--apiserver-bind-port=6443", "--apiserver-bind-port=6443",
"--service-cidr=1.2.3.4/16", "--service-cidr=1.2.3.4/16",
@ -118,7 +118,7 @@ func TestControlPlaneCreateFilesWithFlags(t *testing.T) {
{ {
command: "controller-manager", command: "controller-manager",
additionalFlags: []string{ additionalFlags: []string{
"--kubernetes-version=v1.8.0", "--kubernetes-version=v1.9.0",
"--pod-network-cidr=1.2.3.4/16", "--pod-network-cidr=1.2.3.4/16",
}, },
expectedFiles: []string{"kube-controller-manager.yaml"}, expectedFiles: []string{"kube-controller-manager.yaml"},
@ -126,7 +126,7 @@ func TestControlPlaneCreateFilesWithFlags(t *testing.T) {
{ {
command: "scheduler", command: "scheduler",
additionalFlags: []string{ additionalFlags: []string{
"--kubernetes-version=v1.8.0", "--kubernetes-version=v1.9.0",
}, },
expectedFiles: []string{"kube-scheduler.yaml"}, expectedFiles: []string{"kube-scheduler.yaml"},
}, },

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

@ -226,10 +226,10 @@ var (
MasterComponents = []string{KubeAPIServer, KubeControllerManager, KubeScheduler} MasterComponents = []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.8.0") MinimumControlPlaneVersion = version.MustParseSemantic("v1.9.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.8.0") MinimumKubeletVersion = version.MustParseSemantic("v1.9.0")
// MinimumKubeProxyComponentConfigVersion specifies the minimum version for the kubeProxyComponent // MinimumKubeProxyComponentConfigVersion specifies the minimum version for the kubeProxyComponent
MinimumKubeProxyComponentConfigVersion = version.MustParseSemantic("v1.9.0-alpha.3") MinimumKubeProxyComponentConfigVersion = version.MustParseSemantic("v1.9.0-alpha.3")

124
cmd/kubeadm/app/phases/upgrade/policy_test.go
View File

@ -32,135 +32,135 @@ func TestEnforceVersionPolicies(t *testing.T) {
}{ }{
{ // everything ok { // everything ok
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.8.5", kubeadmVersion: "v1.9.5",
}, },
newK8sVersion: "v1.8.5", newK8sVersion: "v1.9.5",
}, },
{ // everything ok { // everything ok
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.2", kubeletVersion: "v1.9.2",
kubeadmVersion: "v1.9.1", kubeadmVersion: "v1.10.1",
}, },
newK8sVersion: "v1.9.0", newK8sVersion: "v1.10.0",
}, },
{ // downgrades ok { // downgrades ok
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.8.3", kubeadmVersion: "v1.9.3",
}, },
newK8sVersion: "v1.8.2", newK8sVersion: "v1.9.2",
}, },
{ // upgrades without bumping the version number ok { // upgrades without bumping the version number ok
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.8.3", kubeadmVersion: "v1.9.3",
}, },
newK8sVersion: "v1.8.3", newK8sVersion: "v1.9.3",
}, },
{ // new version must be higher than v1.8.0 { // new version must be higher than v1.9.0
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.8.3", kubeadmVersion: "v1.9.3",
}, },
newK8sVersion: "v1.7.10", newK8sVersion: "v1.8.10",
expectedMandatoryErrs: 1, // version must be higher than v1.8.0 expectedMandatoryErrs: 1, // version must be higher than v1.9.0
}, },
{ // upgrading two minor versions in one go is not supported { // upgrading two minor versions in one go is not supported
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.10.0", kubeadmVersion: "v1.11.0",
}, },
newK8sVersion: "v1.10.0", newK8sVersion: "v1.11.0",
expectedMandatoryErrs: 1, // can't upgrade two minor versions expectedMandatoryErrs: 1, // can't upgrade two minor versions
expectedSkippableErrs: 1, // kubelet <-> apiserver skew too large expectedSkippableErrs: 1, // kubelet <-> apiserver skew too large
}, },
{ // downgrading two minor versions in one go is not supported { // downgrading two minor versions in one go is not supported
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.10.3", clusterVersion: "v1.11.3",
kubeletVersion: "v1.10.3", kubeletVersion: "v1.11.3",
kubeadmVersion: "v1.10.0", kubeadmVersion: "v1.11.0",
}, },
newK8sVersion: "v1.8.3", newK8sVersion: "v1.9.3",
expectedMandatoryErrs: 1, // can't downgrade two minor versions expectedMandatoryErrs: 1, // can't downgrade two minor versions
}, },
{ // kubeadm version must be higher than the new kube version. However, patch version skews may be forced { // kubeadm version must be higher than the new kube version. However, patch version skews may be forced
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.8.3", kubeadmVersion: "v1.9.3",
}, },
newK8sVersion: "v1.8.5", newK8sVersion: "v1.9.5",
expectedSkippableErrs: 1, expectedSkippableErrs: 1,
}, },
{ // kubeadm version must be higher than the new kube version. Trying to upgrade k8s to a higher minor version than kubeadm itself should never be supported { // kubeadm version must be higher than the new kube version. Trying to upgrade k8s to a higher minor version than kubeadm itself should never be supported
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.8.3", kubeadmVersion: "v1.9.3",
}, },
newK8sVersion: "v1.9.0", newK8sVersion: "v1.10.0",
expectedMandatoryErrs: 1, expectedMandatoryErrs: 1,
}, },
{ // the maximum skew between the cluster version and the kubelet versions should be one minor version. This may be forced through though. { // the maximum skew between the cluster version and the kubelet versions should be one minor version. This may be forced through though.
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.7.8", kubeletVersion: "v1.8.8",
kubeadmVersion: "v1.9.0", kubeadmVersion: "v1.10.0",
}, },
newK8sVersion: "v1.9.0", newK8sVersion: "v1.10.0",
expectedSkippableErrs: 1, expectedSkippableErrs: 1,
}, },
{ // experimental upgrades supported if the flag is set { // experimental upgrades supported if the flag is set
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.9.0-beta.1", kubeadmVersion: "v1.10.0-beta.1",
}, },
newK8sVersion: "v1.9.0-beta.1", newK8sVersion: "v1.10.0-beta.1",
allowExperimental: true, allowExperimental: true,
}, },
{ // release candidate upgrades supported if the flag is set { // release candidate upgrades supported if the flag is set
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.9.0-rc.1", kubeadmVersion: "v1.10.0-rc.1",
}, },
newK8sVersion: "v1.9.0-rc.1", newK8sVersion: "v1.10.0-rc.1",
allowRCs: true, allowRCs: true,
}, },
{ // release candidate upgrades supported if the flag is set { // release candidate upgrades supported if the flag is set
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.9.0-rc.1", kubeadmVersion: "v1.10.0-rc.1",
}, },
newK8sVersion: "v1.9.0-rc.1", newK8sVersion: "v1.10.0-rc.1",
allowExperimental: true, allowExperimental: true,
}, },
{ // the user should not be able to upgrade to an experimental version if they haven't opted into that { // the user should not be able to upgrade to an experimental version if they haven't opted into that
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.9.0-beta.1", kubeadmVersion: "v1.10.0-beta.1",
}, },
newK8sVersion: "v1.9.0-beta.1", newK8sVersion: "v1.10.0-beta.1",
allowRCs: true, allowRCs: true,
expectedSkippableErrs: 1, expectedSkippableErrs: 1,
}, },
{ // the user should not be able to upgrade to an release candidate version if they haven't opted into that { // the user should not be able to upgrade to an release candidate version if they haven't opted into that
vg: &fakeVersionGetter{ vg: &fakeVersionGetter{
clusterVersion: "v1.8.3", clusterVersion: "v1.9.3",
kubeletVersion: "v1.8.3", kubeletVersion: "v1.9.3",
kubeadmVersion: "v1.9.0-rc.1", kubeadmVersion: "v1.10.0-rc.1",
}, },
newK8sVersion: "v1.9.0-rc.1", newK8sVersion: "v1.10.0-rc.1",
expectedSkippableErrs: 1, expectedSkippableErrs: 1,
}, },
} }