Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit 030e5dc

Browse files
jackfrancisjackfrancis
committed
add support for Kubernetes v1.8.7
1 parent 7d19218 commit 030e5dc

File tree

10 files changed

+57
-17
lines changed

10 files changed

+57
-17
lines changed

‎examples/k8s-upgrade/README.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ To get the list of all available Kubernetes versions and upgrades, run the *orch
4545
},
4646
{
4747
"orchestratorVersion": "1.8.6"
48+
},
49+
{
50+
"orchestratorVersion": "1.8.7"
4851
}
4952
]
5053
},
@@ -103,7 +106,10 @@ To get the information specific to the cluster, provide its current orchestrator
103106
},
104107
{
105108
"orchestratorVersion": "1.8.6"
106-
}
109+
},
110+
{
111+
"orchestratorVersion": "1.8.7"
112+
},
107113
{
108114
"orchestratorVersion": "1.7.9"
109115
},
@@ -135,7 +141,7 @@ For example,
135141
--deployment-dir ./_output/test \
136142
--location westus \
137143
--resource-group test-upgrade \
138-
--upgrade-version 1.8.6 \
144+
--upgrade-version 1.8.7 \
139145
--auth-method client_secret \
140146
--client-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx \
141147
--client-secret xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx

‎examples/k8s-upgrade/v1.7.9-hybrid.json.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ACSE_POSTDEPLOY=examples/k8s-upgrade/k8s-upgrade.sh
2-
EXPECTED_ORCHESTRATOR_VERSION=1.8.6
2+
EXPECTED_ORCHESTRATOR_VERSION=1.8.7

‎examples/k8s-upgrade/v1.7.9-win.json.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ACSE_POSTDEPLOY=examples/k8s-upgrade/k8s-upgrade.sh
2-
EXPECTED_ORCHESTRATOR_VERSION=1.8.6
2+
EXPECTED_ORCHESTRATOR_VERSION=1.8.7

‎examples/k8s-upgrade/v1.7.9.json.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ACSE_POSTDEPLOY=examples/k8s-upgrade/k8s-upgrade.sh
2-
EXPECTED_ORCHESTRATOR_VERSION=1.8.6
2+
EXPECTED_ORCHESTRATOR_VERSION=1.8.7

