fix: ensure eth0 addr is set to NIC's primary addr (#39)

Azure · Sep 29, 2022 · 31fa122 · 31fa122
1 parent 678d453
commit 31fa122
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/parts/k8s/cloud-init/artifacts/cse_main.sh b/parts/k8s/cloud-init/artifacts/cse_main.sh
@@ -181,6 +181,13 @@ if [[ -n ${MASTER_NODE} ]]; then
   {{/* this step configures all certs */}}
   {{/* both configs etcd/cosmos */}}
   time_metric "ConfigureSecrets" configureSecrets
+
+  {{/* HACK: in case a control plane node starts with incorrectly defined cloud-init IPs */}}
+  if grep -q -E '^ +addresses:|^ +- ' /etc/netplan/50-cloud-init.yaml; then
+    x=$(grep -v -E '^ +addresses:|^ +- ' /etc/netplan/50-cloud-init.yaml)
+    echo "$x" >/etc/netplan/50-cloud-init.yaml
+    netplan apply
+  fi
 fi
 
 {{/* configure etcd if we are configured for etcd */}}

diff --git a/pkg/api/defaults-sysctld.go b/pkg/api/defaults-sysctld.go
@@ -14,6 +14,7 @@ func (cs *ContainerService) setSysctlDConfig() {
 		"net.ipv4.neigh.default.gc_thresh1": "4096",
 		"net.ipv4.neigh.default.gc_thresh2": "8192",
 		"net.ipv4.neigh.default.gc_thresh3": "16384",
+		// "kernel.dmesg_restrict":             "0", // Uncomment to grant non-priviledged users access to dmesg
 	}
 
 	if cs.Properties.OrchestratorProfile.KubernetesConfig.NeedsContainerd() {

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go