From 004145cba1637f15134f9e01a4052c64d56f87ec Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Tue, 12 Dec 2017 18:03:36 -0800 Subject: [PATCH] fix merge error: azure storage classes yaml --- pkg/acsengine/engine.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index 5a13151a68..286ac98bd6 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -121,7 +121,7 @@ var kubernetesAritfacts15 = map[string]string{ var kubernetesAddonYamls = map[string]string{ "MASTER_ADDON_KUBE_DNS_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kube-dns-deployment.yaml", "MASTER_ADDON_KUBE_PROXY_DAEMONSET_B64_GZIP_STR": "kubernetesmasteraddons-kube-proxy-daemonset.yaml", - "MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-tiller-deployment.yaml", + "MASTER_ADDON_AZURE_STORAGE_CLASSES_B64_GZIP_STR": "kubernetesmasteraddons-azure-storage-classes.yaml", } var kubernetesAddonYamls15 = map[string]string{