From 8d04021587bf55f6915160053f7e3ef96f5983c9 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Fri, 9 Feb 2018 15:22:42 -0800 Subject: [PATCH 1/2] Add version 1.9.3 --- examples/k8s-upgrade/v1.8.4.json.env | 2 +- pkg/acsengine/k8s_versions.go | 28 ++++++++++++++++++++++++++++ pkg/api/common/const.go | 4 ++++ pkg/api/common/helper_test.go | 4 ++-- pkg/api/orchestrators_test.go | 12 ++++++------ pkg/api/vlabs/validate.go | 2 ++ pkg/api/vlabs/validate_test.go | 2 +- 7 files changed, 44 insertions(+), 10 deletions(-) diff --git a/examples/k8s-upgrade/v1.8.4.json.env b/examples/k8s-upgrade/v1.8.4.json.env index 690c74ce70..ab1153abea 100644 --- a/examples/k8s-upgrade/v1.8.4.json.env +++ b/examples/k8s-upgrade/v1.8.4.json.env @@ -1,2 +1,2 @@ ACSE_POSTDEPLOY=examples/k8s-upgrade/k8s-upgrade.sh -EXPECTED_ORCHESTRATOR_VERSION=1.9.2 +EXPECTED_ORCHESTRATOR_VERSION=1.9.3 diff --git a/pkg/acsengine/k8s_versions.go b/pkg/acsengine/k8s_versions.go index ca9ab3307b..648bb7ebed 100644 --- a/pkg/acsengine/k8s_versions.go +++ b/pkg/acsengine/k8s_versions.go @@ -8,6 +8,34 @@ import ( // KubeConfigs represents Docker images used for Kubernetes components based on Kubernetes versions (major.minor.patch) var KubeConfigs = map[string]map[string]string{ + common.KubernetesVersion1Dot9Dot3: { + "hyperkube": "hyperkube-amd64:v1.9.3", + "ccm": "cloud-controller-manager-amd64:v1.9.3", + "dockerEngineVersion": "1.13.*", + DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.8.2", + "exechealthz": "exechealthz-amd64:1.2", + "addonresizer": "addon-resizer:1.7", + "heapster": "heapster-amd64:v1.5.0", + "dns": "k8s-dns-kube-dns-amd64:1.14.8", + "addonmanager": "kube-addon-manager-amd64:v6.5", + "dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.8", + "pause": "pause-amd64:3.1", + DefaultTillerAddonName: DefaultTillerImage, + DefaultReschedulerAddonName: DefaultReschedulerImage, + "windowszip": "v1.9.2-1int.zip", // TODO: update windows zip + "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, + "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, + "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, + "routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod, + "backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries), + "backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64), + "backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration), + "backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64), + "ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64), + "ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket), + "gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold), + "gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold), + }, common.KubernetesVersion1Dot9Dot2: { "hyperkube": "hyperkube-amd64:v1.9.2", "ccm": "cloud-controller-manager-amd64:v1.9.2", diff --git a/pkg/api/common/const.go b/pkg/api/common/const.go index 5a5d4887be..8d7352fe37 100644 --- a/pkg/api/common/const.go +++ b/pkg/api/common/const.go @@ -53,6 +53,8 @@ const ( ) const ( + // KubernetesVersion1Dot9Dot3 is the major.minor.patch string for the 1.9.3 version of kubernetes + KubernetesVersion1Dot9Dot3 string = "1.9.3" // KubernetesVersion1Dot9Dot2 is the major.minor.patch string for the 1.9.2 version of kubernetes KubernetesVersion1Dot9Dot2 string = "1.9.2" // KubernetesVersion1Dot9Dot1 is the major.minor.patch string for the 1.9.1 version of kubernetes @@ -134,6 +136,7 @@ var AllKubernetesSupportedVersions = map[string]bool{ KubernetesVersion1Dot9Dot0: true, KubernetesVersion1Dot9Dot1: true, KubernetesVersion1Dot9Dot2: true, + KubernetesVersion1Dot9Dot3: true, } // GetSupportedKubernetesVersion verifies that a passed-in version string is supported, or returns a default version string if not @@ -171,6 +174,7 @@ var AllKubernetesWindowsSupportedVersions = map[string]bool{ KubernetesVersion1Dot9Dot0: true, KubernetesVersion1Dot9Dot1: true, KubernetesVersion1Dot9Dot2: true, + KubernetesVersion1Dot9Dot3: true, } const ( diff --git a/pkg/api/common/helper_test.go b/pkg/api/common/helper_test.go index 68b46b7c1e..15a46fda58 100644 --- a/pkg/api/common/helper_test.go +++ b/pkg/api/common/helper_test.go @@ -46,8 +46,8 @@ func Test_RationalizeReleaseAndVersion(t *testing.T) { } version = RationalizeReleaseAndVersion(Kubernetes, "1.9", "") - if version != KubernetesVersion1Dot9Dot2 { - t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot9Dot2) + if version != KubernetesVersion1Dot9Dot3 { + t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot9Dot3) } version = RationalizeReleaseAndVersion(Kubernetes, "", "1.6.11") diff --git a/pkg/api/orchestrators_test.go b/pkg/api/orchestrators_test.go index 8ca5cf30bd..0d20c67e14 100644 --- a/pkg/api/orchestrators_test.go +++ b/pkg/api/orchestrators_test.go @@ -97,13 +97,13 @@ func TestOrchestratorUpgradeInfo(t *testing.T) { } orch, e = GetOrchestratorVersionProfile(csOrch) Expect(e).To(BeNil()) - // 1.8.6, 1.8.7, 1.9.0, 1.9.1, 1.9.2 - Expect(len(orch.Upgrades)).To(Equal(5)) + // 1.8.6, 1.8.7, 1.9.0, 1.9.1, 1.9.2, 1.9.3 + Expect(len(orch.Upgrades)).To(Equal(6)) - // 1.9.2 is not upgradable + // 1.9.3 is not upgradable csOrch = &OrchestratorProfile{ OrchestratorType: Kubernetes, - OrchestratorVersion: "1.9.2", + OrchestratorVersion: "1.9.3", } orch, e = GetOrchestratorVersionProfile(csOrch) Expect(e).To(BeNil()) @@ -112,12 +112,12 @@ func TestOrchestratorUpgradeInfo(t *testing.T) { // v20170930 - all orchestrators list, e := GetOrchestratorVersionProfileListV20170930("", "") Expect(e).To(BeNil()) - Expect(len(list.Properties.Orchestrators)).To(Equal(30)) + Expect(len(list.Properties.Orchestrators)).To(Equal(31)) // v20170930 - kubernetes only list, e = GetOrchestratorVersionProfileListV20170930(common.Kubernetes, "") Expect(e).To(BeNil()) - Expect(len(list.Properties.Orchestrators)).To(Equal(25)) + Expect(len(list.Properties.Orchestrators)).To(Equal(26)) } func TestKubernetesInfo(t *testing.T) { diff --git a/pkg/api/vlabs/validate.go b/pkg/api/vlabs/validate.go index 77c9181ba7..a499dcfec6 100644 --- a/pkg/api/vlabs/validate.go +++ b/pkg/api/vlabs/validate.go @@ -503,6 +503,7 @@ func (a *KubernetesConfig) Validate(k8sVersion string) error { common.KubernetesVersion1Dot9Dot0: true, common.KubernetesVersion1Dot9Dot1: true, common.KubernetesVersion1Dot9Dot2: true, + common.KubernetesVersion1Dot9Dot3: true, common.KubernetesVersion1Dot8Dot0: true, common.KubernetesVersion1Dot8Dot1: true, common.KubernetesVersion1Dot8Dot2: true, @@ -666,6 +667,7 @@ func (a *KubernetesConfig) Validate(k8sVersion string) error { common.KubernetesVersion1Dot9Dot0: true, common.KubernetesVersion1Dot9Dot1: true, common.KubernetesVersion1Dot9Dot2: true, + common.KubernetesVersion1Dot9Dot3: true, } if a.UseCloudControllerManager != nil && *a.UseCloudControllerManager || a.CustomCcmImage != "" { diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go index b537ddc991..23f6f7fd72 100644 --- a/pkg/api/vlabs/validate_test.go +++ b/pkg/api/vlabs/validate_test.go @@ -263,7 +263,7 @@ func Test_KubernetesConfig_Validate(t *testing.T) { for _, k8sVersion := range []string{common.KubernetesVersion1Dot6Dot11, common.KubernetesVersion1Dot6Dot12, common.KubernetesVersion1Dot6Dot13, common.KubernetesVersion1Dot7Dot7, common.KubernetesVersion1Dot7Dot9, common.KubernetesVersion1Dot7Dot10, common.KubernetesVersion1Dot7Dot12, common.KubernetesVersion1Dot8Dot1, common.KubernetesVersion1Dot8Dot2, common.KubernetesVersion1Dot8Dot4, common.KubernetesVersion1Dot8Dot6, common.KubernetesVersion1Dot8Dot7, - common.KubernetesVersion1Dot9Dot0, common.KubernetesVersion1Dot9Dot1, common.KubernetesVersion1Dot9Dot2} { + common.KubernetesVersion1Dot9Dot0, common.KubernetesVersion1Dot9Dot1, common.KubernetesVersion1Dot9Dot2, common.KubernetesVersion1Dot9Dot3} { c := KubernetesConfig{ CloudProviderBackoff: true, CloudProviderRateLimit: true, From f1bb2fb85a30da60d86406225dad28150de27754 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Fri, 9 Feb 2018 16:24:08 -0800 Subject: [PATCH 2/2] update win zip and re-fmt --- pkg/acsengine/k8s_versions.go | 2 +- pkg/api/common/const.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/acsengine/k8s_versions.go b/pkg/acsengine/k8s_versions.go index 648bb7ebed..03c8c756b8 100644 --- a/pkg/acsengine/k8s_versions.go +++ b/pkg/acsengine/k8s_versions.go @@ -22,7 +22,7 @@ var KubeConfigs = map[string]map[string]string{ "pause": "pause-amd64:3.1", DefaultTillerAddonName: DefaultTillerImage, DefaultReschedulerAddonName: DefaultReschedulerImage, - "windowszip": "v1.9.2-1int.zip", // TODO: update windows zip + "windowszip": "v1.9.3-1int.zip", "nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency, "nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod, "podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout, diff --git a/pkg/api/common/const.go b/pkg/api/common/const.go index 8d7352fe37..30f70a00ce 100644 --- a/pkg/api/common/const.go +++ b/pkg/api/common/const.go @@ -53,14 +53,14 @@ const ( ) const ( - // KubernetesVersion1Dot9Dot3 is the major.minor.patch string for the 1.9.3 version of kubernetes - KubernetesVersion1Dot9Dot3 string = "1.9.3" - // KubernetesVersion1Dot9Dot2 is the major.minor.patch string for the 1.9.2 version of kubernetes - KubernetesVersion1Dot9Dot2 string = "1.9.2" - // KubernetesVersion1Dot9Dot1 is the major.minor.patch string for the 1.9.1 version of kubernetes - KubernetesVersion1Dot9Dot1 string = "1.9.1" // KubernetesVersion1Dot9Dot0 is the major.minor.patch string for the 1.9.0 version of kubernetes KubernetesVersion1Dot9Dot0 string = "1.9.0" + // KubernetesVersion1Dot9Dot1 is the major.minor.patch string for the 1.9.1 version of kubernetes + KubernetesVersion1Dot9Dot1 string = "1.9.1" + // KubernetesVersion1Dot9Dot2 is the major.minor.patch string for the 1.9.2 version of kubernetes + KubernetesVersion1Dot9Dot2 string = "1.9.2" + // KubernetesVersion1Dot9Dot3 is the major.minor.patch string for the 1.9.3 version of kubernetes + KubernetesVersion1Dot9Dot3 string = "1.9.3" // KubernetesVersion1Dot8Dot0 is the major.minor.patch string for the 1.8.0 version of kubernetes KubernetesVersion1Dot8Dot0 string = "1.8.0" // KubernetesVersion1Dot8Dot1 is the major.minor.patch string for the 1.8.1 version of kubernetes