Merge pull request #7846 from sadasu/CORS-2376

openshift-merge-bot[bot] · web-flow · commit f6248991f2f8 · 2023-12-20T13:26:20.000Z
CORS-2315: GCP: Skip populating Private/Public Zones within DNS manifest
diff --git a/pkg/asset/manifests/dns.go b/pkg/asset/manifests/dns.go
@@ -148,6 +148,13 @@ func (d *DNS) Generate(dependencies asset.Parents) error {
 			}
 		}
 	case gcptypes.Name:
+		// We donot want to configure cloud DNS when `UserProvisionedDNS` is enabled.
+		// So, do not set PrivateZone and PublicZone fields in the DNS manifest.
+		if installConfig.Config.GCP.UserProvisionedDNS == gcptypes.UserProvisionedDNSEnabled {
+			config.Spec.PublicZone = &configv1.DNSZone{ID: ""}
+			config.Spec.PrivateZone = &configv1.DNSZone{ID: ""}
+			break
+		}
 		client, err := icgcp.NewClient(context.Background())
 		if err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,13 @@ func (d *DNS) Generate(dependencies asset.Parents) error {`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`case gcptypes.Name:`
	`151`	+ // We donot want to configure cloud DNS when `UserProvisionedDNS` is enabled.
	`152`	`+ // So, do not set PrivateZone and PublicZone fields in the DNS manifest.`
	`153`	`+ if installConfig.Config.GCP.UserProvisionedDNS == gcptypes.UserProvisionedDNSEnabled {`
	`154`	`+ config.Spec.PublicZone = &configv1.DNSZone{ID: ""}`
	`155`	`+ config.Spec.PrivateZone = &configv1.DNSZone{ID: ""}`
	`156`	`+ break`
	`157`	`+ }`
`151`	`158`	`client, err := icgcp.NewClient(context.Background())`
`152`	`159`	`if err != nil {`
`153`	`160`	`return err`