add k8s v1.7.15 support (#2490)

jackfrancis · web-flow · commit 8f6a2599b29c · 2018-03-19T17:28:41.000-07:00
diff --git a/pkg/acsengine/k8s_versions.go b/pkg/acsengine/k8s_versions.go
@@ -159,6 +159,7 @@ var KubeConfigs = map[string]map[string]string{
 	common.KubernetesVersion1Dot8Dot2:       getK8sVersionComponents("1.8.2", map[string]string{"windowszip": "v1.8.2-2int.zip"}),
 	common.KubernetesVersion1Dot8Dot1:       getK8sVersionComponents("1.8.1", map[string]string{"windowszip": "v1.8.1-2int.zip"}),
 	common.KubernetesVersion1Dot8Dot0:       getK8sVersionComponents("1.8.0", map[string]string{"windowszip": "v1.8.0-2int.zip"}),
+	common.KubernetesVersion1Dot7Dot15:      getK8sVersionComponents("1.7.15", map[string]string{"windowszip": "v1.7.15-1int.zip"}),
 	common.KubernetesVersion1Dot7Dot14:      getK8sVersionComponents("1.7.14", map[string]string{"windowszip": "v1.7.14-1int.zip"}),
 	common.KubernetesVersion1Dot7Dot13:      getK8sVersionComponents("1.7.13", map[string]string{"windowszip": "v1.7.13-1int.zip"}),
 	common.KubernetesVersion1Dot7Dot12:      getK8sVersionComponents("1.7.12", map[string]string{"windowszip": "v1.7.12-2int.zip"}),
diff --git a/pkg/api/common/const.go b/pkg/api/common/const.go
@@ -109,6 +109,8 @@ const (
 	KubernetesVersion1Dot7Dot13 string = "1.7.13"
 	// KubernetesVersion1Dot7Dot14 is the major.minor.patch string for the 1.7.14 version of kubernetes
 	KubernetesVersion1Dot7Dot14 string = "1.7.14"
+	// KubernetesVersion1Dot7Dot15 is the major.minor.patch string for the 1.7.15 version of kubernetes
+	KubernetesVersion1Dot7Dot15 string = "1.7.15"
 	// KubernetesVersion1Dot6Dot6 is the major.minor.patch string for the 1.6.6 version of kubernetes
 	KubernetesVersion1Dot6Dot6 string = "1.6.6"
 	// KubernetesVersion1Dot6Dot9 is the major.minor.patch string for the 1.6.9 version of kubernetes
@@ -141,6 +143,7 @@ var AllKubernetesSupportedVersions = map[string]bool{
 	KubernetesVersion1Dot7Dot12:      true,
 	KubernetesVersion1Dot7Dot13:      true,
 	KubernetesVersion1Dot7Dot14:      true,
+	KubernetesVersion1Dot7Dot15:      true,
 	KubernetesVersion1Dot8Dot0:       true,
 	KubernetesVersion1Dot8Dot1:       true,
 	KubernetesVersion1Dot8Dot2:       true,
@@ -188,6 +191,7 @@ var AllKubernetesWindowsSupportedVersions = map[string]bool{
 	KubernetesVersion1Dot7Dot12:      true,
 	KubernetesVersion1Dot7Dot13:      true,
 	KubernetesVersion1Dot7Dot14:      true,
+	KubernetesVersion1Dot7Dot15:      true,
 	KubernetesVersion1Dot8Dot0:       true,
 	KubernetesVersion1Dot8Dot1:       true,
 	KubernetesVersion1Dot8Dot2:       true,
diff --git a/pkg/api/common/helper_test.go b/pkg/api/common/helper_test.go
@@ -14,8 +14,8 @@ func Test_GetValidPatchVersion(t *testing.T) {
 	}
 
 	version = GetValidPatchVersion(Kubernetes, "1.7.3")
-	if version != KubernetesVersion1Dot7Dot14 {
-		t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)
+	if version != KubernetesVersion1Dot7Dot15 {
+		t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot15)
 	}
 
 	version = GetValidPatchVersion(Kubernetes, "1.8.7")
@@ -46,8 +46,8 @@ func TestGetLatestPatchVersion(t *testing.T) {
 	}
 
 	version = GetLatestPatchVersion("1.7", GetAllSupportedKubernetesVersions())
-	if version != KubernetesVersion1Dot7Dot14 {
-		t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)
+	if version != KubernetesVersion1Dot7Dot15 {
+		t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot15)
 	}
 
 	version = GetLatestPatchVersion("1.8", GetAllSupportedKubernetesVersions())
@@ -94,18 +94,18 @@ func Test_RationalizeReleaseAndVersion(t *testing.T) {
 	}
 
 	version = RationalizeReleaseAndVersion(Kubernetes, "1.7", "", false)
-	if version != KubernetesVersion1Dot7Dot14 {
-		t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)
+	if version != KubernetesVersion1Dot7Dot15 {
+		t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot15)
 	}
 
 	version = RationalizeReleaseAndVersion(Kubernetes, "", "1.7.14", false)
 	if version != KubernetesVersion1Dot7Dot14 {
 		t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)
 	}
 
-	version = RationalizeReleaseAndVersion(Kubernetes, "1.7", "1.7.14", false)
-	if version != KubernetesVersion1Dot7Dot14 {
-		t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)
+	version = RationalizeReleaseAndVersion(Kubernetes, "1.7", "1.7.15", false)
+	if version != KubernetesVersion1Dot7Dot15 {
+		t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot15)
 	}
 
 	version = RationalizeReleaseAndVersion(Kubernetes, "", "1.6.7", false)
