fix: setting oom_score to -999 to make containerd to be killed at last (

#5766)
Azure · Feb 7, 2025 · ce97a62 · ce97a62
1 parent daa1187
commit ce97a62
Show file tree

Hide file tree

Showing 104 changed files with 112 additions and 102 deletions.
diff --git a/aks-node-controller/parser/helper_test.go b/aks-node-controller/parser/helper_test.go
@@ -264,7 +264,7 @@ func Test_getContainerdConfig(t *testing.T) {
 				},
 			},
 			want: base64.StdEncoding.EncodeToString([]byte(`version = 2
-oom_score = 0
+oom_score = -999
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = ""
   [plugins."io.containerd.grpc.v1.cri".containerd]
@@ -296,7 +296,7 @@ oom_score = 0
 				noGpu: false,
 			},
 			want: base64.StdEncoding.EncodeToString([]byte(`version = 2
-oom_score = 0
+oom_score = -999
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = ""
   [plugins."io.containerd.grpc.v1.cri".containerd]
@@ -325,7 +325,7 @@ oom_score = 0
 				noGpu: true,
 			},
 			want: base64.StdEncoding.EncodeToString([]byte(`version = 2
-oom_score = 0
+oom_score = -999
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = ""
   [plugins."io.containerd.grpc.v1.cri".containerd]

diff --git a/aks-node-controller/parser/parser_test.go b/aks-node-controller/parser/parser_test.go
@@ -55,7 +55,7 @@ func TestBuildCSECmd(t *testing.T) {
 				containerdConfigFileContent, err := getBase64DecodedValue([]byte(vars["CONTAINERD_CONFIG_NO_GPU_CONTENT"]))
 				require.NoError(t, err)
 				expectedShimConfig := `version = 2
-oom_score = 0
+oom_score = -999
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = ""
   [plugins."io.containerd.grpc.v1.cri".containerd]

diff --git a/aks-node-controller/parser/templates/containerd.toml.gtpl b/aks-node-controller/parser/templates/containerd.toml.gtpl
@@ -1,5 +1,5 @@
 version = 2
-oom_score = 0{{if getHasDataDir .KubeletConfig}}
+oom_score = -999{{if getHasDataDir .KubeletConfig}}
 root = "{{.KubeletConfig.GetContainerDataDir}}"{{- end}}
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = "{{ .KubeBinaryConfig.GetPodInfraContainerImageUrl }}"

diff --git a/aks-node-controller/parser/templates/containerd_no_GPU.toml.gtpl b/aks-node-controller/parser/templates/containerd_no_GPU.toml.gtpl
@@ -1,5 +1,5 @@
 version = 2
-oom_score = 0{{if getHasDataDir .KubeletConfig}}
+oom_score = -999{{if getHasDataDir .KubeletConfig}}
 root = "{{.KubeletConfig.GetContainerDataDir}}"{{- end}}
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = "{{ .KubeBinaryConfig.GetPodInfraContainerImageUrl }}"

diff --git a/aks-node-controller/parser/testdata/AKSUbuntu1804+Containerd+Kubenet/generatedCSECommand b/aks-node-controller/parser/testdata/AKSUbuntu1804+Containerd+Kubenet/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/aks-node-controller/parser/testdata/AKSUbuntu1804+CustomCATrust/generatedCSECommand b/aks-node-controller/parser/testdata/AKSUbuntu1804+CustomCATrust/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/aks-node-controller/parser/testdata/AKSUbuntu1804+HTTPProxy/generatedCSECommand b/aks-node-controller/parser/testdata/AKSUbuntu1804+HTTPProxy/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/aks-node-controller/parser/testdata/AKSUbuntu2204+China/generatedCSECommand b/aks-node-controller/parser/testdata/AKSUbuntu2204+China/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/aks-node-controller/parser/testdata/AKSUbuntu2204+Containerd+MIG/generatedCSECommand b/aks-node-controller/parser/testdata/AKSUbuntu2204+Containerd+MIG/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/aks-node-controller/parser/testdata/AKSUbuntu2204+CustomCloud/generatedCSECommand b/aks-node-controller/parser/testdata/AKSUbuntu2204+CustomCloud/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   REPO_DEPOT_ENDPOINT="" /opt/azure/containers/init-aks-custom-cloud.sh >> /var/log/azure/cluster-provision.log 2>&1;  /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/aks-node-controller/parser/testdata/AKSUbuntu2204+CustomOSConfig/generatedCSECommand b/aks-node-controller/parser/testdata/AKSUbuntu2204+CustomOSConfig/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/aks-node-controller/parser/testdata/AKSUbuntu2204+SSHStatusOn/generatedCSECommand b/aks-node-controller/parser/testdata/AKSUbuntu2204+SSHStatusOn/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/...ler/parser/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/generatedCSECommand b/...ler/parser/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/aks-node-controller/parser/testdata/Compatibility+EmptyConfig/generatedCSECommand b/aks-node-controller/parser/testdata/Compatibility+EmptyConfig/generatedCSECommand
@@ -0,0 +1 @@
+/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT};  cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT};   /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
diff --git a/pkg/agent/baker.go b/pkg/agent/baker.go
@@ -1267,7 +1267,7 @@ type ContainerdConfigTemplate string
 // they're identical except for GPU runtime class.
 const (
 	containerdV1ConfigTemplate ContainerdConfigTemplate = `version = 2
-oom_score = 0{{if HasDataDir }}
+oom_score = -999{{if HasDataDir }}
 root = "{{GetDataDir}}"{{- end}}
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = "{{GetPodInfraContainerSpec}}"
@@ -1388,7 +1388,7 @@ root = "{{GetDataDir}}"{{- end}}
 {{- end}}
 `
 	containerdV2ConfigTemplate ContainerdConfigTemplate = `version = 2
-oom_score = 0{{if HasDataDir }}
+oom_score = -999{{if HasDataDir }}
 root = "{{GetDataDir}}"{{- end}}
 [plugins."io.containerd.grpc.v1.cri"]
   [plugins."io.containerd.cri.v1.images".pinned_images]
@@ -1510,7 +1510,7 @@ root = "{{GetDataDir}}"{{- end}}
 {{- end}}
 `
 	containerdV2NoGPUConfigTemplate ContainerdConfigTemplate = `version = 2
-oom_score = 0{{if HasDataDir }}
+oom_score = -999{{if HasDataDir }}
 root = "{{GetDataDir}}"{{- end}}
 [plugins."io.containerd.grpc.v1.cri"]
   [plugins."io.containerd.cri.v1.images".pinned_images]
@@ -1617,7 +1617,7 @@ root = "{{GetDataDir}}"{{- end}}
 {{- end}}
 `
 	containerdV1NoGPUConfigTemplate ContainerdConfigTemplate = `version = 2
-oom_score = 0{{if HasDataDir }}
+oom_score = -999{{if HasDataDir }}
 root = "{{GetDataDir}}"{{- end}}
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = "{{GetPodInfraContainerSpec}}"

diff --git a/pkg/agent/baker_test.go b/pkg/agent/baker_test.go
@@ -1170,7 +1170,7 @@ var _ = Describe("Assert generated customData and cseCmd", func() {
 				containerdConfigFileContent, err := getBase64DecodedValue([]byte(o.vars["CONTAINERD_CONFIG_CONTENT"]))
 				Expect(err).To(BeNil())
 				expectedShimConfig := `version = 2
-oom_score = 0
+oom_score = -999
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = ""
   [plugins."io.containerd.grpc.v1.cri".containerd]
@@ -1221,7 +1221,7 @@ oom_score = 0
 				containerdConfigFileContent, err := getBase64DecodedValue([]byte(o.vars["CONTAINERD_CONFIG_CONTENT"]))
 				Expect(err).To(BeNil())
 				expectedOverlaybdConfig := `version = 2
-oom_score = 0
+oom_score = -999
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = ""
   [plugins."io.containerd.grpc.v1.cri".containerd]
@@ -1344,7 +1344,7 @@ oom_score = 0
 				containerdConfigFileContent, err := getBase64DecodedValue([]byte(o.vars["CONTAINERD_CONFIG_NO_GPU_CONTENT"]))
 				Expect(err).To(BeNil())
 				expectedShimConfig := `version = 2
-oom_score = 0
+oom_score = -999
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = ""
   [plugins."io.containerd.grpc.v1.cri".containerd]
@@ -1387,7 +1387,7 @@ oom_score = 0
 				containerdConfigFileContent, err := getBase64DecodedValue([]byte(o.vars["CONTAINERD_CONFIG_NO_GPU_CONTENT"]))
 				Expect(err).To(BeNil())
 				expectedShimConfig := `version = 2
-oom_score = 0
+oom_score = -999
 [plugins."io.containerd.grpc.v1.cri"]
   sandbox_image = ""
   [plugins."io.containerd.grpc.v1.cri".containerd]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/bin/bash -c echo $(date),$(hostname) > ${PROVISION_OUTPUT}; cloud-init status --wait > /dev/null 2>&1; [ $? -ne 0 ] && echo 'cloud-init failed' >> ${PROVISION_OUTPUT} && exit 1; echo "cloud-init succeeded" >> ${PROVISION_OUTPUT}; /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"