move windows ps files from cse to vhd (#334)

Author: haofan-ms

pkg/engine/const.go

@@ -64,17 +64,9 @@ const (
 const (
 	kubeConfigJSON = "k8s/kubeconfig.json"
 	// Windows custom scripts. These should all be listed in template_generator.go:func GetKubernetesWindowsAgentFunctions
-	kubernetesWindowsAgentCustomDataPS1           = "k8s/kuberneteswindowssetup.ps1"
-	kubernetesWindowsAgentFunctionsPS1            = "k8s/kuberneteswindowsfunctions.ps1"
-	kubernetesWindowsConfigFunctionsPS1           = "k8s/windowsconfigfunc.ps1"
-	kubernetesWindowsContainerdFunctionsPS1       = "k8s/windowscontainerdfunc.ps1"
-	kubernetesWindowsCsiProxyFunctionsPS1         = "k8s/windowscsiproxyfunc.ps1"
-	kubernetesWindowsKubeletFunctionsPS1          = "k8s/windowskubeletfunc.ps1"
-	kubernetesWindowsCniFunctionsPS1              = "k8s/windowscnifunc.ps1"
-	kubernetesWindowsAzureCniFunctionsPS1         = "k8s/windowsazurecnifunc.ps1"
-	kubernetesWindowsHostsConfigAgentFunctionsPS1 = "k8s/windowshostsconfigagentfunc.ps1"
-	kubernetesWindowsOpenSSHFunctionPS1           = "k8s/windowsinstallopensshfunc.ps1"
-	kubernetesWindowsHypervtemplatetoml           = "k8s/containerdtemplate.toml"
+	kubernetesWindowsAgentCustomDataPS1     = "k8s/kuberneteswindowssetup.ps1"
+	kubernetesWindowsContainerdFunctionsPS1 = "k8s/windowscontainerdfunc.ps1"
+	kubernetesWindowsHypervtemplatetoml     = "k8s/containerdtemplate.toml"
 )
 
 // cloud-init (i.e. ARM customData) source file references

pkg/engine/template_generator.go

@@ -395,15 +395,7 @@ func getContainerServiceFuncMap(cs *api.ContainerService) template.FuncMap {
 		"GetKubernetesWindowsAgentFunctions": func() string {
 			// Collect all the parts into a zip
 			var parts = []string{
-				kubernetesWindowsAgentFunctionsPS1,
-				kubernetesWindowsConfigFunctionsPS1,
 				kubernetesWindowsContainerdFunctionsPS1,
-				kubernetesWindowsCsiProxyFunctionsPS1,
-				kubernetesWindowsKubeletFunctionsPS1,
-				kubernetesWindowsCniFunctionsPS1,
-				kubernetesWindowsAzureCniFunctionsPS1,
-				kubernetesWindowsHostsConfigAgentFunctionsPS1,
-				kubernetesWindowsOpenSSHFunctionPS1,
 				kubernetesWindowsHypervtemplatetoml,
 			}
 

vhd/aib/AKSeImageTemplateWindows.json

@@ -144,6 +144,66 @@
                         "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/cloud-init/artifacts/credential-provider-config.yaml'))]",
                         "destination":"c:\\k\\credential-provider\\credential-provider-config.yaml"
                     },
+                    {
+                        "type": "File",
+                        "name": "download kuberneteswindowsfunctions file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/kuberneteswindowsfunctions.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\kuberneteswindowsfunctions.ps1"
+                    },
+                    {
+                        "type": "File",
+                        "name": "download rotate-certs file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/rotate-certs.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\rotate-certs.ps1"
+                    },
+                    {
+                        "type": "File",
+                        "name": "download windowsazurecnifunc file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/windowsazurecnifunc.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\windowsazurecnifunc.ps1"
+                    },
+                    {
+                        "type": "File",
+                        "name": "download windowsazurecnifunc.tests file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/windowsazurecnifunc.tests.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\windowsazurecnifunc.tests.ps1"
+                    },
+                    {
+                        "type": "File",
+                        "name": "download windowscnifunc file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/windowscnifunc.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\windowscnifunc.ps1"
+                    },
+                    {
+                        "type": "File",
+                        "name": "download windowsconfigfunc file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/windowsconfigfunc.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\windowsconfigfunc.ps1"
+                    },
+                    {
+                        "type": "File",
+                        "name": "download windowscsiproxyfunc file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/windowscsiproxyfunc.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\windowscsiproxyfunc.ps1"
+                    },
+                    {
+                        "type": "File",
+                        "name": "download windowshostsconfigagentfunc file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/windowshostsconfigagentfunc.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\windowshostsconfigagentfunc.ps1"
+                    },
+                    {
+                        "type": "File",
+                        "name": "download windowsinstallopensshfunc file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/windowsinstallopensshfunc.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\windowsinstallopensshfunc.ps1"
+                    },
+                    {
+                        "type": "File",
+                        "name": "download windowskubeletfunc file",
+                        "sourceUri": "[uri('https://raw.githubusercontent.com/Azure/aks-engine-azurestack/',concat(parameters('github_branch_name'),'/parts/k8s/windowskubeletfunc.ps1'))]",
+                        "destination":"c:\\AzureData\\k8s\\windowskubeletfunc.ps1"
+                    },
                     {
                         "type": "File",
                         "name": "download log collection script",