Merge pull request #501 from DockToFuture/use/host-local-ipam

Use host-local ipam for IPv6.
gardener · Oct 8, 2024 · 2a5237f · 2a5237f
2 parents 7749be6 + cb980e4
commit 2a5237f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/pkg/charts/charts_test.go b/pkg/charts/charts_test.go
@@ -464,7 +464,7 @@ var _ = Describe("Chart package test", func() {
 
 				Expect(values["config"]).To(And(
 					HaveKeyWithValue("ipam", Equal(map[string]interface{}{
-						"type":        "calico-ipam",
+						"type":        "host-local",
 						"subnet":      "usePodCidrIPv6",
 						"assign_ipv4": false,
 						"assign_ipv6": true,
@@ -501,7 +501,7 @@ var _ = Describe("Chart package test", func() {
 
 				Expect(values["config"]).To(And(
 					HaveKeyWithValue("ipam", Equal(map[string]interface{}{
-						"type":        "calico-ipam",
+						"type":        "host-local",
 						"subnet":      "usePodCidrIPv6",
 						"assign_ipv4": false,
 						"assign_ipv6": true,

diff --git a/pkg/charts/utils.go b/pkg/charts/utils.go
@@ -234,9 +234,7 @@ func generateChartValues(network *extensionsv1alpha1.Network, config *calicov1al
 	if isIPv6 {
 		c.IPAM.AssignIPv6 = true
 		c.IPAM.Subnet = usePodCIDRv6
-		// NOTE: calico guide (https://docs.tigera.io/calico/latest/networking/ipam/ipv6#enable-ipv6-only) requires ipam
-		// type to be calico-ipam for single IPv6 or dual-stack clusters.
-		c.IPAM.IPAMType = calicoIPAM
+		c.IPAM.IPAMType = hostLocal
 		c.IPv6 = ipv6{
 			Enabled:             true,
 			Pool:                calicov1alpha1.PoolVXLan,