Merge pull request #1175 from axel7born/fix-ipv6-worker-subnet

Set IPv4 CIDR to empty string for IPv6 only shoots.
gardener · Dec 20, 2024 · 5a4c4d9 · 5a4c4d9
2 parents 7b14537 + b945a87
commit 5a4c4d9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/controller/infrastructure/infraflow/reconcile.go b/pkg/controller/infrastructure/infraflow/reconcile.go
@@ -681,13 +681,17 @@ func (c *FlowContext) ensureZones(ctx context.Context) error {
 		tagsPublic[TagKeyRolePublicELB] = TagValueELB
 		tagsPrivate := c.commonTagsWithSuffix(helper.GetSuffixSubnetPrivate())
 		tagsPrivate[TagKeyRolePrivateELB] = TagValueELB
+		workersCIDR := zone.Workers
+		if !isIPv4(c.getIpFamilies()) {
+			workersCIDR = ""
+		}
 		desired = append(desired,
 			&awsclient.Subnet{
 				Tags:                                    tagsWorkers,
 				VpcId:                                   c.state.Get(IdentifierVPC),
 				AvailabilityZone:                        zone.Name,
 				AssignIpv6AddressOnCreation:             ptr.To(isIPv6(c.getIpFamilies())),
-				CidrBlock:                               zone.Workers,
+				CidrBlock:                               workersCIDR,
 				Ipv6Native:                              ptr.To(!isIPv4(c.getIpFamilies())),
 				EnableResourceNameDnsAAAARecordOnLaunch: ptr.To(!isIPv4(c.getIpFamilies())),
 				EnableDns64:                             ptr.To(!isIPv4(c.getIpFamilies())),