Skip to content

Commit 8f2d5e2

Browse files
mtulioopenshift-cherrypick-robot
authored and
openshift-cherrypick-robot
committed
OCPBUGS-48827: aws/edge/byovpc: tag edge subnets with shared value
Previously the subnets created by user (BYO VPC) on edge zones (Local or Wavelength zones) were not tagged with kubernetes.io/cluster/<InfraID>:shared. This change ensures installer is also setting the same cluster tag as regular zones.
1 parent be329dc commit 8f2d5e2

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

pkg/asset/cluster/aws/aws.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,21 @@ func tagSharedVPCResources(ctx context.Context, clusterID string, installConfig
5757
return err
5858
}
5959

60-
ids := make([]*string, 0, len(privateSubnets)+len(publicSubnets))
60+
edgeSubnets, err := installConfig.AWS.EdgeSubnets(ctx)
61+
if err != nil {
62+
return err
63+
}
64+
65+
ids := make([]*string, 0, len(privateSubnets)+len(publicSubnets)+len(edgeSubnets))
6166
for id := range privateSubnets {
6267
ids = append(ids, aws.String(id))
6368
}
6469
for id := range publicSubnets {
6570
ids = append(ids, aws.String(id))
6671
}
72+
for id := range edgeSubnets {
73+
ids = append(ids, aws.String(id))
74+
}
6775

6876
session, err := installConfig.AWS.Session(ctx)
6977
if err != nil {

0 commit comments

Comments
 (0)