nebius/SWE-rebench-V2-PRs huggingface dataset:
Repository: Azure/ARO-RP
Pull request #2155 (2022-06-03 14:47:11)

include openshift-operator-lifecycle-manager in monitoring
### Which issue this PR addresses:

Fixes the drop of monitoring 'openshift-operator-lifecycle-manager'. [ADO Ticket 14657169](https://msazure.visualstudio.com/AzureRedHatOpenShift/_workitems/edit/14657169/)

### What this PR does / why we need it:

We were previously monitoring this namespace which lead to a few clusters with unresolved issues. This PR is for the event we want to continue monitoring it.

### Test plan for issue:
unit test

### Is there any documentation that needs to be updated for this PR?

no.



Patch:
diff --git a/pkg/util/namespace/namespace.go b/pkg/util/namespace/namespace.go
index 3b9a98979..dbb4952b1 100644
--- a/pkg/util/namespace/namespace.go
+++ b/pkg/util/namespace/namespace.go
@@ -66,6 +66,7 @@ func IsOpenShiftNamespace(ns string) bool {
 		"openshift-oauth-apiserver":                        {},
 		"openshift-openstack-infra":                        {},
 		"openshift-operators":                              {},
+		"openshift-operator-lifecycle-manager":             {},
 		"openshift-ovirt-infra":                            {},
 		"openshift-sdn":                                    {},
 		"openshift-service-ca":                             {},


Test patch:
diff --git a/pkg/util/namespace/namespace_test.go b/pkg/util/namespace/namespace_test.go
index 23821b025..daa43858e 100644
--- a/pkg/util/namespace/namespace_test.go
+++ b/pkg/util/namespace/namespace_test.go
@@ -58,7 +58,7 @@ func TestIsOpenShiftNamespace(t *testing.T) {
 		},
 		{
 			namespace: "openshift-operator-lifecycle-manager",
-			want:      false,
+			want:      true,
 		},
 	} {
 		t.Run(tt.namespace, func(t *testing.T) {
Repository: Azure/ARO-RP
Pull request #2193 (2022-06-20 05:05:34)

Add some logging for the e2e cluster conditions check
### What this PR does / why we need it:
helps debug a flake

### Test plan for issue:

E2E test

### Is there any documentation that needs to be updated for this PR?

N/A



Patch:
diff --git a/Makefile b/Makefile
index 0d3c3fe9f..c278dd1bb 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,7 @@ validate-go:
 	@[ -z "$$(ls pkg/util/*.go 2>/dev/null)" ] || (echo error: go files are not allowed in pkg/util, use a subpackage; exit 1)
 	@[ -z "$$(find -name "*:*")" ] || (echo error: filenames with colons are not allowed on Windows, please rename; exit 1)
 	@sha256sum --quiet -c .sha256sum || (echo error: client library is stale, please run make client; exit 1)
-	go vet -tags containers_image_openpgp ./...
+	go vet ./...
 	go test -tags e2e -run ^$$ ./test/e2e/...
 
 validate-go-action:


Test patch:
diff --git a/test/e2e/operator.go b/test/e2e/operator.go
index 331e615a6..01dcdae45 100644
--- a/test/e2e/operator.go
+++ b/test/e2e/operator.go
@@ -17,6 +17,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/ghodss/yaml"
+	operatorv1 "github.com/openshift/api/operator/v1"
 	"github.com/ugorji/go/codec"
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -261,9 +262,14 @@ var _ = Describe("ARO Operator - RBAC", func() {
 
 var _ = Describe("ARO Operator - Conditions", func() {
 	Specify("Cluster check conditions should not be failing", func() {
+		// Save the last got conditions so that we can print them in the case of
+		// the test failing
+		var lastConditions []operatorv1.OperatorCondition
+
 		clusterOperatorConditionsValid := func() (bool, error) {
 			co, err := clients.AROClusters.AroV1alpha1().Clusters().Get(context.Background(), "cluster", metav1.GetOptions{})
 			Expect(err).NotTo(HaveOccurred())
+			lastConditions = co.Status.Conditions
 
 			valid := true
 			for _, condition := range arov1alpha1.ClusterChecksTypes() {
@@ -275,7 +281,7 @@ var _ = Describe("ARO Operator - Conditions", func() {
 		}
 
 		err := wait.PollImmediate(30*time.Second, 15*time.Minute, clusterOperatorConditionsValid)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(err).NotTo(HaveOccurred(), "last conditions: %v", lastConditions)
 	})
 })