Renamed the already context aware ipv6CidrBlock and pool to cidrBlock and added unmanaged calico guide with ClusterResourceSet

Skarlso · Skarlso · commit 4c66c957a59d · 2022-09-02T17:51:56.000+02:00
diff --git a/api/v1alpha3/awscluster_conversion.go b/api/v1alpha3/awscluster_conversion.go
@@ -18,6 +18,7 @@ package v1alpha3
 
 import (
 	"fmt"
+
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	clusterv1alpha3 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -60,8 +61,8 @@ func (r *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
 			dst.Spec.NetworkSpec.VPC.IPv6 = &infrav1.IPv6{}
 		}
 		dst.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID = restored.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID
-		dst.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock
-		dst.Spec.NetworkSpec.VPC.IPv6.IPv6Pool = restored.Spec.NetworkSpec.VPC.IPv6.IPv6Pool
+		dst.Spec.NetworkSpec.VPC.IPv6.CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.CidrBlock
+		dst.Spec.NetworkSpec.VPC.IPv6.PoolID = restored.Spec.NetworkSpec.VPC.IPv6.PoolID
 	}
 
 	for i := range dst.Spec.NetworkSpec.Subnets {
diff --git a/api/v1alpha4/awscluster_conversion.go b/api/v1alpha4/awscluster_conversion.go
@@ -54,8 +54,8 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
 			dst.Spec.NetworkSpec.VPC.IPv6 = &infrav1.IPv6{}
 		}
 		dst.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID = restored.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID
-		dst.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock
-		dst.Spec.NetworkSpec.VPC.IPv6.IPv6Pool = restored.Spec.NetworkSpec.VPC.IPv6.IPv6Pool
+		dst.Spec.NetworkSpec.VPC.IPv6.CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.CidrBlock
+		dst.Spec.NetworkSpec.VPC.IPv6.PoolID = restored.Spec.NetworkSpec.VPC.IPv6.PoolID
 	}
 
 	for i := range dst.Spec.NetworkSpec.Subnets {
diff --git a/api/v1beta1/network_types.go b/api/v1beta1/network_types.go
@@ -167,13 +167,13 @@ type NetworkSpec struct {
 
 // IPv6 contains ipv6 specific settings for the network.
 type IPv6 struct {
-	// IPv6CidrBlock is the CIDR block provided by Amazon when VPC has enabled IPv6.
+	// CidrBlock is the CIDR block provided by Amazon when VPC has enabled IPv6.
 	// +optional
-	IPv6CidrBlock string `json:"ipv6CidrBlock,omitempty"`
+	CidrBlock string `json:"cidrBlock,omitempty"`
 
-	// IPv6Pool is the IP pool which must be defined in case of BYO IP is defined.
+	// PoolID is the IP pool which must be defined in case of BYO IP is defined.
 	// +optional
-	IPv6Pool string `json:"ipv6Pool,omitempty"`
+	PoolID string `json:"poolId,omitempty"`
 
 	// EgressOnlyInternetGatewayID is the id of the egress only internet gateway associated with an IPv6 enabled VPC.
 	// +optional
diff --git a/bootstrap/eks/controllers/eksconfig_controller.go b/bootstrap/eks/controllers/eksconfig_controller.go
@@ -211,7 +211,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
 	// we don't want to override any manually set configuration options.
 	if config.Spec.ServiceIPV6Cidr == nil && controlPlane.Spec.NetworkSpec.VPC.IsIPv6Enabled() {
 		log.Info("Adding ipv6 data to userdata....")
-		nodeInput.ServiceIPV6Cidr = pointer.String(controlPlane.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock)
+		nodeInput.ServiceIPV6Cidr = pointer.String(controlPlane.Spec.NetworkSpec.VPC.IPv6.CidrBlock)
 		nodeInput.IPFamily = pointer.String("ipv6")
 	}
 
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml
@@ -2601,17 +2601,17 @@ spec:
                         description: IPv6 contains ipv6 specific settings for the
                           network.
                         properties:
+                          cidrBlock:
+                            description: CidrBlock is the CIDR block provided by Amazon
+                              when VPC has enabled IPv6.
+                            type: string
                           egressOnlyInternetGatewayId:
                             description: EgressOnlyInternetGatewayID is the id of
                               the egress only internet gateway associated with an
                               IPv6 enabled VPC.
                             type: string
-                          ipv6CidrBlock:
-                            description: IPv6CidrBlock is the CIDR block provided
-                              by Amazon when VPC has enabled IPv6.
-                            type: string
-                          ipv6Pool:
-                            description: IPv6Pool is the IP pool which must be defined
+                          poolId:
+                            description: PoolID is the IP pool which must be defined
                               in case of BYO IP is defined.
                             type: string
                         type: object
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml
@@ -1859,17 +1859,17 @@ spec:
                         description: IPv6 contains ipv6 specific settings for the
                           network.
                         properties:
+                          cidrBlock:
+                            description: CidrBlock is the CIDR block provided by Amazon
+                              when VPC has enabled IPv6.
+                            type: string
                           egressOnlyInternetGatewayId:
                             description: EgressOnlyInternetGatewayID is the id of
                               the egress only internet gateway associated with an
                               IPv6 enabled VPC.
                             type: string
-                          ipv6CidrBlock:
-                            description: IPv6CidrBlock is the CIDR block provided
-                              by Amazon when VPC has enabled IPv6.
-                            type: string
-                          ipv6Pool:
-                            description: IPv6Pool is the IP pool which must be defined
+                          poolId:
+                            description: PoolID is the IP pool which must be defined
                               in case of BYO IP is defined.
                             type: string
                         type: object
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml
@@ -693,17 +693,17 @@ spec:
                                 description: IPv6 contains ipv6 specific settings
                                   for the network.
                                 properties:
+                                  cidrBlock:
+                                    description: CidrBlock is the CIDR block provided
+                                      by Amazon when VPC has enabled IPv6.
+                                    type: string
                                   egressOnlyInternetGatewayId:
                                     description: EgressOnlyInternetGatewayID is the
                                       id of the egress only internet gateway associated
                                       with an IPv6 enabled VPC.
                                     type: string
-                                  ipv6CidrBlock:
-                                    description: IPv6CidrBlock is the CIDR block provided
-                                      by Amazon when VPC has enabled IPv6.
-                                    type: string
-                                  ipv6Pool:
-                                    description: IPv6Pool is the IP pool which must
+                                  poolId:
+                                    description: PoolID is the IP pool which must
                                       be defined in case of BYO IP is defined.
                                     type: string
                                 type: object
diff --git a/controlplane/eks/api/v1alpha3/conversion.go b/controlplane/eks/api/v1alpha3/conversion.go
@@ -53,8 +53,8 @@ func (r *AWSManagedControlPlane) ConvertTo(dstRaw conversion.Hub) error {
 			dst.Spec.NetworkSpec.VPC.IPv6 = &infrav1beta1.IPv6{}
 		}
 		dst.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID = restored.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID
-		dst.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock
-		dst.Spec.NetworkSpec.VPC.IPv6.IPv6Pool = restored.Spec.NetworkSpec.VPC.IPv6.IPv6Pool
+		dst.Spec.NetworkSpec.VPC.IPv6.CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.CidrBlock
+		dst.Spec.NetworkSpec.VPC.IPv6.PoolID = restored.Spec.NetworkSpec.VPC.IPv6.PoolID
 	}
 
 	for i := range dst.Spec.NetworkSpec.Subnets {
diff --git a/controlplane/eks/api/v1alpha4/conversion.go b/controlplane/eks/api/v1alpha4/conversion.go
@@ -49,8 +49,8 @@ func (r *AWSManagedControlPlane) ConvertTo(dstRaw conversion.Hub) error {
 			dst.Spec.NetworkSpec.VPC.IPv6 = &infrav1beta1.IPv6{}
 		}
 		dst.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID = restored.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID
-		dst.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock
-		dst.Spec.NetworkSpec.VPC.IPv6.IPv6Pool = restored.Spec.NetworkSpec.VPC.IPv6.IPv6Pool
+		dst.Spec.NetworkSpec.VPC.IPv6.CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.CidrBlock
+		dst.Spec.NetworkSpec.VPC.IPv6.PoolID = restored.Spec.NetworkSpec.VPC.IPv6.PoolID
 	}
 
 	for i := range dst.Spec.NetworkSpec.Subnets {
diff --git a/controlplane/eks/api/v1beta1/awsmanagedcontrolplane_webhook.go b/controlplane/eks/api/v1beta1/awsmanagedcontrolplane_webhook.go
@@ -387,9 +387,9 @@ func (r *AWSManagedControlPlane) validateDisableVPCCNI() field.ErrorList {
 func (r *AWSManagedControlPlane) validateNetwork() field.ErrorList {
 	var allErrs field.ErrorList
 
-	if r.Spec.NetworkSpec.VPC.IsIPv6Enabled() && r.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock != "" && r.Spec.NetworkSpec.VPC.IPv6.IPv6Pool == "" {
-		poolField := field.NewPath("spec", "networkSpec", "vpc", "ipv6Pool")
-		allErrs = append(allErrs, field.Invalid(poolField, r.Spec.NetworkSpec.VPC.IPv6.IPv6Pool, "ipv6Pool cannot be empty if ipv6CidrBlock is set for BYOIP"))
+	if r.Spec.NetworkSpec.VPC.IsIPv6Enabled() && r.Spec.NetworkSpec.VPC.IPv6.CidrBlock != "" && r.Spec.NetworkSpec.VPC.IPv6.PoolID == "" {
+		poolField := field.NewPath("spec", "networkSpec", "vpc", "poolId")
+		allErrs = append(allErrs, field.Invalid(poolField, r.Spec.NetworkSpec.VPC.IPv6.PoolID, "poolId cannot be empty if cidrBlock is set"))
 	}
 
 	return allErrs
diff --git a/controlplane/eks/api/v1beta1/awsmanagedcontrolplane_webhook_test.go b/controlplane/eks/api/v1beta1/awsmanagedcontrolplane_webhook_test.go
@@ -420,17 +420,17 @@ func TestWebhookCreate_IPv6Details(t *testing.T) {
 			},
 		},
 		{
-			name:        "ipv6 with BYOIP but pool is left empty",
+			name:        "ipv6 cidr block is set but pool is left empty",
 			kubeVersion: "v1.18",
 			networkSpec: infrav1.NetworkSpec{
 				VPC: infrav1.VPCSpec{
 					IPv6: &infrav1.IPv6{
-						IPv6CidrBlock: "not-empty",
-						// IPv6Pool is empty
+						CidrBlock: "not-empty",
+						// PoolID is empty
 					},
 				},
 			},
-			err: "ipv6Pool cannot be empty if ipv6CidrBlock is set for BYOIP",
+			err: "poolId cannot be empty if cidrBlock is set",
 		},
 	}
 
diff --git a/docs/book/src/topics/eks/ipv6-enabled-cluster.md b/docs/book/src/topics/eks/ipv6-enabled-cluster.md
@@ -39,8 +39,8 @@ spec:
   network:
     vpc:
       ipv6:
-        ipv6Pool: pool-id
-        ipv6CidrBlock: "2009:1234:ff00::/56"
+        poolId: pool-id
+        cidrBlock: "2009:1234:ff00::/56"
 ```
 
 ### Requirements
@@ -125,7 +125,7 @@ The extra configs are on the kubeadm side. These are `node-ip` and `bind-address
 This will tell kubeadm to bind to a specific address type which should be IPv6.
 
 Next, it's pod CIDRs and service CIDRs. This is a bit more tricky. You need to know your IPv6 CIDR beforehand.
-Having your own IPv6 pool is most of the times, impractical. But there is a way to get you started up quickly
+Having your own IPv6 pool is most of the time, impractical. But there is a way to get you started up quickly
 and with low effort. You can ask CAPA to create the network topology for you with a simple cluster config such
 as this one:
 
@@ -159,7 +159,7 @@ spec:
 This will create a VPC with proper load-balancing and elastic ips and everything. This can be fine-tuned as
 desired. This is the bare minimum where CAPA creates the whole topology.
 
-Once this is done, we can acquire the IPv6 CIDR and we can continue by using the vpc id and subnets in the
+Once this is done, we can acquire the IPv6 CIDR, and we can continue by using the vpc id and subnets in the
 unmanaged setting like this:
 
 ```yaml
@@ -171,7 +171,7 @@ metadata:
 spec:
   clusterNetwork:
     services:
-      cidrBlocks: ["192.168.0.0/16", "2a05:d014:852:f::/56"]
+      cidrBlocks: ["192.168.0.0/16", "2a05:d014:852:f::/112"]
     pods:
       cidrBlocks: ["192.168.0.0/16", "2a05:d014:852:f::/56"]
   infrastructureRef:
@@ -221,6 +221,41 @@ to `112`.
 Once this is done, we can install Cilium into the workload cluster and restart all Pods so they can acquire IPv6
 addresses.
 
-### Putting it all together
+### Calico
+
+Another approach is to use Calico. Calico has detailed guides on how to set up IPv6 located [here](https://projectcalico.docs.tigera.io/networking/ipv6) and [here](https://projectcalico.docs.tigera.io/networking/ipv6-control-plane).
+
+You can use CAPA to bootstrap Calico in the following way:
 
-All new pods will acquire an IPv6 address, however, existing pods, such as kube-proxy, will remain with IPv4 addresses.
+- Create a ClusterResourceSet like this:
+```yaml
+apiVersion: addons.cluster.x-k8s.io/v1alpha3
+kind: ClusterResourceSet
+metadata:
+ name: crs1
+ namespace: default
+spec:
+ mode: "ApplyOnce"
+ clusterSelector:
+   matchLabels:
+     cni: calico
+ resources:
+   - name: db-secret
+     kind: Secret
+   - name: calico-addon
+     kind: ConfigMap
+```
+- Download the latest Calico manifest and set up the required properties for IPv6 as the guides suggest ( you will already 
+  need to have an IPv6 CIDR )
+- Create a config map in the control plane with the following command: `kubectl create configmap calico-addon --from-file=calico.yaml`
+- Tag your cluster with the label `cni: calico` so cluster-api can find it and install the cni addon
+```yaml
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: "test-ipv6-unmanaged-2"
+  labels:
+    cni: calico
+```
+- Apply and monitor
+- Note that only new pods will get an ipv6 address; existing pods will remain using ipv4
diff --git a/docs/proposal/20220718-ipv6.md b/docs/proposal/20220718-ipv6.md
@@ -129,13 +129,13 @@ Where the IPv6 struct is as follows:
 ```go
 // IPv6 contains ipv6 specific settings for the network.
 type IPv6 struct {
-	// IPv6CidrBlock is the CIDR block provided by Amazon when VPC has enabled IPv6.
+	// CidrBlock is the CIDR block provided by Amazon when VPC has enabled IPv6.
 	// +optional
-	IPv6CidrBlock string `json:"ipv6CidrBlock,omitempty"`
+	CidrBlock string `json:"cidrBlock,omitempty"`
 
-	// IPv6Pool is the IP pool which must be defined in case of BYO IP is defined.
+	// PoolID is the IP pool which must be defined in case of BYO IP is defined.
 	// +optional
-	IPv6Pool string `json:"ipv6Pool,omitempty"`
+	PoolID string `json:"poolId,omitempty"`
 
 	// EgressOnlyInternetGatewayID is the id of the egress only internet gateway associated with an IPv6 enabled VPC.
 	// +optional
@@ -149,8 +149,8 @@ This results in the following yaml settings to the end-user:
   network:
     vpc:
       ipv6:
-        ipv6CidrBlock: 2001:db8:1234:1a03::/64
-        ipv6pool: pool-id
+        cidrBlock: 2001:db8:1234:1a03::/64
+        poolId: pool-id
         egressOnlyInternetGatewayId: eiwg-1234
 ```
 
diff --git a/pkg/cloud/services/eks/cluster_test.go b/pkg/cloud/services/eks/cluster_test.go
@@ -690,7 +690,7 @@ func TestCreateIPv6Cluster(t *testing.T) {
 	}
 	vpcSpec := infrav1.VPCSpec{
 		IPv6: &infrav1.IPv6{
-			IPv6CidrBlock: "2001:db8:85a3::/56",
+			CidrBlock: "2001:db8:85a3::/56",
 		},
 	}
 	scope, err := scope.NewManagedControlPlaneScope(scope.ManagedControlPlaneScopeParams{
diff --git a/pkg/cloud/services/network/routetables_test.go b/pkg/cloud/services/network/routetables_test.go
@@ -118,8 +118,8 @@ func TestReconcileRouteTables(t *testing.T) {
 					InternetGatewayID: aws.String("igw-01"),
 					IPv6: &infrav1.IPv6{
 						EgressOnlyInternetGatewayID: aws.String("eigw-01"),
-						IPv6CidrBlock:               "2001:db8:1234::/56",
-						IPv6Pool:                    "my-pool",
+						CidrBlock:                   "2001:db8:1234::/56",
+						PoolID:                      "my-pool",
 					},
 					Tags: infrav1.Tags{
 						infrav1.ClusterTagKey("test-cluster"): "owned",
@@ -203,8 +203,8 @@ func TestReconcileRouteTables(t *testing.T) {
 					ID:                "vpc-routetables",
 					InternetGatewayID: aws.String("igw-01"),
 					IPv6: &infrav1.IPv6{
-						IPv6CidrBlock:               "2001:db8:1234::/56",
-						IPv6Pool:                    "my-pool",
+						CidrBlock:                   "2001:db8:1234::/56",
+						PoolID:                      "my-pool",
 						EgressOnlyInternetGatewayID: aws.String("eigw-01"),
 					},
 					Tags: infrav1.Tags{
diff --git a/pkg/cloud/services/network/subnets.go b/pkg/cloud/services/network/subnets.go
@@ -234,9 +234,9 @@ func (s *Service) getDefaultSubnets() (infrav1.Subnets, error) {
 	privateSubnetCIDRs := append(subnetCIDRs[:0], subnetCIDRs[1:]...)
 
 	if s.scope.VPC().IsIPv6Enabled() {
-		ipv6SubnetCIDRs, err = cidr.SplitIntoSubnetsIPv6(s.scope.VPC().IPv6.IPv6CidrBlock, numSubnets)
+		ipv6SubnetCIDRs, err = cidr.SplitIntoSubnetsIPv6(s.scope.VPC().IPv6.CidrBlock, numSubnets)
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed splitting IPv6 VPC CIDR %q into subnets", s.scope.VPC().IPv6.IPv6CidrBlock)
+			return nil, errors.Wrapf(err, "failed splitting IPv6 VPC CIDR %q into subnets", s.scope.VPC().IPv6.CidrBlock)
 		}
 
 		// We need to take the last, so it doesn't conflict with the rest. The subnetID is increment each time by 1.
diff --git a/pkg/cloud/services/network/subnets_test.go b/pkg/cloud/services/network/subnets_test.go
@@ -1083,8 +1083,8 @@ func TestReconcileSubnets(t *testing.T) {
 					},
 					CidrBlock: defaultVPCCidr,
 					IPv6: &infrav1.IPv6{
-						IPv6CidrBlock: "2001:db8:1234:1a01::/56",
-						IPv6Pool:      "amazon",
+						CidrBlock: "2001:db8:1234:1a01::/56",
+						PoolID:    "amazon",
 					},
 				},
 				Subnets: []infrav1.SubnetSpec{},
diff --git a/pkg/cloud/services/network/vpc.go b/pkg/cloud/services/network/vpc.go
diff --git a/pkg/cloud/services/network/vpc_test.go b/pkg/cloud/services/network/vpc_test.go

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {`
`54`	`54`	`dst.Spec.NetworkSpec.VPC.IPv6 = &infrav1.IPv6{}`
`55`	`55`	`}`
`56`	`56`	`dst.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID = restored.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID`
`57`		`- dst.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock`
`58`		`- dst.Spec.NetworkSpec.VPC.IPv6.IPv6Pool = restored.Spec.NetworkSpec.VPC.IPv6.IPv6Pool`
	`57`	`+ dst.Spec.NetworkSpec.VPC.IPv6.CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.CidrBlock`
	`58`	`+ dst.Spec.NetworkSpec.VPC.IPv6.PoolID = restored.Spec.NetworkSpec.VPC.IPv6.PoolID`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`for i := range dst.Spec.NetworkSpec.Subnets {`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func (r EKSConfigReconciler) joinWorker(ctx context.Context, cluster clusterv1`
`211`	`211`	`// we don't want to override any manually set configuration options.`
`212`	`212`	`if config.Spec.ServiceIPV6Cidr == nil && controlPlane.Spec.NetworkSpec.VPC.IsIPv6Enabled() {`
`213`	`213`	`log.Info("Adding ipv6 data to userdata....")`
`214`		`- nodeInput.ServiceIPV6Cidr = pointer.String(controlPlane.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock)`
	`214`	`+ nodeInput.ServiceIPV6Cidr = pointer.String(controlPlane.Spec.NetworkSpec.VPC.IPv6.CidrBlock)`
`215`	`215`	`nodeInput.IPFamily = pointer.String("ipv6")`
`216`	`216`	`}`
`217`	`217`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ func (r *AWSManagedControlPlane) ConvertTo(dstRaw conversion.Hub) error {`
`53`	`53`	`dst.Spec.NetworkSpec.VPC.IPv6 = &infrav1beta1.IPv6{}`
`54`	`54`	`}`
`55`	`55`	`dst.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID = restored.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID`
`56`		`- dst.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock`
`57`		`- dst.Spec.NetworkSpec.VPC.IPv6.IPv6Pool = restored.Spec.NetworkSpec.VPC.IPv6.IPv6Pool`
	`56`	`+ dst.Spec.NetworkSpec.VPC.IPv6.CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.CidrBlock`
	`57`	`+ dst.Spec.NetworkSpec.VPC.IPv6.PoolID = restored.Spec.NetworkSpec.VPC.IPv6.PoolID`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`for i := range dst.Spec.NetworkSpec.Subnets {`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ func (r *AWSManagedControlPlane) ConvertTo(dstRaw conversion.Hub) error {`
`49`	`49`	`dst.Spec.NetworkSpec.VPC.IPv6 = &infrav1beta1.IPv6{}`
`50`	`50`	`}`
`51`	`51`	`dst.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID = restored.Spec.NetworkSpec.VPC.IPv6.EgressOnlyInternetGatewayID`
`52`		`- dst.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.IPv6CidrBlock`
`53`		`- dst.Spec.NetworkSpec.VPC.IPv6.IPv6Pool = restored.Spec.NetworkSpec.VPC.IPv6.IPv6Pool`
	`52`	`+ dst.Spec.NetworkSpec.VPC.IPv6.CidrBlock = restored.Spec.NetworkSpec.VPC.IPv6.CidrBlock`
	`53`	`+ dst.Spec.NetworkSpec.VPC.IPv6.PoolID = restored.Spec.NetworkSpec.VPC.IPv6.PoolID`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`for i := range dst.Spec.NetworkSpec.Subnets {`