chore: move Linux files from cse to vhd (#335)

* checkpoint 1

* checkpoint 2

* revert image version

* update

* generated template

Author: haofan-ms

parts/k8s/cloud-init/jumpboxcustomdata.yml

@@ -2,13 +2,6 @@
 
 write_files:
 
-- path: {{GetCSEHelpersScriptFilepath}}
-  permissions: "0744"
-  encoding: gzip
-  owner: "root"
-  content: !!binary |
-    {{CloudInitData "provisionSource"}}
-
 - path: "/home/{{WrapAsParameter "jumpboxUsername"}}/.kube/config"
   permissions: "0644"
   owner: "{{WrapAsParameter "jumpboxUsername"}}"

parts/k8s/cloud-init/masternodecustomdata.yml

@@ -1,44 +1,20 @@
 #cloud-config
 
 write_files:
-- path: {{GetCSEHelpersScriptFilepath}}
-  permissions: "0744"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "provisionSource"}}
-
 - path: /opt/azure/containers/provision.sh
   permissions: "0744"
   encoding: gzip
   owner: root
   content: !!binary |
     {{CloudInitData "provisionScript"}}
 
-- path: {{GetCSEInstallScriptFilepath}}
-  permissions: "0744"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "provisionInstalls"}}
-
 - path: {{GetCSEConfigScriptFilepath}}
   permissions: "0744"
   encoding: gzip
   owner: root
   content: !!binary |
     {{CloudInitData "provisionConfigs"}}
 
-{{- if not .MasterProfile.IsVHDDistro}}
-- path: /opt/azure/containers/provision_cis.sh
-  permissions: "0744"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "provisionCIS"}}
-{{end}}
-
-
 {{- if not .MasterProfile.IsUbuntu1604}}
   {{- if not .MasterProfile.IsVHDDistro}}
 - path: /var/run/reboot-required
@@ -105,20 +81,6 @@ write_files:
     {{CloudInitData "kubeletMonitorSystemdService"}}
 {{- end}}
 
-- path: /etc/systemd/system/apiserver-monitor.service
-  permissions: "0644"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "apiserverMonitorSystemdService"}}
-
-- path: /etc/systemd/system/etcd-monitor.service
-  permissions: "0644"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "etcdMonitorSystemdService"}}
-
 - path: /etc/systemd/system/kubelet.service
   permissions: "0644"
   encoding: gzip
@@ -134,37 +96,6 @@ write_files:
   content: !!binary |
     {{CloudInitData "dockerMonitorSystemdService"}}
 
-{{- if not .MasterProfile.IsVHDDistro}}
-- path: /opt/azure/containers/label-nodes.sh
-  permissions: "0744"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "labelNodesScript"}}
-
-- path: /etc/systemd/system/label-nodes.service
-  permissions: "0644"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "labelNodesSystemdService"}}
-
-- path: /etc/apt/preferences
-  permissions: "0644"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "aptPreferences"}}
-    {{- if EnableAggregatedAPIs}}
-- path: /etc/kubernetes/generate-proxy-certs.sh
-  permissions: "0744"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "generateProxyCertsScript"}}
-    {{end}}
-{{end}}
-
 {{if IsAADPodIdentityAddonEnabled}}
 - path: /opt/azure/containers/untaint-nodes.sh
   permissions: "0744"
@@ -207,15 +138,6 @@ write_files:
 {{end}}
 
 {{- if .OrchestratorProfile.KubernetesConfig.RequiresDocker}}
-    {{- if not .MasterProfile.IsVHDDistro}}
-- path: /etc/systemd/system/docker.service.d/clear_mount_propagation_flags.conf
-  permissions: "0644"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "dockerClearMountPropagationFlags"}}
-    {{end}}
-
 - path: /etc/systemd/system/docker.service.d/exec_start.conf
   permissions: "0644"
   owner: root
@@ -496,13 +418,6 @@ MASTER_CONTAINER_ADDONS_PLACEHOLDER
     #EOF
 
 {{- if not HasCosmosEtcd  }}
-- path: /etc/systemd/system/etcd.service
-  permissions: "0644"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "etcdSystemdService"}}
-
 - path: /opt/azure/containers/setup-etcd.sh
   permissions: "0744"
   owner: root

parts/k8s/cloud-init/nodecustomdata.yml

@@ -9,43 +9,20 @@ write_files:
     #EOF
 {{end}}
 
-- path: {{GetCSEHelpersScriptFilepath}}
-  permissions: "0744"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "provisionSource"}}
-
 - path: /opt/azure/containers/provision.sh
   permissions: "0744"
   encoding: gzip
   owner: root
   content: !!binary |
     {{CloudInitData "provisionScript"}}
 
-- path: {{GetCSEInstallScriptFilepath}}
-  permissions: "0744"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "provisionInstalls"}}
-
 - path: {{GetCSEConfigScriptFilepath}}
   permissions: "0744"
   encoding: gzip
   owner: root
   content: !!binary |
     {{CloudInitData "provisionConfigs"}}
 