‎pkg/acsengine/k8s_versions.go‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,34 @@ var KubeConfigs = map[string]map[string]string{
6464
"gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold),
6565
"gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold),
6666
},
67+
common.KubernetesVersion1Dot8Dot7: {
68+
"hyperkube": "hyperkube-amd64:v1.8.7",
69+
"ccm": "cloud-controller-manager-amd64:v1.8.7",
70+
"dockerEngineVersion": "1.12.*",
71+
DefaultDashboardAddonName: "kubernetes-dashboard-amd64:v1.8.1",
72+
"exechealthz": "exechealthz-amd64:1.2",
73+
"addonresizer": "addon-resizer:1.7",
74+
"heapster": "heapster-amd64:v1.4.2",
75+
"dns": "k8s-dns-kube-dns-amd64:1.14.5",
76+
"addonmanager": "kube-addon-manager-amd64:v6.5",
77+
"dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.5",
78+
"pause": "pause-amd64:3.0",
79+
DefaultTillerAddonName: DefaultTillerImage,
80+
DefaultReschedulerAddonName: DefaultReschedulerImage,
81+
"windowszip": "v1.8.7-1int.zip",
82+
"nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency,
83+
"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
84+
"podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout,
85+
"routeperiod": DefaultKubernetesCtrlMgrRouteReconciliationPeriod,
86+
"backoffretries": strconv.Itoa(DefaultKubernetesCloudProviderBackoffRetries),
87+
"backoffjitter": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffJitter, 'f', -1, 64),
88+
"backoffduration": strconv.Itoa(DefaultKubernetesCloudProviderBackoffDuration),
89+
"backoffexponent": strconv.FormatFloat(DefaultKubernetesCloudProviderBackoffExponent, 'f', -1, 64),
90+
"ratelimitqps": strconv.FormatFloat(DefaultKubernetesCloudProviderRateLimitQPS, 'f', -1, 64),
91+
"ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket),
92+
"gchighthreshold": strconv.Itoa(DefaultKubernetesGCHighThreshold),
93+
"gclowthreshold": strconv.Itoa(DefaultKubernetesGCLowThreshold),
94+
},
6795
common.KubernetesVersion1Dot8Dot6: {
6896
"hyperkube": "hyperkube-amd64:v1.8.6",
6997
"ccm": "cloud-controller-manager-amd64:v1.8.6",

‎pkg/api/common/const.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ const (
6565
KubernetesVersion1Dot8Dot2 string = "1.8.2"
6666
// KubernetesVersion1Dot8Dot4 is the major.minor.patch string for the 1.8.4 version of kubernetes
6767
KubernetesVersion1Dot8Dot4 string = "1.8.4"
68+
// KubernetesVersion1Dot8Dot7 is the major.minor.patch string for the 1.8.7 version of kubernetes
69+
KubernetesVersion1Dot8Dot7 string = "1.8.7"
6870
// KubernetesVersion1Dot8Dot6 is the major.minor.patch string for the 1.8.6 version of kubernetes
6971
KubernetesVersion1Dot8Dot6 string = "1.8.6"
7072
// KubernetesVersion1Dot7Dot0 is the major.minor.patch string for the 1.7.0 version of kubernetes
@@ -126,6 +128,7 @@ var AllKubernetesSupportedVersions = map[string]bool{
126128
KubernetesVersion1Dot8Dot2: true,
127129
KubernetesVersion1Dot8Dot4: true,
128130
KubernetesVersion1Dot8Dot6: true,
131+
KubernetesVersion1Dot8Dot7: true,
129132
KubernetesVersion1Dot9Dot0: true,
130133
KubernetesVersion1Dot9Dot1: true,
131134
}
@@ -161,6 +164,7 @@ var AllKubernetesWindowsSupportedVersions = map[string]bool{
161164
KubernetesVersion1Dot8Dot2: true,
162165
KubernetesVersion1Dot8Dot4: true,
163166
KubernetesVersion1Dot8Dot6: true,
167+
KubernetesVersion1Dot8Dot7: true,
164168
KubernetesVersion1Dot9Dot0: true,
165169
KubernetesVersion1Dot9Dot1: true,
166170
}

‎pkg/api/common/helper_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ func Test_GetValidPatchVersion(t *testing.T) {
1818
t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot7Dot12)
1919
}
2020

21-
version = GetValidPatchVersion(Kubernetes, "1.8.6")
22-
if version != KubernetesVersion1Dot8Dot6 {
23-
t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot8Dot6)
21+
version = GetValidPatchVersion(Kubernetes, "1.8.7")
22+
if version != KubernetesVersion1Dot8Dot7 {
23+
t.Errorf("It is not Kubernetes version %s", KubernetesVersion1Dot8Dot7)
2424
}
2525

2626
version = GetValidPatchVersion(Kubernetes, "1.9.1")

‎pkg/api/orchestrators_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ func TestOrchestratorUpgradeInfo(t *testing.T) {
7777
}
7878
orch, e = GetOrchestratorVersionProfile(csOrch)
7979
Expect(e).To(BeNil())
80-
// 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.8.0, 1.8.1, 1.8.2, 1.8.4, 1.8.6
81-
Expect(len(orch.Upgrades)).To(Equal(13))
80+
// 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.8.0, 1.8.1, 1.8.2, 1.8.4, 1.8.6, 1.8.7
81+
Expect(len(orch.Upgrades)).To(Equal(14))
8282

8383
// 1.7.12 is upgradable to 1.8.x
8484
csOrch = &OrchestratorProfile{
@@ -87,8 +87,8 @@ func TestOrchestratorUpgradeInfo(t *testing.T) {
8787
}
8888
orch, e = GetOrchestratorVersionProfile(csOrch)
8989
Expect(e).To(BeNil())
90-
// 1.8.0, 1.8.1, 1.8.2, 1.8.4, 1.8.6
91-
Expect(len(orch.Upgrades)).To(Equal(5))
90+
// 1.8.0, 1.8.1, 1.8.2, 1.8.4, 1.8.6, 1.8.7
91+
Expect(len(orch.Upgrades)).To(Equal(6))
9292

9393
// 1.8.4 is upgradable to 1.8.x and 1.9.x
9494
csOrch = &OrchestratorProfile{
@@ -97,8 +97,8 @@ func TestOrchestratorUpgradeInfo(t *testing.T) {
9797
}
9898
orch, e = GetOrchestratorVersionProfile(csOrch)
9999
Expect(e).To(BeNil())
100-
// 1.8.6, 1.9.0, 1.9.1
101-
Expect(len(orch.Upgrades)).To(Equal(3))
100+
// 1.8.6, 1.8.7, 1.9.0, 1.9.1
101+
Expect(len(orch.Upgrades)).To(Equal(4))
102102

103103
// 1.9.1 is not upgradable
104104
csOrch = &OrchestratorProfile{
@@ -112,12 +112,12 @@ func TestOrchestratorUpgradeInfo(t *testing.T) {
112112
// v20170930 - all orchestrators
113113
list, e := GetOrchestratorVersionProfileListV20170930("", "")
114114
Expect(e).To(BeNil())
115-
Expect(len(list.Properties.Orchestrators)).To(Equal(28))
115+
Expect(len(list.Properties.Orchestrators)).To(Equal(29))
116116

117117
// v20170930 - kubernetes only
118118
list, e = GetOrchestratorVersionProfileListV20170930(common.Kubernetes, "")
119119
Expect(e).To(BeNil())
120-
Expect(len(list.Properties.Orchestrators)).To(Equal(23))
120+
Expect(len(list.Properties.Orchestrators)).To(Equal(24))
121121
}
122122

123123
func TestKubernetesInfo(t *testing.T) {

‎pkg/api/vlabs/validate.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,7 @@ func (a *KubernetesConfig) Validate(k8sVersion string) error {
476476
common.KubernetesVersion1Dot8Dot2: true,
477477
common.KubernetesVersion1Dot8Dot4: true,
478478
common.KubernetesVersion1Dot8Dot6: true,
479+
common.KubernetesVersion1Dot8Dot7: true,
479480
common.KubernetesVersion1Dot7Dot0: true,
480481
common.KubernetesVersion1Dot7Dot1: true,
481482
common.KubernetesVersion1Dot7Dot2: true,
@@ -629,6 +630,7 @@ func (a *KubernetesConfig) Validate(k8sVersion string) error {
629630
common.KubernetesVersion1Dot8Dot2: true,
630631
common.KubernetesVersion1Dot8Dot4: true,
631632
common.KubernetesVersion1Dot8Dot6: true,
633+
common.KubernetesVersion1Dot8Dot7: true,
632634
}
633635

634636
if a.UseCloudControllerManager != nil && *a.UseCloudControllerManager || a.CustomCcmImage != "" {

‎pkg/api/vlabs/validate_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ func Test_KubernetesConfig_Validate(t *testing.T) {
262262
// Tests that apply to 1.6 and later releases
263263
for _, k8sVersion := range []string{common.KubernetesVersion1Dot6Dot11, common.KubernetesVersion1Dot6Dot12, common.KubernetesVersion1Dot6Dot13,
264264
common.KubernetesVersion1Dot7Dot7, common.KubernetesVersion1Dot7Dot9, common.KubernetesVersion1Dot7Dot10, common.KubernetesVersion1Dot7Dot12,
265-
common.KubernetesVersion1Dot8Dot1, common.KubernetesVersion1Dot8Dot2, common.KubernetesVersion1Dot8Dot4, common.KubernetesVersion1Dot8Dot6,
265+
common.KubernetesVersion1Dot8Dot1, common.KubernetesVersion1Dot8Dot2, common.KubernetesVersion1Dot8Dot4, common.KubernetesVersion1Dot8Dot6, common.KubernetesVersion1Dot8Dot7,
266266
common.KubernetesVersion1Dot9Dot0, common.KubernetesVersion1Dot9Dot1} {
267267
c := KubernetesConfig{
268268
CloudProviderBackoff: true,

0 commit comments

Comments
 (0)