cilium: also enable ipMasqAgent

edgelesssys · Dec 15, 2023 · 4211b43 · 4211b43
1 parent 25bdffd
commit 4211b43
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/internal/constellation/helm/overrides.go b/internal/constellation/helm/overrides.go
@@ -59,6 +59,12 @@ func extraCiliumValues(provider cloudprovider.Provider, conformanceMode bool, ou
 	extraVals["encryption"] = map[string]any{
 		"strictMode": strictMode,
 	}
+	extraVals["ipMasqAgent"] = map[string]any{
+		"config": map[string]any{
+			"nonMasqueradeCIDRs": []string{output.IPCidrNode},
+		},
+	}
+
 	return extraVals
 }
 

diff --git a/internal/constellation/helm/values.go b/internal/constellation/helm/values.go
@@ -52,6 +52,12 @@ var ciliumVals = map[string]map[string]any{
 		"bpf": map[string]any{
 			"masquerade": true,
 		},
+		"ipMasqAgent": map[string]any{
+			"enabled": true,
+			"config": map[string]any{
+				"masqLinkLocal": true,
+			},
+		},
 		"kubeProxyReplacement":                "strict",
 		"enableCiliumEndpointSlice":           true,
 		"kubeProxyReplacementHealthzBindAddr": "0.0.0.0:10256",
@@ -98,6 +104,12 @@ var ciliumVals = map[string]map[string]any{
 		"bpf": map[string]any{
 			"masquerade": true,
 		},
+		"ipMasqAgent": map[string]any{
+			"enabled": true,
+			"config": map[string]any{
+				"masqLinkLocal": true,
+			},
+		},
 		"egressMasqueradeInterfaces":          "eth0",
 		"enableIPv4Masquerade":                true,
 		"kubeProxyReplacement":                "strict",
@@ -142,6 +154,12 @@ var ciliumVals = map[string]map[string]any{
 		"bpf": map[string]any{
 			"masquerade": true,
 		},
+		"ipMasqAgent": map[string]any{
+			"enabled": true,
+			"config": map[string]any{
+				"masqLinkLocal": true,
+			},
+		},
 		"kubeProxyReplacement":                "strict",
 		"enableCiliumEndpointSlice":           true,
 		"kubeProxyReplacementHealthzBindAddr": "0.0.0.0:10256",
@@ -187,6 +205,12 @@ var ciliumVals = map[string]map[string]any{
 		"bpf": map[string]any{
 			"masquerade": true,
 		},
+		"ipMasqAgent": map[string]any{
+			"enabled": true,
+			"config": map[string]any{
+				"masqLinkLocal": true,
+			},
+		},
 		"kubeProxyReplacement":                "strict",
 		"enableCiliumEndpointSlice":           true,
 		"kubeProxyReplacementHealthzBindAddr": "0.0.0.0:10256",
@@ -230,6 +254,12 @@ var ciliumVals = map[string]map[string]any{
 		"bpf": map[string]any{
 			"masquerade": true,
 		},
+		"ipMasqAgent": map[string]any{
+			"enabled": true,
+			"config": map[string]any{
+				"masqLinkLocal": true,
+			},
+		},
 		"kubeProxyReplacement":                "strict",
 		"enableCiliumEndpointSlice":           true,
 		"kubeProxyReplacementHealthzBindAddr": "0.0.0.0:10256",