Organize templates by orchestration types and update references. (#1890)

Azure · Dec 6, 2017 · 30ce15e · 30ce15e
1 parent ed6a196
commit 30ce15e
Show file tree

Hide file tree

Showing 72 changed files with 95 additions and 94 deletions.
diff --git a/docs/contributing-dcos.md b/docs/contributing-dcos.md
@@ -28,7 +28,7 @@ You should now have a clean yaml.
 under the `parts` directory, create a new file called `dcoscustomdataXXX.t` replacing `XXX` by the correct version number.  
 Paste the yaml from the previous step inside.  
 
-In the new file, under the `runcmd` section you should find 4 sucessive `curl` calls downloading some `.deb` packages followed by a bash script installing each one of them. This is handled by `parts\dcosprovision.sh` in ACS-Engine, so make sure the dependencies didn't change and replace the `curl` and `bash` calls by a link to the script.
+In the new file, under the `runcmd` section you should find 4 sucessive `curl` calls downloading some `.deb` packages followed by a bash script installing each one of them. This is handled by `parts\dcos\dcosprovision.sh` in ACS-Engine, so make sure the dependencies didn't change and replace the `curl` and `bash` calls by a link to the script.
 
 For example, in DC/OS 1.9:  
 ```yaml
@@ -89,11 +89,11 @@ DCOS110BootstrapDownloadURL: fmt.Sprintf(AzureEdgeDCOSBootstrapDownloadURL, "sta
 
 ### pkg/acsengine/engine.go
 
-- Around line 39, add `dcosCustomDataXXX    = "dcoscustomdataXXX.t"` variable
+- Around line 39, add `dcosCustomDataXXX    = "dcos/dcoscustomdataXXX.t"` variable
 
 Example for version 1.10:
 ```
-dcosCustomData110    = "dcoscustomdata110.t"
+dcosCustomData110    = "dcos/dcoscustomdata110.t"
 ```
 
 - Around line  578, add the code case block for your version.

diff --git a/docs/swarmmode-hybrid.md b/docs/swarmmode-hybrid.md
@@ -22,7 +22,7 @@ SSH into one of the masters (`ssh [email protected]
 
 ![](images/swarmmode-hybrid-docker-node-ls.png)
 
-> NOTE - if you only see the Linux masters and agents, a working solution is to reimage the Windows agents scale set - that is restoring the VMs to the initial state and restart them. This will reapply all the steps in the installation, [mainly this one that installs the container host and joins the Swarm](https://github.com/Azure/acs-engine/blob/master/parts/Install-ContainerHost-And-Join-Swarm.ps1).
+> NOTE - if you only see the Linux masters and agents, a working solution is to reimage the Windows agents scale set - that is restoring the VMs to the initial state and restart them. This will reapply all the steps in the installation, [mainly this one that installs the container host and joins the Swarm](https://github.com/Azure/acs-engine/blob/master/parts/swarm/Install-ContainerHost-And-Join-Swarm.ps1).
 
 Now you can inspect one of the Windows agents with `docker node inspect <hostname or id of node>`:
 

diff --git a/parts/dcosWindowsAgentResourcesVmas.t → parts/dcos/dcosWindowsAgentResourcesVmas.t b/parts/dcosWindowsAgentResourcesVmas.t → parts/dcos/dcosWindowsAgentResourcesVmas.t
diff --git a/parts/dcosWindowsAgentResourcesVmss.t → parts/dcos/dcosWindowsAgentResourcesVmss.t b/parts/dcosWindowsAgentResourcesVmss.t → parts/dcos/dcosWindowsAgentResourcesVmss.t
diff --git a/parts/dcosWindowsProvision.ps1 → parts/dcos/dcosWindowsProvision.ps1 b/parts/dcosWindowsProvision.ps1 → parts/dcos/dcosWindowsProvision.ps1
diff --git a/parts/dcosagentresourcesvmas.t → parts/dcos/dcosagentresourcesvmas.t b/parts/dcosagentresourcesvmas.t → parts/dcos/dcosagentresourcesvmas.t
diff --git a/parts/dcosagentresourcesvmss.t → parts/dcos/dcosagentresourcesvmss.t b/parts/dcosagentresourcesvmss.t → parts/dcos/dcosagentresourcesvmss.t
diff --git a/parts/dcosagentvars.t → parts/dcos/dcosagentvars.t b/parts/dcosagentvars.t → parts/dcos/dcosagentvars.t
diff --git a/parts/dcosbase.t → parts/dcos/dcosbase.t b/parts/dcosbase.t → parts/dcos/dcosbase.t
@@ -20,13 +20,13 @@
       },
       {{template "windowsparams.t"}},
     {{end}}
-    {{template "dcosparams.t" .}}
+    {{template "dcos/dcosparams.t" .}}
     {{template "masterparams.t" .}}
   },
   "variables": {
     {{range $index, $agent := .AgentPoolProfiles}}
         "{{.Name}}Index": {{$index}},
-        {{template "dcosagentvars.t" .}}
+        {{template "dcos/dcosagentvars.t" .}}
         {{if .IsStorageAccount}}
           "{{.Name}}StorageAccountOffset": "[mul(variables('maxStorageAccountsPerAgent'),{{$index}})]",
           "{{.Name}}AccountName": "[concat(variables('storageAccountBaseName'), 'agnt{{$index}}')]",
@@ -36,25 +36,25 @@
         {{end}}
     {{end}}
 
-    {{template "dcosmastervars.t" .}}
+    {{template "dcos/dcosmastervars.t" .}}
   },
   "resources": [
     {{range .AgentPoolProfiles}}
       {{if .IsWindows}}
         {{if .IsAvailabilitySets}}
-          {{template "dcosWindowsAgentResourcesVmas.t" .}},
+          {{template "dcos/dcosWindowsAgentResourcesVmas.t" .}},
         {{else}}
-          {{template "dcosWindowsAgentResourcesVmss.t" .}},
+          {{template "dcos/dcosWindowsAgentResourcesVmss.t" .}},
         {{end}}
       {{else}}
         {{if .IsAvailabilitySets}}
-          {{template "dcosagentresourcesvmas.t" .}},
+          {{template "dcos/dcosagentresourcesvmas.t" .}},
         {{else}}
-          {{template "dcosagentresourcesvmss.t" .}},
+          {{template "dcos/dcosagentresourcesvmss.t" .}},
         {{end}}
       {{end}}
     {{end}}
-    {{template "dcosmasterresources.t" .}}
+    {{template "dcos/dcosmasterresources.t" .}}
   ],
   "outputs": {
     {{range .AgentPoolProfiles}}{{template "agentoutputs.t" .}}

diff --git a/parts/dcoscustomdata110.t → parts/dcos/dcoscustomdata110.t b/parts/dcoscustomdata110.t → parts/dcos/dcoscustomdata110.t
diff --git a/parts/dcoscustomdata184.t → parts/dcos/dcoscustomdata184.t b/parts/dcoscustomdata184.t → parts/dcos/dcoscustomdata184.t
diff --git a/parts/dcoscustomdata187.t → parts/dcos/dcoscustomdata187.t b/parts/dcoscustomdata187.t → parts/dcos/dcoscustomdata187.t
diff --git a/parts/dcoscustomdata188.t → parts/dcos/dcoscustomdata188.t b/parts/dcoscustomdata188.t → parts/dcos/dcoscustomdata188.t
diff --git a/parts/dcoscustomdata190.t → parts/dcos/dcoscustomdata190.t b/parts/dcoscustomdata190.t → parts/dcos/dcoscustomdata190.t
diff --git a/parts/dcosmasterresources.t → parts/dcos/dcosmasterresources.t b/parts/dcosmasterresources.t → parts/dcos/dcosmasterresources.t
diff --git a/parts/dcosmastervars.t → parts/dcos/dcosmastervars.t b/parts/dcosmastervars.t → parts/dcos/dcosmastervars.t
diff --git a/parts/dcosparams.t → parts/dcos/dcosparams.t b/parts/dcosparams.t → parts/dcos/dcosparams.t
diff --git a/parts/dcosprovision.sh → parts/dcos/dcosprovision.sh b/parts/dcosprovision.sh → parts/dcos/dcosprovision.sh
diff --git a/parts/kubeconfig.json → parts/k8s/kubeconfig.json b/parts/kubeconfig.json → parts/k8s/kubeconfig.json
diff --git a/parts/kubernetes_mountetcd.sh → parts/k8s/kubernetes_mountetcd.sh b/parts/kubernetes_mountetcd.sh → parts/k8s/kubernetes_mountetcd.sh
diff --git a/parts/kubernetesagentcustomdata.yml → parts/k8s/kubernetesagentcustomdata.yml b/parts/kubernetesagentcustomdata.yml → parts/k8s/kubernetesagentcustomdata.yml
diff --git a/parts/kubernetesagentresourcesvmas.t → parts/k8s/kubernetesagentresourcesvmas.t b/parts/kubernetesagentresourcesvmas.t → parts/k8s/kubernetesagentresourcesvmas.t
diff --git a/parts/kubernetesagentvars.t → parts/k8s/kubernetesagentvars.t b/parts/kubernetesagentvars.t → parts/k8s/kubernetesagentvars.t
diff --git a/parts/kubernetesbase.t → parts/k8s/kubernetesbase.t b/parts/kubernetesbase.t → parts/k8s/kubernetesbase.t
@@ -28,32 +28,32 @@
       {{template "windowsparams.t"}},
     {{end}}
     {{template "masterparams.t" .}},
-    {{template "kubernetesparams.t" .}}
+    {{template "k8s/kubernetesparams.t" .}}
   },
   "variables": {
     {{range $index, $agent := .AgentPoolProfiles}}
         "{{.Name}}Index": {{$index}},
-        {{template "kubernetesagentvars.t" .}}
+        {{template "k8s/kubernetesagentvars.t" .}}
         {{if .IsStorageAccount}}
           {{if .HasDisks}}
             "{{.Name}}DataAccountName": "[concat(variables('storageAccountBaseName'), 'data{{$index}}')]",
           {{end}}
           "{{.Name}}AccountName": "[concat(variables('storageAccountBaseName'), 'agnt{{$index}}')]",
         {{end}}
     {{end}}
-    {{template "kubernetesmastervars.t" .}}
+    {{template "k8s/kubernetesmastervars.t" .}}
   },
   "resources": [
     {{ range $index, $element := .AgentPoolProfiles}}
       {{if $index}}, {{end}}
       {{if .IsWindows}}
-        {{template "kuberneteswinagentresourcesvmas.t" .}}
+        {{template "k8s/kuberneteswinagentresourcesvmas.t" .}}
       {{else}}
-        {{template "kubernetesagentresourcesvmas.t" .}}
+        {{template "k8s/kubernetesagentresourcesvmas.t" .}}
       {{end}}
     {{end}}
     {{if not IsHostedMaster}}
-      ,{{template "kubernetesmasterresources.t" .}}
+      ,{{template "k8s/kubernetesmasterresources.t" .}}
     {{else}}
     ,{
       "apiVersion": "[variables('apiVersionDefault')]",

diff --git a/parts/kuberneteskubelet.service → parts/k8s/kuberneteskubelet.service b/parts/kuberneteskubelet.service → parts/k8s/kuberneteskubelet.service
diff --git a/parts/kuberneteskubelet1.5.service → parts/k8s/kuberneteskubelet1.5.service b/parts/kuberneteskubelet1.5.service → parts/k8s/kuberneteskubelet1.5.service
diff --git a/...netesmaster-cloud-controller-manager.yaml → ...netesmaster-cloud-controller-manager.yaml b/...netesmaster-cloud-controller-manager.yaml → ...netesmaster-cloud-controller-manager.yaml
diff --git a/.../kubernetesmaster-kube-addon-manager.yaml → .../kubernetesmaster-kube-addon-manager.yaml b/.../kubernetesmaster-kube-addon-manager.yaml → .../kubernetesmaster-kube-addon-manager.yaml
diff --git a/parts/kubernetesmaster-kube-apiserver.yaml → .../k8s/kubernetesmaster-kube-apiserver.yaml b/parts/kubernetesmaster-kube-apiserver.yaml → .../k8s/kubernetesmaster-kube-apiserver.yaml
diff --git a/...rnetesmaster-kube-controller-manager.yaml → ...rnetesmaster-kube-controller-manager.yaml b/...rnetesmaster-kube-controller-manager.yaml → ...rnetesmaster-kube-controller-manager.yaml
diff --git a/parts/kubernetesmaster-kube-scheduler.yaml → .../k8s/kubernetesmaster-kube-scheduler.yaml b/parts/kubernetesmaster-kube-scheduler.yaml → .../k8s/kubernetesmaster-kube-scheduler.yaml
diff --git a/...asteraddons-aci-connector-deployment.yaml → ...asteraddons-aci-connector-deployment.yaml b/...asteraddons-aci-connector-deployment.yaml → ...asteraddons-aci-connector-deployment.yaml
diff --git a/...eraddons-aci-connector-deployment1.5.yaml → ...eraddons-aci-connector-deployment1.5.yaml b/...eraddons-aci-connector-deployment1.5.yaml → ...eraddons-aci-connector-deployment1.5.yaml
diff --git a/...ernetesmasteraddons-calico-daemonset.yaml → ...ernetesmasteraddons-calico-daemonset.yaml b/...ernetesmasteraddons-calico-daemonset.yaml → ...ernetesmasteraddons-calico-daemonset.yaml
diff --git a/...etesmasteraddons-calico-daemonset1.5.yaml → ...etesmasteraddons-calico-daemonset1.5.yaml b/...etesmasteraddons-calico-daemonset1.5.yaml → ...etesmasteraddons-calico-daemonset1.5.yaml
diff --git a/...etesmasteraddons-heapster-deployment.yaml → ...etesmasteraddons-heapster-deployment.yaml b/...etesmasteraddons-heapster-deployment.yaml → ...etesmasteraddons-heapster-deployment.yaml
diff --git a/...smasteraddons-heapster-deployment1.5.yaml → ...smasteraddons-heapster-deployment1.5.yaml b/...smasteraddons-heapster-deployment1.5.yaml → ...smasteraddons-heapster-deployment1.5.yaml
diff --git a/...etesmasteraddons-kube-dns-deployment.yaml → ...etesmasteraddons-kube-dns-deployment.yaml b/...etesmasteraddons-kube-dns-deployment.yaml → ...etesmasteraddons-kube-dns-deployment.yaml
diff --git a/...smasteraddons-kube-dns-deployment1.5.yaml → ...smasteraddons-kube-dns-deployment1.5.yaml b/...smasteraddons-kube-dns-deployment1.5.yaml → ...smasteraddons-kube-dns-deployment1.5.yaml
diff --git a/...tesmasteraddons-kube-proxy-daemonset.yaml → ...tesmasteraddons-kube-proxy-daemonset.yaml b/...tesmasteraddons-kube-proxy-daemonset.yaml → ...tesmasteraddons-kube-proxy-daemonset.yaml
diff --git a/...masteraddons-kube-proxy-daemonset1.5.yaml → ...masteraddons-kube-proxy-daemonset1.5.yaml b/...masteraddons-kube-proxy-daemonset1.5.yaml → ...masteraddons-kube-proxy-daemonset1.5.yaml
diff --git a/...eraddons-kube-rescheduler-deployment.yaml → ...eraddons-kube-rescheduler-deployment.yaml b/...eraddons-kube-rescheduler-deployment.yaml → ...eraddons-kube-rescheduler-deployment.yaml
diff --git a/...dons-kubernetes-dashboard-deployment.yaml → ...dons-kubernetes-dashboard-deployment.yaml b/...dons-kubernetes-dashboard-deployment.yaml → ...dons-kubernetes-dashboard-deployment.yaml
diff --git a/...s-kubernetes-dashboard-deployment1.5.yaml → ...s-kubernetes-dashboard-deployment1.5.yaml b/...s-kubernetes-dashboard-deployment1.5.yaml → ...s-kubernetes-dashboard-deployment1.5.yaml
diff --git a/...addons-managed-azure-storage-classes.yaml → ...addons-managed-azure-storage-classes.yaml b/...addons-managed-azure-storage-classes.yaml → ...addons-managed-azure-storage-classes.yaml
diff --git a/...rnetesmasteraddons-tiller-deployment.yaml → ...rnetesmasteraddons-tiller-deployment.yaml b/...rnetesmasteraddons-tiller-deployment.yaml → ...rnetesmasteraddons-tiller-deployment.yaml
diff --git a/...tesmasteraddons-tiller-deployment1.5.yaml → ...tesmasteraddons-tiller-deployment1.5.yaml b/...tesmasteraddons-tiller-deployment1.5.yaml → ...tesmasteraddons-tiller-deployment1.5.yaml
diff --git a/...dons-unmanaged-azure-storage-classes.yaml → ...dons-unmanaged-azure-storage-classes.yaml b/...dons-unmanaged-azure-storage-classes.yaml → ...dons-unmanaged-azure-storage-classes.yaml
diff --git a/parts/kubernetesmastercustomdata.yml → parts/k8s/kubernetesmastercustomdata.yml b/parts/kubernetesmastercustomdata.yml → parts/k8s/kubernetesmastercustomdata.yml
diff --git a/parts/kubernetesmastercustomscript.sh → parts/k8s/kubernetesmastercustomscript.sh b/parts/kubernetesmastercustomscript.sh → parts/k8s/kubernetesmastercustomscript.sh
diff --git a/...ubernetesmastergenerateproxycertscript.sh → ...ubernetesmastergenerateproxycertscript.sh b/...ubernetesmastergenerateproxycertscript.sh → ...ubernetesmastergenerateproxycertscript.sh
diff --git a/parts/kubernetesmasterresources.t → parts/k8s/kubernetesmasterresources.t b/parts/kubernetesmasterresources.t → parts/k8s/kubernetesmasterresources.t
diff --git a/parts/kubernetesmastervars.t → parts/k8s/kubernetesmastervars.t b/parts/kubernetesmastervars.t → parts/k8s/kubernetesmastervars.t
diff --git a/parts/kubernetesparams.t → parts/k8s/kubernetesparams.t b/parts/kubernetesparams.t → parts/k8s/kubernetesparams.t
diff --git a/parts/kuberneteswinagentresourcesvmas.t → parts/k8s/kuberneteswinagentresourcesvmas.t b/parts/kuberneteswinagentresourcesvmas.t → parts/k8s/kuberneteswinagentresourcesvmas.t
diff --git a/parts/kuberneteswindowssetup.ps1 → parts/k8s/kuberneteswindowssetup.ps1 b/parts/kuberneteswindowssetup.ps1 → parts/k8s/kuberneteswindowssetup.ps1
diff --git a/.../Install-ContainerHost-And-Join-Swarm.ps1 → .../Install-ContainerHost-And-Join-Swarm.ps1 b/.../Install-ContainerHost-And-Join-Swarm.ps1 → .../Install-ContainerHost-And-Join-Swarm.ps1
diff --git a/parts/Join-SwarmMode-cluster.ps1 → parts/swarm/Join-SwarmMode-cluster.ps1 b/parts/Join-SwarmMode-cluster.ps1 → parts/swarm/Join-SwarmMode-cluster.ps1
diff --git a/parts/configure-swarm-cluster.sh → parts/swarm/configure-swarm-cluster.sh b/parts/configure-swarm-cluster.sh → parts/swarm/configure-swarm-cluster.sh
diff --git a/parts/configure-swarmmode-cluster.sh → parts/swarm/configure-swarmmode-cluster.sh b/parts/configure-swarmmode-cluster.sh → parts/swarm/configure-swarmmode-cluster.sh
diff --git a/parts/swarmagentresourcesclassic.t → parts/swarm/swarmagentresourcesclassic.t b/parts/swarmagentresourcesclassic.t → parts/swarm/swarmagentresourcesclassic.t
diff --git a/parts/swarmagentresourcesvmas.t → parts/swarm/swarmagentresourcesvmas.t b/parts/swarmagentresourcesvmas.t → parts/swarm/swarmagentresourcesvmas.t
diff --git a/parts/swarmagentresourcesvmss.t → parts/swarm/swarmagentresourcesvmss.t b/parts/swarmagentresourcesvmss.t → parts/swarm/swarmagentresourcesvmss.t
diff --git a/parts/swarmagentvars.t → parts/swarm/swarmagentvars.t b/parts/swarmagentvars.t → parts/swarm/swarmagentvars.t
diff --git a/parts/swarmbase.t → parts/swarm/swarmbase.t b/parts/swarmbase.t → parts/swarm/swarmbase.t
@@ -7,12 +7,12 @@
       {{template "windowsparams.t"}},
     {{end}}
     {{template "masterparams.t" .}}
-    {{template "swarmparams.t" .}}
+    {{template "swarm/swarmparams.t" .}}
   },
   "variables": {
     {{range $index, $agent := .AgentPoolProfiles}}
         "{{.Name}}Index": {{$index}},
-        {{template "swarmagentvars.t" .}}
+        {{template "swarm/swarmagentvars.t" .}}
         {{if .IsStorageAccount}}
           "{{.Name}}StorageAccountOffset": "[mul(variables('maxStorageAccountsPerAgent'),{{$index}})]",
           "{{.Name}}AccountName": "[concat(variables('storageAccountBaseName'), 'agnt{{$index}}')]",
@@ -22,25 +22,25 @@
         {{end}}
     {{end}}
 
-    {{template "swarmmastervars.t" .}}
+    {{template "swarm/swarmmastervars.t" .}}
   },
   "resources": [
     {{range .AgentPoolProfiles}}
       {{if .IsWindows}}
         {{if .IsAvailabilitySets}}
-          {{template "swarmwinagentresourcesvmas.t" .}},
+          {{template "swarm/swarmwinagentresourcesvmas.t" .}},
         {{else}}
-          {{template "swarmwinagentresourcesvmss.t" .}},
+          {{template "swarm/swarmwinagentresourcesvmss.t" .}},
         {{end}}
       {{else}}
         {{if .IsAvailabilitySets}}
-          {{template "swarmagentresourcesvmas.t" .}},
+          {{template "swarm/swarmagentresourcesvmas.t" .}},
         {{else}}
-          {{template "swarmagentresourcesvmss.t" .}},
+          {{template "swarm/swarmagentresourcesvmss.t" .}},
         {{end}}
       {{end}}      
     {{end}}
-    {{template "swarmmasterresources.t" .}}
+    {{template "swarm/swarmmasterresources.t" .}}
   ],
   "outputs": {
     {{range .AgentPoolProfiles}}{{template "agentoutputs.t" .}}

diff --git a/parts/swarmmasterresources.t → parts/swarm/swarmmasterresources.t b/parts/swarmmasterresources.t → parts/swarm/swarmmasterresources.t
diff --git a/parts/swarmmastervars.t → parts/swarm/swarmmastervars.t b/parts/swarmmastervars.t → parts/swarm/swarmmastervars.t
diff --git a/parts/swarmparams.t → parts/swarm/swarmparams.t b/parts/swarmparams.t → parts/swarm/swarmparams.t
diff --git a/parts/swarmwinagentresourcesvmas.t → parts/swarm/swarmwinagentresourcesvmas.t b/parts/swarmwinagentresourcesvmas.t → parts/swarm/swarmwinagentresourcesvmas.t
diff --git a/parts/swarmwinagentresourcesvmss.t → parts/swarm/swarmwinagentresourcesvmss.t b/parts/swarmwinagentresourcesvmss.t → parts/swarm/swarmwinagentresourcesvmss.t
diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -27,69 +27,69 @@ import (
 )
 
 const (
-	kubernetesMasterCustomDataYaml           = "kubernetesmastercustomdata.yml"
-	kubernetesMasterCustomScript             = "kubernetesmastercustomscript.sh"
-	kubernetesMountetcd                      = "kubernetes_mountetcd.sh"
-	kubernetesMasterGenerateProxyCertsScript = "kubernetesmastergenerateproxycertscript.sh"
-	kubernetesAgentCustomDataYaml            = "kubernetesagentcustomdata.yml"
-	kubeConfigJSON                           = "kubeconfig.json"
-	kubernetesWindowsAgentCustomDataPS1      = "kuberneteswindowssetup.ps1"
+	kubernetesMasterCustomDataYaml           = "k8s/kubernetesmastercustomdata.yml"
+	kubernetesMasterCustomScript             = "k8s/kubernetesmastercustomscript.sh"
+	kubernetesMountetcd                      = "k8s/kubernetes_mountetcd.sh"
+	kubernetesMasterGenerateProxyCertsScript = "k8s/kubernetesmastergenerateproxycertscript.sh"
+	kubernetesAgentCustomDataYaml            = "k8s/kubernetesagentcustomdata.yml"
+	kubeConfigJSON                           = "k8s/kubeconfig.json"
+	kubernetesWindowsAgentCustomDataPS1      = "k8s/kuberneteswindowssetup.ps1"
 )
 
 const (
-	dcosCustomData188    = "dcoscustomdata188.t"
-	dcosCustomData190    = "dcoscustomdata190.t"
-	dcosCustomData110    = "dcoscustomdata110.t"
-	dcosProvision        = "dcosprovision.sh"
-	dcosWindowsProvision = "dcosWindowsProvision.ps1"
+	dcosCustomData188    = "dcos/dcoscustomdata188.t"
+	dcosCustomData190    = "dcos/dcoscustomdata190.t"
+	dcosCustomData110    = "dcos/dcoscustomdata110.t"
+	dcosProvision        = "dcos/dcosprovision.sh"
+	dcosWindowsProvision = "dcos/dcosWindowsProvision.ps1"
 )
 
 const (
-	swarmProvision        = "configure-swarm-cluster.sh"
-	swarmWindowsProvision = "Install-ContainerHost-And-Join-Swarm.ps1"
+	swarmProvision        = "swarm/configure-swarm-cluster.sh"
+	swarmWindowsProvision = "swarm/Install-ContainerHost-And-Join-Swarm.ps1"
 
-	swarmModeProvision        = "configure-swarmmode-cluster.sh"
-	swarmModeWindowsProvision = "Join-SwarmMode-cluster.ps1"
+	swarmModeProvision        = "swarm/configure-swarmmode-cluster.sh"
+	swarmModeWindowsProvision = "swarm/Join-SwarmMode-cluster.ps1"
 
 	masterAddonAzureStorageClasses              = "MASTER_ADDON_AZURE_STORAGE_CLASSES_B64_GZIP_STR"
-	masterAddonAzureStorageClassesFileUnmanaged = "kubernetesmasteraddons-unmanaged-azure-storage-classes.yaml"
-	masterAddonAzureStorageClassesFileManaged   = "kubernetesmasteraddons-managed-azure-storage-classes.yaml"
+	masterAddonAzureStorageClassesFileUnmanaged = "k8s/kubernetesmasteraddons-unmanaged-azure-storage-classes.yaml"
+	masterAddonAzureStorageClassesFileManaged   = "k8s/kubernetesmasteraddons-managed-azure-storage-classes.yaml"
 )
 
 const (
 	agentOutputs                  = "agentoutputs.t"
 	agentParams                   = "agentparams.t"
 	classicParams                 = "classicparams.t"
-	dcosAgentResourcesVMAS        = "dcosagentresourcesvmas.t"
-	dcosWindowsAgentResourcesVMAS = "dcosWindowsAgentResourcesVmas.t"
-	dcosAgentResourcesVMSS        = "dcosagentresourcesvmss.t"
-	dcosWindowsAgentResourcesVMSS = "dcosWindowsAgentResourcesVmss.t"
-	dcosAgentVars                 = "dcosagentvars.t"
-	dcosBaseFile                  = "dcosbase.t"
-	dcosParams                    = "dcosparams.t"
-	dcosMasterResources           = "dcosmasterresources.t"
-	dcosMasterVars                = "dcosmastervars.t"
+	dcosAgentResourcesVMAS        = "dcos/dcosagentresourcesvmas.t"
+	dcosWindowsAgentResourcesVMAS = "dcos/dcosWindowsAgentResourcesVmas.t"
+	dcosAgentResourcesVMSS        = "dcos/dcosagentresourcesvmss.t"
+	dcosWindowsAgentResourcesVMSS = "dcos/dcosWindowsAgentResourcesVmss.t"
+	dcosAgentVars                 = "dcos/dcosagentvars.t"
+	dcosBaseFile                  = "dcos/dcosbase.t"
+	dcosParams                    = "dcos/dcosparams.t"
+	dcosMasterResources           = "dcos/dcosmasterresources.t"
+	dcosMasterVars                = "dcos/dcosmastervars.t"
 	iaasOutputs                   = "iaasoutputs.t"
-	kubernetesBaseFile            = "kubernetesbase.t"
-	kubernetesAgentResourcesVMAS  = "kubernetesagentresourcesvmas.t"
-	kubernetesAgentVars           = "kubernetesagentvars.t"
-	kubernetesMasterResources     = "kubernetesmasterresources.t"
-	kubernetesMasterVars          = "kubernetesmastervars.t"
-	kubernetesParams              = "kubernetesparams.t"
-	kubernetesWinAgentVars        = "kuberneteswinagentresourcesvmas.t"
-	kubernetesKubeletService      = "kuberneteskubelet.service"
+	kubernetesBaseFile            = "k8s/kubernetesbase.t"
+	kubernetesAgentResourcesVMAS  = "k8s/kubernetesagentresourcesvmas.t"
+	kubernetesAgentVars           = "k8s/kubernetesagentvars.t"
+	kubernetesMasterResources     = "k8s/kubernetesmasterresources.t"
+	kubernetesMasterVars          = "k8s/kubernetesmastervars.t"
+	kubernetesParams              = "k8s/kubernetesparams.t"
+	kubernetesWinAgentVars        = "k8s/kuberneteswinagentresourcesvmas.t"
+	kubernetesKubeletService      = "k8s/kuberneteskubelet.service"
 	masterOutputs                 = "masteroutputs.t"
 	masterParams                  = "masterparams.t"
-	swarmBaseFile                 = "swarmbase.t"
-	swarmParams                   = "swarmparams.t"
-	swarmAgentResourcesVMAS       = "swarmagentresourcesvmas.t"
-	swarmAgentResourcesVMSS       = "swarmagentresourcesvmss.t"
-	swarmAgentResourcesClassic    = "swarmagentresourcesclassic.t"
-	swarmAgentVars                = "swarmagentvars.t"
-	swarmMasterResources          = "swarmmasterresources.t"
-	swarmMasterVars               = "swarmmastervars.t"
-	swarmWinAgentResourcesVMAS    = "swarmwinagentresourcesvmas.t"
-	swarmWinAgentResourcesVMSS    = "swarmwinagentresourcesvmss.t"
+	swarmBaseFile                 = "swarm/swarmbase.t"
+	swarmParams                   = "swarm/swarmparams.t"
+	swarmAgentResourcesVMAS       = "swarm/swarmagentresourcesvmas.t"
+	swarmAgentResourcesVMSS       = "swarm/swarmagentresourcesvmss.t"
+	swarmAgentResourcesClassic    = "swarm/swarmagentresourcesclassic.t"
+	swarmAgentVars                = "swarm/swarmagentvars.t"
+	swarmMasterResources          = "swarm/swarmmasterresources.t"
+	swarmMasterVars               = "swarm/swarmmastervars.t"
+	swarmWinAgentResourcesVMAS    = "swarm/swarmwinagentresourcesvmas.t"
+	swarmWinAgentResourcesVMSS    = "swarm/swarmwinagentresourcesvmss.t"
 	windowsParams                 = "windowsparams.t"
 )
 
@@ -101,11 +101,11 @@ const (
 )
 
 var kubernetesManifestYamls = map[string]string{
-	"MASTER_KUBERNETES_SCHEDULER_B64_GZIP_STR":                "kubernetesmaster-kube-scheduler.yaml",
-	"MASTER_KUBERNETES_CONTROLLER_MANAGER_B64_GZIP_STR":       "kubernetesmaster-kube-controller-manager.yaml",
-	"MASTER_KUBERNETES_CLOUD_CONTROLLER_MANAGER_B64_GZIP_STR": "kubernetesmaster-cloud-controller-manager.yaml",
-	"MASTER_KUBERNETES_APISERVER_B64_GZIP_STR":                "kubernetesmaster-kube-apiserver.yaml",
-	"MASTER_KUBERNETES_ADDON_MANAGER_B64_GZIP_STR":            "kubernetesmaster-kube-addon-manager.yaml",
+	"MASTER_KUBERNETES_SCHEDULER_B64_GZIP_STR":                "k8s/kubernetesmaster-kube-scheduler.yaml",
+	"MASTER_KUBERNETES_CONTROLLER_MANAGER_B64_GZIP_STR":       "k8s/kubernetesmaster-kube-controller-manager.yaml",
+	"MASTER_KUBERNETES_CLOUD_CONTROLLER_MANAGER_B64_GZIP_STR": "k8s/kubernetesmaster-cloud-controller-manager.yaml",
+	"MASTER_KUBERNETES_APISERVER_B64_GZIP_STR":                "k8s/kubernetesmaster-kube-apiserver.yaml",
+	"MASTER_KUBERNETES_ADDON_MANAGER_B64_GZIP_STR":            "k8s/kubernetesmaster-kube-addon-manager.yaml",
 }
 
 var kubernetesAritfacts = map[string]string{
@@ -117,36 +117,36 @@ var kubernetesAritfacts = map[string]string{
 var kubernetesAritfacts15 = map[string]string{
 	"MASTER_PROVISION_B64_GZIP_STR":            kubernetesMasterCustomScript,
 	"MASTER_GENERATE_PROXY_CERTS_B64_GZIP_STR": kubernetesMasterGenerateProxyCertsScript,
-	"KUBELET_SERVICE_B64_GZIP_STR":             "kuberneteskubelet1.5.service",
+	"KUBELET_SERVICE_B64_GZIP_STR":             "k8s/kuberneteskubelet1.5.service",
 }
 
 var kubernetesAddonYamls = map[string]string{
-	"MASTER_ADDON_HEAPSTER_DEPLOYMENT_B64_GZIP_STR":             "kubernetesmasteraddons-heapster-deployment.yaml",
-	"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_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kubernetes-dashboard-deployment.yaml",
+	"MASTER_ADDON_HEAPSTER_DEPLOYMENT_B64_GZIP_STR":             "k8s/kubernetesmasteraddons-heapster-deployment.yaml",
+	"MASTER_ADDON_KUBE_DNS_DEPLOYMENT_B64_GZIP_STR":             "k8s/kubernetesmasteraddons-kube-dns-deployment.yaml",
+	"MASTER_ADDON_KUBE_PROXY_DAEMONSET_B64_GZIP_STR":            "k8s/kubernetesmasteraddons-kube-proxy-daemonset.yaml",
+	"MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR": "k8s/kubernetesmasteraddons-kubernetes-dashboard-deployment.yaml",
 	masterAddonAzureStorageClasses:                              masterAddonAzureStorageClassesFileUnmanaged,
-	"MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR":               "kubernetesmasteraddons-tiller-deployment.yaml",
-	"MASTER_ADDON_ACI_CONNECTOR_DEPLOYMENT_B64_GZIP_STR":        "kubernetesmasteraddons-aci-connector-deployment.yaml",
-	"MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR":          "kubernetesmasteraddons-kube-rescheduler-deployment.yaml",
+	"MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR":               "k8s/kubernetesmasteraddons-tiller-deployment.yaml",
+	"MASTER_ADDON_ACI_CONNECTOR_DEPLOYMENT_B64_GZIP_STR":        "k8s/kubernetesmasteraddons-aci-connector-deployment.yaml",
+	"MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR":          "k8s/kubernetesmasteraddons-kube-rescheduler-deployment.yaml",
 }
 
 var kubernetesAddonYamls15 = map[string]string{
-	"MASTER_ADDON_HEAPSTER_DEPLOYMENT_B64_GZIP_STR":             "kubernetesmasteraddons-heapster-deployment1.5.yaml",
-	"MASTER_ADDON_KUBE_DNS_DEPLOYMENT_B64_GZIP_STR":             "kubernetesmasteraddons-kube-dns-deployment1.5.yaml",
-	"MASTER_ADDON_KUBE_PROXY_DAEMONSET_B64_GZIP_STR":            "kubernetesmasteraddons-kube-proxy-daemonset1.5.yaml",
-	"MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kubernetes-dashboard-deployment1.5.yaml",
+	"MASTER_ADDON_HEAPSTER_DEPLOYMENT_B64_GZIP_STR":             "k8s/kubernetesmasteraddons-heapster-deployment1.5.yaml",
+	"MASTER_ADDON_KUBE_DNS_DEPLOYMENT_B64_GZIP_STR":             "k8s/kubernetesmasteraddons-kube-dns-deployment1.5.yaml",
+	"MASTER_ADDON_KUBE_PROXY_DAEMONSET_B64_GZIP_STR":            "k8s/kubernetesmasteraddons-kube-proxy-daemonset1.5.yaml",
+	"MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR": "k8s/kubernetesmasteraddons-kubernetes-dashboard-deployment1.5.yaml",
 	masterAddonAzureStorageClasses:                              masterAddonAzureStorageClassesFileUnmanaged,
-	"MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR":               "kubernetesmasteraddons-tiller-deployment1.5.yaml",
-	"MASTER_ADDON_ACI_CONNECTOR_DEPLOYMENT_B64_GZIP_STR":        "kubernetesmasteraddons-aci-connector-deployment1.5.yaml",
+	"MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR":               "k8s/kubernetesmasteraddons-tiller-deployment1.5.yaml",
+	"MASTER_ADDON_ACI_CONNECTOR_DEPLOYMENT_B64_GZIP_STR":        "k8s/kubernetesmasteraddons-aci-connector-deployment1.5.yaml",
 }
 
 var calicoAddonYamls = map[string]string{
-	"MASTER_ADDON_CALICO_DAEMONSET_B64_GZIP_STR": "kubernetesmasteraddons-calico-daemonset.yaml",
+	"MASTER_ADDON_CALICO_DAEMONSET_B64_GZIP_STR": "k8s/kubernetesmasteraddons-calico-daemonset.yaml",
 }
 
 var calicoAddonYamls15 = map[string]string{
-	"MASTER_ADDON_CALICO_DAEMONSET_B64_GZIP_STR": "kubernetesmasteraddons-calico-daemonset1.5.yaml",
+	"MASTER_ADDON_CALICO_DAEMONSET_B64_GZIP_STR": "k8s/kubernetesmasteraddons-calico-daemonset1.5.yaml",
 }
 
 var commonTemplateFiles = []string{agentOutputs, agentParams, classicParams, masterOutputs, iaasOutputs, masterParams, windowsParams}
@@ -2095,7 +2095,8 @@ write_files:
 	filelines := ""
 	for _, file := range files {
 		b64GzipString := getBase64CustomScript(file)
-		filelines = filelines + fmt.Sprintf(writeFileBlock, b64GzipString, file)
+		fileNoPath := strings.TrimPrefix(file, "swarm/")
+		filelines = filelines + fmt.Sprintf(writeFileBlock, b64GzipString, fileNoPath)
 	}
 	return fmt.Sprintf(clusterYamlFile, filelines)
 }

diff --git a/pkg/acsengine/fileloader.go b/pkg/acsengine/fileloader.go
@@ -1,6 +1,6 @@
 package acsengine
 
-//go:generate go-bindata -nometadata -pkg $GOPACKAGE -prefix ../../parts/ -o templates.go ../../parts/
+//go:generate go-bindata -nometadata -pkg $GOPACKAGE -prefix ../../parts/ -o templates.go ../../parts/...
 //go:generate gofmt -s -l -w templates.go
 // fileloader use go-bindata (https://github.com/jteeuwen/go-bindata)
 // go-bindata is the way we handle embedded files, like binary, template, etc.