Merge pull request #8062 from openshift-cherrypick-robot/cherry-pick-…

…7932-to-release-4.15

[release-4.15] OCPBUGS-29929: GCP Destroy cleanup correct zones/records

pkg/asset/cluster/gcp/gcp.go

@@ -10,10 +10,16 @@ import (
 
 // Metadata converts an install configuration to GCP metadata.
 func Metadata(config *types.InstallConfig) *gcp.Metadata {
+	// leave the private zone domain blank when not using a pre-created private zone
+	privateZoneDomain := fmt.Sprintf("%s.", config.ClusterDomain())
+	if config.GCP.Network == "" || config.GCP.NetworkProjectID == "" {
+		privateZoneDomain = ""
+	}
+
 	return &gcp.Metadata{
 		Region:            config.Platform.GCP.Region,
 		ProjectID:         config.Platform.GCP.ProjectID,
 		NetworkProjectID:  config.Platform.GCP.NetworkProjectID,
-		PrivateZoneDomain: fmt.Sprintf("%s.", config.ClusterDomain()),
+		PrivateZoneDomain: privateZoneDomain,
 	}
 }