Check public DNS zone when reporting status

When reporting the "DNSReady" status condition on an IngressController,
check the status conditions for both the public zone and the private zone
of the associated DNSRecord.

Before this commit, only the status condition for the private zone was used
to compute the "DNSReady" status condition.  If the operator failed to
publish a DNS record in the public zone, this failure was not reported in
the IngressController's status conditions or the "ingress" clusteroperator
status conditions.

Follow-up to commit 9f32923.

This commit fixes OCPBUGS-15978.

https://issues.redhat.com/browse/OCPBUGS-15978

* pkg/operator/controller/ingress/status.go (checkZoneInConfig): Use the
new zonesMatch helper function to check both the public zone as well as the
private zone.
(zonesMatch): New function.  Return a Boolean value indicating whether two
DNS zones match, based on their respective ID or "Name" tags.
* pkg/operator/controller/ingress/status_test.go (TestZoneInConfig): Verify
that checkZoneInConfig checks the public zone as well as the private zone.

pkg/operator/controller/ingress/status.go

@@ -1059,19 +1059,23 @@ func computeDNSStatus(ic *operatorv1.IngressController, wildcardRecord *iov1.DNS
 
 // checkZoneInConfig - private utility to check for a zone in the current config
 func checkZoneInConfig(dnsConfig *configv1.DNS, zone configv1.DNSZone) bool {
-	// check PrivateZone settings only
-	// check for private zone ID
-	if dnsConfig.Spec.PrivateZone != nil && dnsConfig.Spec.PrivateZone.ID != "" && zone.ID != "" {
-		if dnsConfig.Spec.PrivateZone.ID == zone.ID {
-			return true
-		}
+	return zonesMatch(&zone, dnsConfig.Spec.PublicZone) || zonesMatch(&zone, dnsConfig.Spec.PrivateZone)
+}
+
+// zonesMatch returns a Boolean value indicating whether two DNS zones have the
+// matching ID or "Name" tag.  If either or both zones are nil, this function
+// returns false.
+func zonesMatch(a, b *configv1.DNSZone) bool {
+	if a == nil || b == nil {
+		return false
 	}
 
-	// check for private zone Tags
-	if dnsConfig.Spec.PrivateZone != nil && dnsConfig.Spec.PrivateZone.Tags["Name"] != "" && zone.Tags["Name"] != "" {
-		if dnsConfig.Spec.PrivateZone.Tags["Name"] == zone.Tags["Name"] {
-			return true
-		}
+	if a.ID != "" && b.ID != "" && a.ID == b.ID {
+		return true
+	}
+
+	if a.Tags["Name"] != "" && b.Tags["Name"] != "" && a.Tags["Name"] == b.Tags["Name"] {
+		return true
 	}
 
 	return false

pkg/operator/controller/ingress/status_test.go

@@ -2180,6 +2180,12 @@ func TestZoneInConfig(t *testing.T) {
 			if actual != test.expected {
 				t.Errorf("expected:%v actual:%v\n", test.expected, actual)
 			}
+			dnsSpec = configv1.DNSSpec{PublicZone: z}
+			dnsConfig = &configv1.DNS{Spec: dnsSpec}
+			actual = checkZoneInConfig(dnsConfig, dnsZone)
+			if actual != test.expected {
+				t.Errorf("expected:%v actual:%v\n", test.expected, actual)
+			}
 		})
 	}
 }