fix: Removing kubelet flag --non-masquerade-cidr in v1.24+ clustesr (A…

…zure#4829) Signed-off-by: Mark Rossetti <[email protected]>
jackfrancis · Feb 10, 2022 · 68ee4bc · 68ee4bc
1 parent 3449ebc
commit 68ee4bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/docs/topics/clusterdefinitions.md b/docs/topics/clusterdefinitions.md
@@ -450,7 +450,7 @@ Below is a list of kubelet options that AKS Engine will configure by default:
 | "--node-status-update-frequency"      | "10s"                                                                                                                                                                                                                                                                                                     |
 | "--image-gc-high-threshold"           | "85"                                                                                                                                                                                                                                                                                                      |
 | "--image-gc-low-threshold"            | "80"                                                                                                                                                                                                                                                                                                      |
-| "--non-masquerade-cidr"               | "0.0.0.0/0" (unless ip-masq-agent is disabled, in which case this is set to the value of `kubernetesConfig.ClusterSubnet` )                                                                                                                                                                               |
+| "--non-masquerade-cidr"               | "0.0.0.0/0" (unless ip-masq-agent is disabled, in which case this is set to the value of `kubernetesConfig.ClusterSubnet` ) - **Removed in v1.24**                                                                                                                                                        |
 | "--azure-container-registry-config"   | "/etc/kubernetes/azure.json"                                                                                                                                                                                                                                                                              |
 | "--pod-max-pids"                      | "-1" (need to activate the feature in --feature-gates=SupportPodPidsLimit=true)                                                                                                                                                                                                                           |
 | "--image-pull-progress-deadline"      | "30m"                                                                                                                                                                                                                                                                                                     |

diff --git a/pkg/api/defaults-kubelet.go b/pkg/api/defaults-kubelet.go
@@ -327,6 +327,7 @@ func removeKubeletFlags(k map[string]string, v string) {
 			"--image-pull-progress-deadline",
 			"--network-plugin",
 			"--network-plugin-mtu",
+			"--non-masquerade-cidr",
 		} {
 			delete(k, key)
 		}

diff --git a/pkg/api/defaults-kubelet_test.go b/pkg/api/defaults-kubelet_test.go
@@ -2432,6 +2432,7 @@ func TestRemoveKubeletFlags(t *testing.T) {
 				"--network-plugin":                         "cni",
 				"--network-plugin-mtu":                     "2000",
 				"--pod-max-pids":                           "100",
+				"--non-masquerade-cidr":                    "0.0.0.0/0",
 			},
 			expected: map[string]string{
 				"--pod-max-pids": "100",