-{{- if not .IsVHDDistro}}
-- path: /opt/azure/containers/provision_cis.sh
-  permissions: "0744"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "provisionCIS"}}
-{{end}}
-
 {{- if not .IsUbuntu1604}}
   {{- if not .IsVHDDistro}}
 - path: /var/run/reboot-required
@@ -131,15 +108,6 @@ write_files:
   content: !!binary |
     {{CloudInitData "dockerMonitorSystemdService"}}
 
-{{- if not .IsVHDDistro}}
-- path: /etc/apt/preferences
-  permissions: "0644"
-  encoding: gzip
-  owner: root
-  content: !!binary |
-    {{CloudInitData "aptPreferences"}}
-{{end}}
-
 - path: /etc/apt/apt.conf.d/99periodic
   permissions: "0644"
   owner: root
@@ -166,17 +134,6 @@ write_files:
 {{end}}
 
 {{- if .KubernetesConfig.RequiresDocker}}
-    {{- if not .IsFlatcar}}
-        {{- if not .IsVHDDistro}}
-- path: /etc/systemd/system/docker.service.d/clear_mount_propagation_flags.conf
-  permissions: "0644"
-  encoding: gzip
-  owner: "root"
-  content: !!binary |
-    {{CloudInitData "dockerClearMountPropagationFlags"}}
-        {{- end}}
-    {{- end}}
-
 - path: /etc/systemd/system/docker.service.d/exec_start.conf
   permissions: "0644"
   owner: root

pkg/engine/armvariables.go

@@ -143,18 +143,13 @@ func getK8sMasterVars(cs *api.ContainerService) (map[string]interface{}, error)
 	cloudInitFiles := map[string]interface{}{
 		"apiServerAdmissionConfiguration": getBase64EncodedGzippedCustomScript(apiServerAdmissionConfiguration, cs),
 		"provisionScript":                 getBase64EncodedGzippedCustomScript(kubernetesCSEMainScript, cs),
-		"provisionSource":                 getBase64EncodedGzippedCustomScript(kubernetesCSEHelpersScript, cs),
-		"provisionInstalls":               getBase64EncodedGzippedCustomScript(kubernetesCSEInstall, cs),
 		"provisionConfigs":                getBase64EncodedGzippedCustomScript(kubernetesCSEConfig, cs),
 		"customSearchDomainsScript":       getBase64EncodedGzippedCustomScript(kubernetesCustomSearchDomainsScript, cs),
-		"etcdSystemdService":              getBase64EncodedGzippedCustomScript(etcdSystemdService, cs),
 		"dhcpv6SystemdService":            getBase64EncodedGzippedCustomScript(dhcpv6SystemdService, cs),
 		"dhcpv6ConfigurationScript":       getBase64EncodedGzippedCustomScript(dhcpv6ConfigurationScript, cs),
 		"kubeletSystemdService":           getBase64EncodedGzippedCustomScript(kubeletSystemdService, cs),
-		"etcdMonitorSystemdService":       getBase64EncodedGzippedCustomScript(etcdMonitorSystemdService, cs),
 		"healthMonitorScript":             getBase64EncodedGzippedCustomScript(kubernetesHealthMonitorScript, cs),
 		"kubeletMonitorSystemdService":    getBase64EncodedGzippedCustomScript(kubernetesKubeletMonitorSystemdService, cs),
-		"apiserverMonitorSystemdService":  getBase64EncodedGzippedCustomScript(apiserverMonitorSystemdService, cs),
 		"dockerMonitorSystemdService":     getBase64EncodedGzippedCustomScript(kubernetesDockerMonitorSystemdService, cs),
 	}
 
@@ -175,15 +170,6 @@ func getK8sMasterVars(cs *api.ContainerService) (map[string]interface{}, error)
 		cloudInitFiles["auditdRules"] = getBase64EncodedGzippedCustomScript(auditdRules, cs)
 	}
 
