update unit tests

Azure · Jun 13, 2018 · bbcf166 · bbcf166
1 parent 464d12e
commit bbcf166
Show file tree

Hide file tree

Showing 2 changed files with 115 additions and 111 deletions.
diff --git a/pkg/acsengine/k8s_versions.go b/pkg/acsengine/k8s_versions.go
@@ -295,8 +295,8 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
 			DefaultTillerAddonName:             k8sComponentVersions["1.10"]["tiller"],
 			DefaultReschedulerAddonName:        k8sComponentVersions["1.10"]["rescheduler"],
 			DefaultACIConnectorAddonName:       k8sComponentVersions["1.10"]["aci-connector"],
-			ContainerMonitoringAddonName:       k8sComponentVersions["1.11"][ContainerMonitoringAddonName],
-			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.11"][AzureCNINetworkMonitoringAddonName],
+			ContainerMonitoringAddonName:       k8sComponentVersions["1.10"][ContainerMonitoringAddonName],
+			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.10"][AzureCNINetworkMonitoringAddonName],
 			"nodestatusfreq":                   k8sComponentVersions["1.10"]["nodestatusfreq"],
 			"nodegraceperiod":                  k8sComponentVersions["1.10"]["nodegraceperiod"],
 			"podeviction":                      k8sComponentVersions["1.10"]["podeviction"],
@@ -330,8 +330,8 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
 			DefaultTillerAddonName:             k8sComponentVersions["1.9"]["tiller"],
 			DefaultReschedulerAddonName:        k8sComponentVersions["1.9"]["rescheduler"],
 			DefaultACIConnectorAddonName:       k8sComponentVersions["1.9"]["aci-connector"],
-			ContainerMonitoringAddonName:       k8sComponentVersions["1.11"][ContainerMonitoringAddonName],
-			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.11"][AzureCNINetworkMonitoringAddonName],
+			ContainerMonitoringAddonName:       k8sComponentVersions["1.9"][ContainerMonitoringAddonName],
+			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.9"][AzureCNINetworkMonitoringAddonName],
 			"nodestatusfreq":                   k8sComponentVersions["1.9"]["nodestatusfreq"],
 			"nodegraceperiod":                  k8sComponentVersions["1.9"]["nodegraceperiod"],
 			"podeviction":                      k8sComponentVersions["1.9"]["podeviction"],
@@ -364,8 +364,8 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
 			DefaultTillerAddonName:             k8sComponentVersions["1.8"]["tiller"],
 			DefaultReschedulerAddonName:        k8sComponentVersions["1.8"]["rescheduler"],
 			DefaultACIConnectorAddonName:       k8sComponentVersions["1.8"]["aci-connector"],
-			ContainerMonitoringAddonName:       k8sComponentVersions["1.11"][ContainerMonitoringAddonName],
-			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.11"][AzureCNINetworkMonitoringAddonName],
+			ContainerMonitoringAddonName:       k8sComponentVersions["1.8"][ContainerMonitoringAddonName],
+			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.8"][AzureCNINetworkMonitoringAddonName],
 			"nodestatusfreq":                   k8sComponentVersions["1.8"]["nodestatusfreq"],
 			"nodegraceperiod":                  k8sComponentVersions["1.8"]["nodegraceperiod"],
 			"podeviction":                      k8sComponentVersions["1.8"]["podeviction"],
@@ -395,8 +395,8 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
 			DefaultTillerAddonName:             k8sComponentVersions["1.7"]["tiller"],
 			DefaultReschedulerAddonName:        k8sComponentVersions["1.7"]["rescheduler"],
 			DefaultACIConnectorAddonName:       k8sComponentVersions["1.7"]["aci-connector"],
-			ContainerMonitoringAddonName:       k8sComponentVersions["1.11"][ContainerMonitoringAddonName],
-			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.11"][AzureCNINetworkMonitoringAddonName],
+			ContainerMonitoringAddonName:       k8sComponentVersions["1.7"][ContainerMonitoringAddonName],
+			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.7"][AzureCNINetworkMonitoringAddonName],
 			"nodestatusfreq":                   k8sComponentVersions["1.7"]["nodestatusfreq"],
 			"nodegraceperiod":                  k8sComponentVersions["1.7"]["nodegraceperiod"],
 			"podeviction":                      k8sComponentVersions["1.7"]["podeviction"],
@@ -427,7 +427,6 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
 			DefaultReschedulerAddonName:        k8sComponentVersions["1.6"]["rescheduler"],
 			DefaultACIConnectorAddonName:       k8sComponentVersions["1.6"]["aci-connector"],
 			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.6"][AzureCNINetworkMonitoringAddonName],
-			AzureCNINetworkMonitoringAddonName: k8sComponentVersions["1.11"][AzureCNINetworkMonitoringAddonName],
 			"nodestatusfreq":                   k8sComponentVersions["1.6"]["nodestatusfreq"],
 			"nodegraceperiod":                  k8sComponentVersions["1.6"]["nodegraceperiod"],
 			"podeviction":                      k8sComponentVersions["1.6"]["podeviction"],