diff --git a/pkg/api/orchestrators_test.go b/pkg/api/orchestrators_test.go
@@ -57,8 +57,8 @@ func TestOrchestratorUpgradeInfo(t *testing.T) {
 	}
 	orch, e := GetOrchestratorVersionProfile(csOrch)
 	Expect(e).To(BeNil())
-	// 1.6.9, 1.6.11, 1.6.12, 1.6.13, 1.7.0, 1.7.1, 1.7.2, 1.7.4, 1.7.5, 1.7.7, 1.7.9, 1.7.10, 1.7.12, 1.7.13, 1.7.14
-	Expect(len(orch.Upgrades)).To(Equal(15))
+	// 1.6.9, 1.6.11, 1.6.12, 1.6.13, 1.7.0, 1.7.1, 1.7.2, 1.7.4, 1.7.5, 1.7.7, 1.7.9, 1.7.10, 1.7.12, 1.7.13, 1.7.14, 1.7.15
+	Expect(len(orch.Upgrades)).To(Equal(16))
 
 	// 1.7.0 is upgradable to 1.7.x and 1.8.x
 	csOrch = &OrchestratorProfile{
@@ -67,13 +67,13 @@ func TestOrchestratorUpgradeInfo(t *testing.T) {
 	}
 	orch, e = GetOrchestratorVersionProfile(csOrch)
 	Expect(e).To(BeNil())
-	// 1.7.1, 1.7.2, 1.7.4, 1.7.5, 1.7.7, 1.7.9, 1.7.10, 1.7.12, 1.7.13, 1.7.14, 1.8.0, 1.8.1, 1.8.2, 1.8.4, 1.8.6, 1.8.7, 1.8.8, 1.8.9, 1.8.10
-	Expect(len(orch.Upgrades)).To(Equal(19))
+	// 1.7.1, 1.7.2, 1.7.4, 1.7.5, 1.7.7, 1.7.9, 1.7.10, 1.7.12, 1.7.13, 1.7.14, 1.7.15, 1.8.0, 1.8.1, 1.8.2, 1.8.4, 1.8.6, 1.8.7, 1.8.8, 1.8.9, 1.8.10
+	Expect(len(orch.Upgrades)).To(Equal(20))
 
-	// 1.7.14 is upgradable to 1.8.x
+	// 1.7.15 is upgradable to 1.8.x
 	csOrch = &OrchestratorProfile{
 		OrchestratorType:    Kubernetes,
-		OrchestratorVersion: "1.7.14",
+		OrchestratorVersion: "1.7.15",
 	}
 	orch, e = GetOrchestratorVersionProfile(csOrch)
 	Expect(e).To(BeNil())
@@ -121,12 +121,12 @@ func TestOrchestratorUpgradeInfo(t *testing.T) {
 	// v20170930 - all orchestrators
 	list, e := GetOrchestratorVersionProfileListV20170930("", "")
 	Expect(e).To(BeNil())
-	Expect(len(list.Properties.Orchestrators)).To(Equal(38))
+	Expect(len(list.Properties.Orchestrators)).To(Equal(39))
 
 	// v20170930 - kubernetes only
 	list, e = GetOrchestratorVersionProfileListV20170930(common.Kubernetes, "")
 	Expect(e).To(BeNil())
-	Expect(len(list.Properties.Orchestrators)).To(Equal(33))
+	Expect(len(list.Properties.Orchestrators)).To(Equal(34))
 }
 
 func TestKubernetesInfo(t *testing.T) {
diff --git a/pkg/api/vlabs/validate.go b/pkg/api/vlabs/validate.go
@@ -535,6 +535,7 @@ func (a *KubernetesConfig) Validate(k8sVersion string) error {
 		common.KubernetesVersion1Dot7Dot12:      true,
 		common.KubernetesVersion1Dot7Dot13:      true,
 		common.KubernetesVersion1Dot7Dot14:      true,
+		common.KubernetesVersion1Dot7Dot15:      true,
 		common.KubernetesVersion1Dot6Dot6:       true,
 		common.KubernetesVersion1Dot6Dot9:       true,
 		common.KubernetesVersion1Dot6Dot11:      true,
diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go
@@ -580,15 +580,15 @@ func TestWindowsVersions(t *testing.T) {
 	}
 
 	p = getK8sDefaultProperties(true)
-	p.OrchestratorProfile.OrchestratorVersion = "1.7.14"
+	p.OrchestratorProfile.OrchestratorVersion = "1.7.15"
 	if err := p.Validate(false); err != nil {
 		t.Errorf(
 			"should not error on valid Windows version: %v", err,
 		)
 	}
 
 	p = getK8sDefaultProperties(true)
-	p.OrchestratorProfile.OrchestratorVersion = "1.7.15"
+	p.OrchestratorProfile.OrchestratorVersion = "1.7.16"
 	if err := p.Validate(false); err == nil {
 		t.Errorf(
 			"should error on invalid Windows version",
@@ -678,15 +678,15 @@ func TestLinuxVersions(t *testing.T) {
 	}
 
 	p = getK8sDefaultProperties(false)
-	p.OrchestratorProfile.OrchestratorVersion = "1.7.14"
+	p.OrchestratorProfile.OrchestratorVersion = "1.7.15"
 	if err := p.Validate(false); err != nil {
 		t.Errorf(
 			"should not error on valid Linux version: %v", err,
 		)
 	}
 
 	p = getK8sDefaultProperties(false)
-	p.OrchestratorProfile.OrchestratorVersion = "1.7.15"
+	p.OrchestratorProfile.OrchestratorVersion = "1.7.16"
 	if err := p.Validate(false); err == nil {
 		t.Errorf(
 			"should error on invalid Linux version",

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ func Test_GetValidPatchVersion(t *testing.T) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`version = GetValidPatchVersion(Kubernetes, "1.7.3")`
`17`		`- if version != KubernetesVersion1Dot7Dot14 {`
`18`		`- t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)`
	`17`	`+ if version != KubernetesVersion1Dot7Dot15 {`
	`18`	`+ t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot15)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`version = GetValidPatchVersion(Kubernetes, "1.8.7")`
`@@ -46,8 +46,8 @@ func TestGetLatestPatchVersion(t *testing.T) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`version = GetLatestPatchVersion("1.7", GetAllSupportedKubernetesVersions())`
`49`		`- if version != KubernetesVersion1Dot7Dot14 {`
`50`		`- t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)`
	`49`	`+ if version != KubernetesVersion1Dot7Dot15 {`
	`50`	`+ t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot15)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`version = GetLatestPatchVersion("1.8", GetAllSupportedKubernetesVersions())`
`@@ -94,18 +94,18 @@ func Test_RationalizeReleaseAndVersion(t *testing.T) {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`version = RationalizeReleaseAndVersion(Kubernetes, "1.7", "", false)`
`97`		`- if version != KubernetesVersion1Dot7Dot14 {`
`98`		`- t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)`
	`97`	`+ if version != KubernetesVersion1Dot7Dot15 {`
	`98`	`+ t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot15)`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`version = RationalizeReleaseAndVersion(Kubernetes, "", "1.7.14", false)`
`102`	`102`	`if version != KubernetesVersion1Dot7Dot14 {`
`103`	`103`	`t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)`
`104`	`104`	`}`
`105`	`105`
`106`		`- version = RationalizeReleaseAndVersion(Kubernetes, "1.7", "1.7.14", false)`
`107`		`- if version != KubernetesVersion1Dot7Dot14 {`
`108`		`- t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot14)`
	`106`	`+ version = RationalizeReleaseAndVersion(Kubernetes, "1.7", "1.7.15", false)`
	`107`	`+ if version != KubernetesVersion1Dot7Dot15 {`
	`108`	`+ t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot15)`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`version = RationalizeReleaseAndVersion(Kubernetes, "", "1.6.7", false)`
Original file line number	Diff line number	Diff line change
`@@ -580,15 +580,15 @@ func TestWindowsVersions(t *testing.T) {`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`p = getK8sDefaultProperties(true)`
`583`		`- p.OrchestratorProfile.OrchestratorVersion = "1.7.14"`
	`583`	`+ p.OrchestratorProfile.OrchestratorVersion = "1.7.15"`
`584`	`584`	`if err := p.Validate(false); err != nil {`
`585`	`585`	`t.Errorf(`
`586`	`586`	`"should not error on valid Windows version: %v", err,`
`587`	`587`	`)`
`588`	`588`	`}`
`589`	`589`
`590`	`590`	`p = getK8sDefaultProperties(true)`
`591`		`- p.OrchestratorProfile.OrchestratorVersion = "1.7.15"`
	`591`	`+ p.OrchestratorProfile.OrchestratorVersion = "1.7.16"`
`592`	`592`	`if err := p.Validate(false); err == nil {`
`593`	`593`	`t.Errorf(`
`594`	`594`	`"should error on invalid Windows version",`
`@@ -678,15 +678,15 @@ func TestLinuxVersions(t *testing.T) {`
`678`	`678`	`}`
`679`	`679`
`680`	`680`	`p = getK8sDefaultProperties(false)`
`681`		`- p.OrchestratorProfile.OrchestratorVersion = "1.7.14"`
	`681`	`+ p.OrchestratorProfile.OrchestratorVersion = "1.7.15"`
`682`	`682`	`if err := p.Validate(false); err != nil {`
`683`	`683`	`t.Errorf(`
`684`	`684`	`"should not error on valid Linux version: %v", err,`
`685`	`685`	`)`
`686`	`686`	`}`
`687`	`687`
`688`	`688`	`p = getK8sDefaultProperties(false)`
`689`		`- p.OrchestratorProfile.OrchestratorVersion = "1.7.15"`
	`689`	`+ p.OrchestratorProfile.OrchestratorVersion = "1.7.16"`
`690`	`690`	`if err := p.Validate(false); err == nil {`
`691`	`691`	`t.Errorf(`
`692`	`692`	`"should error on invalid Linux version",`