-	if !cs.Properties.IsVHDDistroForAllNodes() {
-		cloudInitFiles["provisionCIS"] = getBase64EncodedGzippedCustomScript(kubernetesCISScript, cs)
-		cloudInitFiles["labelNodesScript"] = getBase64EncodedGzippedCustomScript(labelNodesScript, cs)
-		cloudInitFiles["labelNodesSystemdService"] = getBase64EncodedGzippedCustomScript(labelNodesSystemdService, cs)
-		cloudInitFiles["aptPreferences"] = getBase64EncodedGzippedCustomScript(aptPreferences, cs)
-		cloudInitFiles["dockerClearMountPropagationFlags"] = getBase64EncodedGzippedCustomScript(dockerClearMountPropagationFlags, cs)
-		cloudInitFiles["generateProxyCertsScript"] = getBase64EncodedGzippedCustomScript(kubernetesMasterGenerateProxyCertsScript, cs)
-	}
-
 	if kubernetesConfig != nil {
 		if kubernetesConfig.NetworkPlugin == NetworkPluginCilium {
 			cloudInitFiles["systemdBPFMount"] = getBase64EncodedGzippedCustomScript(systemdBPFMount, cs)

pkg/engine/const.go

@@ -71,34 +71,22 @@ const (
 
 // cloud-init (i.e. ARM customData) source file references
 const (
-	kubernetesMasterNodeCustomDataYaml = "k8s/cloud-init/masternodecustomdata.yml"
-	kubernetesNodeCustomDataYaml       = "k8s/cloud-init/nodecustomdata.yml"
-	kubernetesJumpboxCustomDataYaml    = "k8s/cloud-init/jumpboxcustomdata.yml"
-	kubernetesCSEMainScript            = "k8s/cloud-init/artifacts/cse_main.sh"
-	kubernetesCSEHelpersScript         = "k8s/cloud-init/artifacts/cse_helpers.sh"
-	kubernetesCSEInstall               = "k8s/cloud-init/artifacts/cse_install.sh"
-	kubernetesCSEConfig                = "k8s/cloud-init/artifacts/cse_config.sh"
-	kubernetesCISScript                = "k8s/cloud-init/artifacts/cis.sh"
-	kubernetesCSECustomCloud           = "k8s/cloud-init/artifacts/cse_customcloud.sh"
-	kubernetesHealthMonitorScript      = "k8s/cloud-init/artifacts/health-monitor.sh"
-	// kubernetesKubeletMonitorSystemdTimer     = "k8s/cloud-init/artifacts/kubelet-monitor.timer" // TODO enable
-	kubernetesKubeletMonitorSystemdService   = "k8s/cloud-init/artifacts/kubelet-monitor.service"
-	apiServerAdmissionConfiguration          = "k8s/cloud-init/artifacts/apiserver-admission-control.yaml"
-	apiserverMonitorSystemdService           = "k8s/cloud-init/artifacts/apiserver-monitor.service"
-	kubernetesDockerMonitorSystemdService    = "k8s/cloud-init/artifacts/docker-monitor.service"
-	etcdMonitorSystemdService                = "k8s/cloud-init/artifacts/etcd-monitor.service"
-	labelNodesScript                         = "k8s/cloud-init/artifacts/label-nodes.sh"
-	labelNodesSystemdService                 = "k8s/cloud-init/artifacts/label-nodes.service"
-	untaintNodesScript                       = "k8s/cloud-init/artifacts/untaint-nodes.sh"
-	untaintNodesSystemdService               = "k8s/cloud-init/artifacts/untaint-nodes.service"
-	kubernetesMasterGenerateProxyCertsScript = "k8s/cloud-init/artifacts/generateproxycerts.sh"
-	kubernetesCustomSearchDomainsScript      = "k8s/cloud-init/artifacts/setup-custom-search-domains.sh"
-	kubeletSystemdService                    = "k8s/cloud-init/artifacts/kubelet.service"
-	aptPreferences                           = "k8s/cloud-init/artifacts/apt-preferences"
-	dockerClearMountPropagationFlags         = "k8s/cloud-init/artifacts/docker_clear_mount_propagation_flags.conf"
-	systemdBPFMount                          = "k8s/cloud-init/artifacts/sys-fs-bpf.mount"
-	etcdSystemdService                       = "k8s/cloud-init/artifacts/etcd.service"
-	auditdRules                              = "k8s/cloud-init/artifacts/auditd-rules"
+	kubernetesMasterNodeCustomDataYaml     = "k8s/cloud-init/masternodecustomdata.yml"
+	kubernetesNodeCustomDataYaml           = "k8s/cloud-init/nodecustomdata.yml"
+	kubernetesJumpboxCustomDataYaml        = "k8s/cloud-init/jumpboxcustomdata.yml"
+	kubernetesCSEMainScript                = "k8s/cloud-init/artifacts/cse_main.sh"
+	kubernetesCSEConfig                    = "k8s/cloud-init/artifacts/cse_config.sh"
+	kubernetesCSECustomCloud               = "k8s/cloud-init/artifacts/cse_customcloud.sh"
+	kubernetesHealthMonitorScript          = "k8s/cloud-init/artifacts/health-monitor.sh"
+	kubernetesKubeletMonitorSystemdService = "k8s/cloud-init/artifacts/kubelet-monitor.service"
+	apiServerAdmissionConfiguration        = "k8s/cloud-init/artifacts/apiserver-admission-control.yaml"
+	kubernetesDockerMonitorSystemdService  = "k8s/cloud-init/artifacts/docker-monitor.service"
+	untaintNodesScript                     = "k8s/cloud-init/artifacts/untaint-nodes.sh"
+	untaintNodesSystemdService             = "k8s/cloud-init/artifacts/untaint-nodes.service"
+	kubernetesCustomSearchDomainsScript    = "k8s/cloud-init/artifacts/setup-custom-search-domains.sh"
+	kubeletSystemdService                  = "k8s/cloud-init/artifacts/kubelet.service"
+	systemdBPFMount                        = "k8s/cloud-init/artifacts/sys-fs-bpf.mount"
+	auditdRules                            = "k8s/cloud-init/artifacts/auditd-rules"
 	// scripts and service for enabling ipv6 dual stack
 	dhcpv6SystemdService      = "k8s/cloud-init/artifacts/dhcpv6.service"
 	dhcpv6ConfigurationScript = "k8s/cloud-init/artifacts/enable-dhcpv6.sh"