From 44af0b0db97b41a981e0c8c76aaac8572df5e791 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Mon, 6 Aug 2018 17:03:29 -0600 Subject: [PATCH] restore exechealthz defs for back compat --- pkg/acsengine/k8s_versions.go | 4 ++++ pkg/acsengine/k8s_versions_test.go | 1 + 2 files changed, 5 insertions(+) diff --git a/pkg/acsengine/k8s_versions.go b/pkg/acsengine/k8s_versions.go index 90e8e4bbba..4c28270c79 100644 --- a/pkg/acsengine/k8s_versions.go +++ b/pkg/acsengine/k8s_versions.go @@ -11,6 +11,7 @@ var k8sComponentVersions = map[string]map[string]string{ "1.12": { "dockerEngine": "1.13.*", "dashboard": "kubernetes-dashboard-amd64:v1.8.3", + "exechealthz": "exechealthz-amd64:1.2", "addon-resizer": "addon-resizer:1.8.1", "heapster": "heapster-amd64:v1.5.3", "metrics-server": "metrics-server-amd64:v0.2.1", @@ -42,6 +43,7 @@ var k8sComponentVersions = map[string]map[string]string{ "1.11": { "dockerEngine": "1.13.*", "dashboard": "kubernetes-dashboard-amd64:v1.8.3", + "exechealthz": "exechealthz-amd64:1.2", "addon-resizer": "addon-resizer:1.8.1", "heapster": "heapster-amd64:v1.5.3", "metrics-server": "metrics-server-amd64:v0.2.1", @@ -285,6 +287,7 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st "windowszip": "v" + version + "-1int.zip", "dockerEngineVersion": k8sComponentVersions["1.12"]["dockerEngine"], DefaultDashboardAddonName: k8sComponentVersions["1.12"]["dashboard"], + "exechealthz": k8sComponentVersions["1.12"]["exechealthz"], "addonresizer": k8sComponentVersions["1.12"]["addon-resizer"], "heapster": k8sComponentVersions["1.12"]["heapster"], DefaultMetricsServerAddonName: k8sComponentVersions["1.12"]["metrics-server"], @@ -320,6 +323,7 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st "windowszip": "v" + version + "-1int.zip", "dockerEngineVersion": k8sComponentVersions["1.11"]["dockerEngine"], DefaultDashboardAddonName: k8sComponentVersions["1.11"]["dashboard"], + "exechealthz": k8sComponentVersions["1.11"]["exechealthz"], "addonresizer": k8sComponentVersions["1.11"]["addon-resizer"], "heapster": k8sComponentVersions["1.11"]["heapster"], DefaultMetricsServerAddonName: k8sComponentVersions["1.11"]["metrics-server"], diff --git a/pkg/acsengine/k8s_versions_test.go b/pkg/acsengine/k8s_versions_test.go index 8fe5564adf..7ab18fe722 100644 --- a/pkg/acsengine/k8s_versions_test.go +++ b/pkg/acsengine/k8s_versions_test.go @@ -16,6 +16,7 @@ func TestGetK8sVersionComponents(t *testing.T) { "windowszip": "v1.11.0-alpha.1-1int.zip", "dockerEngineVersion": k8sComponentVersions["1.11"]["dockerEngine"], DefaultDashboardAddonName: k8sComponentVersions["1.11"]["dashboard"], + "exechealthz": k8sComponentVersions["1.11"]["exechealthz"], "addonresizer": k8sComponentVersions["1.11"]["addon-resizer"], "heapster": k8sComponentVersions["1.11"]["heapster"], DefaultMetricsServerAddonName: k8sComponentVersions["1.11"]["metrics-server"],