Merge pull request #5379 from bear-redhat/issue/CORS-3936-upstream

✨Add support for public-only networking

Author: k8s-ci-robot

pkg/cloud/services/elb/loadbalancer.go

@@ -365,7 +365,8 @@ func (s *Service) getAPIServerLBSpec(elbName string, lbSpec *infrav1.AWSLoadBala
 		// The load balancer APIs require us to only attach one subnet for each AZ.
 		subnets := s.scope.Subnets().FilterPrivate().FilterNonCni()
 
-		if scheme == infrav1.ELBSchemeInternetFacing {
+		// public-only setup has no private subnets
+		if scheme == infrav1.ELBSchemeInternetFacing || len(subnets) == 0 {
 			subnets = s.scope.Subnets().FilterPublic().FilterNonCni()
 		}
 
@@ -1147,7 +1148,8 @@ func (s *Service) getAPIServerClassicELBSpec(elbName string) (*infrav1.LoadBalan
 		// The load balancer APIs require us to only attach one subnet for each AZ.
 		subnets := s.scope.Subnets().FilterPrivate().FilterNonCni()
 
-		if scheme == infrav1.ELBSchemeInternetFacing {
+		// public-only setup has no private subnets
+		if scheme == infrav1.ELBSchemeInternetFacing || len(subnets) == 0 {
 			subnets = s.scope.Subnets().FilterPublic().FilterNonCni()
 		}
 

pkg/cloud/services/network/subnets.go

@@ -175,10 +175,9 @@ func (s *Service) reconcileSubnets() error {
 
 	// When the VPC is managed by CAPA, we need to create the subnets.
 	if !unmanagedVPC {
-		// Check that we need at least 1 private and 1 public subnet after we have updated the metadata
+		// Check that we need at least 1 public subnet after we have updated the metadata
 		if len(subnets.FilterPrivate()) < 1 {
-			record.Warnf(s.scope.InfraCluster(), "FailedNoPrivateSubnet", "Expected at least 1 private subnet but got 0")
-			return errors.New("expected at least 1 private subnet but got 0")
+			record.Eventf(s.scope.InfraCluster(), "NoPrivateSubnet", "No private subnet found, this is a public-only setup")
 		}
 		if len(subnets.FilterPublic()) < 1 {
 			record.Warnf(s.scope.InfraCluster(), "FailedNoPublicSubnet", "Expected at least 1 public subnet but got 0")