Reapply "OCPBUGS-60853: make TLS registry tests required"

This reverts commit 714b0f2.

Author: wangke19

test/extended/operators/certs.go

@@ -276,11 +276,8 @@ var _ = g.Describe(fmt.Sprintf("[sig-arch][Late][Jira:%q]", "kube-apiserver"), g
 		if len(newTLSRegistry.CertKeyPairs) > 0 || len(newTLSRegistry.CertificateAuthorityBundles) > 0 {
 			registryString, err := json.MarshalIndent(newTLSRegistry, "", "  ")
 			if err != nil {
-				// g.Fail("Failed to marshal registry %#v: %v", newTLSRegistry, err)
 				testresult.Flakef("Failed to marshal registry %#v: %v", newTLSRegistry, err)
 			}
-			// TODO: uncomment when test no longer fails and enhancement is merged
-			// g.Fail(fmt.Sprintf("Unregistered TLS certificates:\n%s", registryString))
 			testresult.Flakef("Unregistered TLS certificates found:\n%s\nSee tls/ownership/README.md in origin repo", registryString)
 		}
 	})
@@ -291,9 +288,13 @@ var _ = g.Describe(fmt.Sprintf("[sig-arch][Late][Jira:%q]", "kube-apiserver"), g
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		if len(messages) > 0 {
+<<<<<<< HEAD
 			// TODO: uncomment when test no longer fails and enhancement is merged
 			// g.Fail(strings.Join(messages, "\n"))
 			testresult.Flakef("%s", strings.Join(messages, "\n"))
+=======
+			g.Fail(strings.Join(messages, "\n"))
+>>>>>>> 1e1a521985 (Reapply "OCPBUGS-60853: make TLS registry tests required")
 		}
 	})