chore: add system.conf with static JoinControllers configuration (Azu…

…re#605)
juhacket · Mar 14, 2019 · 0c6d85a · 0c6d85a
1 parent c58c603
commit 0c6d85a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/parts/k8s/kubernetesagentcustomdata.yml b/parts/k8s/kubernetesagentcustomdata.yml
@@ -45,6 +45,13 @@ write_files:
   content: !!binary |
     {{WrapAsVariable "sshdConfig"}}
 
+- path: /etc/systemd/system.conf
+  permissions: "0644"
+  encoding: gzip
+  owner: root
+  content: !!binary |
+    {{WrapAsVariable "systemConf"}}
+
 - path: /usr/local/bin/health-monitor.sh
   permissions: "0544"
   encoding: gzip

diff --git a/parts/k8s/kubernetesmastercustomdata.yml b/parts/k8s/kubernetesmastercustomdata.yml
@@ -51,6 +51,13 @@ write_files:
   content: !!binary |
     {{WrapAsVariable "sshdConfig"}}
 
+- path: /etc/systemd/system.conf
+  permissions: "0644"
+  encoding: gzip
+  owner: root
+  content: !!binary |
+    {{WrapAsVariable "systemConf"}}
+
 - path: /usr/local/bin/health-monitor.sh
   permissions: "0544"
   encoding: gzip

diff --git a/parts/k8s/kubernetesmastervars.t b/parts/k8s/kubernetesmastervars.t
@@ -145,6 +145,7 @@
     {{if IsAzureStackCloud}}
     "provisionConfigsCustomCloud": "{{GetKubernetesB64ConfigsCustomCloud}}",
     {{end}}
+    "systemConf": "{{GetB64systemConf}}",
     "mountetcdScript": "{{GetKubernetesB64Mountetcd}}",
     "customSearchDomainsScript": "{{GetKubernetesB64CustomSearchDomainsScript}}",
     "sshdConfig": "{{GetB64sshdConfig}}",

diff --git a/parts/k8s/system.conf b/parts/k8s/system.conf
@@ -0,0 +1,2 @@
+[Manager]
+JoinControllers=cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
diff --git a/pkg/engine/const.go b/pkg/engine/const.go
@@ -138,6 +138,7 @@ const (
 	kubernetesWindowsAzureCniFunctionsPS1 = "k8s/windowsazurecnifunc.ps1"
 	kubernetesWindowsOpenSSHFunctionPS1   = "k8s/windowsinstallopensshfunc.ps1"
 	sshdConfig                            = "k8s/sshd_config"
+	systemConf                            = "k8s/system.conf"
 )
 
 const (

diff --git a/pkg/engine/template_generator.go b/pkg/engine/template_generator.go
@@ -645,6 +645,9 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 		"GetB64sshdConfig": func() string {
 			return getBase64CustomScript(sshdConfig)
 		},
+		"GetB64systemConf": func() string {
+			return getBase64CustomScript(systemConf)
+		},
 		"HasMultipleSshKeys": func() bool {
 			return len(cs.Properties.LinuxProfile.SSH.PublicKeys) > 1
 		},
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[Manager]
		JoinControllers=cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory