Skip to content

Commit 7e4d988

Browse files
Merge pull request openshift#8083 from bfournie/disable-auto-subnets
OCPBUGS-30057: Don't auto create subnets for CAPG
2 parents 3d78a22 + 0fc1cb3 commit 7e4d988

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

pkg/asset/manifests/gcp/cluster.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
8888
}
8989

9090
subnets := []capg.SubnetSpec{master, worker}
91+
// Subnets should never be auto created, even in shared VPC installs
92+
autoCreateSubnets := false
9193

9294
labels := map[string]string{}
9395
labels[fmt.Sprintf("kubernetes-io-cluster-%s", clusterID.InfraID)] = "owned"
@@ -107,8 +109,9 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
107109
Network: capg.NetworkSpec{
108110
// TODO: Need a network project for installs where the network resources will exist in another
109111
// project such as shared vpc installs
110-
Name: ptr.To(networkName),
111-
Subnets: subnets,
112+
Name: ptr.To(networkName),
113+
Subnets: subnets,
114+
AutoCreateSubnetworks: ptr.To(autoCreateSubnets),
112115
},
113116
AdditionalLabels: labels,
114117
FailureDomains: findFailureDomains(installConfig),

0 commit comments

Comments
 (0)