Bump minimum kubeadm supported version to v1.12

parent 257205d6
......@@ -71,13 +71,13 @@ func TestImagesListRunWithCustomConfigPath(t *testing.T) {
name: "set k8s version",
expectedImageCount: defaultNumberOfImages,
expectedImageSubstrings: []string{
":v1.12.1",
constants.CurrentKubernetesVersion.String(),
},
configContents: []byte(dedent.Dedent(`
configContents: []byte(dedent.Dedent(fmt.Sprintf(`
apiVersion: kubeadm.k8s.io/v1beta1
kind: ClusterConfiguration
kubernetesVersion: v1.12.1
`)),
kubernetesVersion: %s
`, constants.CurrentKubernetesVersion))),
},
{
name: "use coredns",
......
......@@ -40,7 +40,7 @@ kind: KubeletConfiguration
}
func TestGetFromConfigMap(t *testing.T) {
k8sVersion := version.MustParseGeneric("v1.12.0")
k8sVersion := version.MustParseGeneric(kubeadmconstants.CurrentKubernetesVersion.String())
var tests = []struct {
name string
......
......@@ -387,18 +387,16 @@ var (
ControlPlaneComponents = []string{KubeAPIServer, KubeControllerManager, KubeScheduler}
// MinimumControlPlaneVersion specifies the minimum control plane version kubeadm can deploy
MinimumControlPlaneVersion = version.MustParseSemantic("v1.12.0")
MinimumControlPlaneVersion = version.MustParseSemantic("v1.13.0")
// MinimumKubeletVersion specifies the minimum version of kubelet which kubeadm supports
MinimumKubeletVersion = version.MustParseSemantic("v1.12.0")
MinimumKubeletVersion = version.MustParseSemantic("v1.13.0")
// CurrentKubernetesVersion specifies current Kubernetes version supported by kubeadm
CurrentKubernetesVersion = version.MustParseSemantic("v1.13.0")
CurrentKubernetesVersion = version.MustParseSemantic("v1.14.0")
// SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases
SupportedEtcdVersion = map[uint8]string{
10: "3.1.12",
11: "3.2.18",
12: "3.2.24",
13: "3.2.24",
14: "3.3.10",
......
......@@ -160,16 +160,6 @@ func TestEtcdSupportedVersion(t *testing.T) {
expectedError: errors.New("Unsupported or unknown Kubernetes version(1.99.0)"),
},
{
kubernetesVersion: "1.10.2",
expectedVersion: version.MustParseSemantic("3.1.12"),
expectedError: nil,
},
{
kubernetesVersion: "1.11.0",
expectedVersion: version.MustParseSemantic("3.2.18"),
expectedError: nil,
},
{
kubernetesVersion: "1.12.1",
expectedVersion: version.MustParseSemantic("3.2.24"),
expectedError: nil,
......
......@@ -69,14 +69,14 @@ func TestEnforceVersionPolicies(t *testing.T) {
newK8sVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
},
{
name: "new version must be higher than v1.10.0",
name: "new version must be higher than v1.12.0",
vg: &fakeVersionGetter{
clusterVersion: "v1.10.3",
kubeletVersion: "v1.10.3",
kubeadmVersion: "v1.10.3",
clusterVersion: "v1.12.3",
kubeletVersion: "v1.12.3",
kubeadmVersion: "v1.12.3",
},
newK8sVersion: "v1.9.10",
expectedMandatoryErrs: 1, // version must be higher than v1.10.0
newK8sVersion: "v1.11.10",
expectedMandatoryErrs: 1, // version must be higher than v1.12.0
expectedSkippableErrs: 1, // can't upgrade old k8s with newer kubeadm
},
{
......@@ -93,9 +93,9 @@ func TestEnforceVersionPolicies(t *testing.T) {
{
name: "downgrading two minor versions in one go is not supported",
vg: &fakeVersionGetter{
clusterVersion: "v1.14.3",
kubeletVersion: "v1.14.3",
kubeadmVersion: "v1.14.0",
clusterVersion: "v1.15.3",
kubeletVersion: "v1.15.3",
kubeadmVersion: "v1.15.0",
},
newK8sVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
expectedMandatoryErrs: 1, // can't downgrade two minor versions
......@@ -125,7 +125,7 @@ func TestEnforceVersionPolicies(t *testing.T) {
name: "the maximum skew between the cluster version and the kubelet versions should be one minor version. This may be forced through though.",
vg: &fakeVersionGetter{
clusterVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
kubeletVersion: "v1.11.8",
kubeletVersion: "v1.12.8",
kubeadmVersion: constants.CurrentKubernetesVersion.String(),
},
newK8sVersion: constants.CurrentKubernetesVersion.String(),
......
......@@ -69,7 +69,7 @@ func TestUploadConfiguration(t *testing.T) {
AdvertiseAddress: "1.2.3.4",
},
ClusterConfiguration: kubeadmapiv1beta1.ClusterConfiguration{
KubernetesVersion: "v1.12.10",
KubernetesVersion: kubeadmconstants.MinimumControlPlaneVersion.WithPatch(10).String(),
},
BootstrapTokens: []kubeadmapiv1beta1.BootstrapToken{
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment