From 42ad8a3b3df42472d8ddfefc7c145b34ba42a08b Mon Sep 17 00:00:00 2001 From: Richard Case Date: Thu, 12 Oct 2023 11:41:22 +0200 Subject: [PATCH 1/3] wip: eks e2e changes Signed-off-by: Richard Case --- pkg/cloud/services/eks/cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cloud/services/eks/cluster.go b/pkg/cloud/services/eks/cluster.go index ffc502af04..bb660c323a 100644 --- a/pkg/cloud/services/eks/cluster.go +++ b/pkg/cloud/services/eks/cluster.go @@ -278,7 +278,7 @@ func makeVpcConfig(subnets infrav1.Subnets, endpointAccess ekscontrolplanev1.End subnetIds := make([]*string, 0) for i := range subnets { subnet := subnets[i] - subnetIds = append(subnetIds, &subnet.ID) + subnetIds = append(subnetIds, &subnet.ResourceID) } cidrs := make([]*string, 0) From 3f5eccbda27bd9720025e304bc137720a3063899 Mon Sep 17 00:00:00 2001 From: Richard Case Date: Thu, 12 Oct 2023 16:16:48 +0200 Subject: [PATCH 2/3] wip: eks e2e changes Signed-off-by: Richard Case --- pkg/cloud/services/network/routetables.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/cloud/services/network/routetables.go b/pkg/cloud/services/network/routetables.go index 934ff65fbb..b9ec4fb7b2 100644 --- a/pkg/cloud/services/network/routetables.go +++ b/pkg/cloud/services/network/routetables.go @@ -115,6 +115,7 @@ func (s *Service) reconcileRouteTables() error { // Not recording "SuccessfulTagRouteTable" here as we don't know if this was a no-op or an actual change continue } + s.scope.Debug("Subnet isn't associated with route table", "subnet-id", sn.GetResourceID()) // For each subnet that doesn't have a routing table associated with it, // create a new table with the appropriate default routes and associate it to the subnet. From e53f691478901baf3aa97b8c16ae2a166ba10079 Mon Sep 17 00:00:00 2001 From: Richard Case Date: Fri, 13 Oct 2023 15:37:19 +0200 Subject: [PATCH 3/3] chore: fix eks e2e After the recenet change around the subnets the e2e where breaking as it wasn't using the new resource id field. Signed-off-by: Richard Case --- pkg/cloud/services/eks/cluster.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cloud/services/eks/cluster.go b/pkg/cloud/services/eks/cluster.go index bb660c323a..c7d786a690 100644 --- a/pkg/cloud/services/eks/cluster.go +++ b/pkg/cloud/services/eks/cluster.go @@ -278,7 +278,8 @@ func makeVpcConfig(subnets infrav1.Subnets, endpointAccess ekscontrolplanev1.End subnetIds := make([]*string, 0) for i := range subnets { subnet := subnets[i] - subnetIds = append(subnetIds, &subnet.ResourceID) + subnetID := subnet.GetResourceID() + subnetIds = append(subnetIds, &subnetID) } cidrs := make([]*string, 0)