Skip to content

Commit 6b65db2

Browse files
remove unnecessary exceptions from monitoring test
1 parent 02f8514 commit 6b65db2

1 file changed

Lines changed: 7 additions & 46 deletions

File tree

  • pkg/monitortests/authentication/nodefaultserviceaccountoperatortests

pkg/monitortests/authentication/nodefaultserviceaccountoperatortests/monitortest.go

Lines changed: 7 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -42,55 +42,16 @@ func exceptionWithJira(prefix, jiraURL string) func(corev1.Pod) (string, bool) {
4242

4343
// OpenShift components should not be using the default service account.
4444
// Therefore, no new components should be added to this list.
45+
// The following are current exceptions due to not being part of the core OpenShift
46+
// payload.
4547
var exceptions = []func(pod corev1.Pod) (string, bool){
46-
exceptionWithJira("openshift-cluster-version/cluster-version-operator-", "https://issues.redhat.com/browse/OCPBUGS-65621"),
47-
exceptionWithJira("openshift-console/downloads-", "https://issues.redhat.com/browse/OCPBUGS-65622"),
48-
exceptionWithJira("openshift-etcd/etcd-guard-", "https://issues.redhat.com/browse/OCPBUGS-65626"),
49-
exceptionWithJira("openshift-ingress-canary/ingress-canary-", "https://issues.redhat.com/browse/OCPBUGS-65629"),
50-
exceptionWithJira("openshift-kube-apiserver/kube-apiserver-guard-", "https://issues.redhat.com/browse/OCPBUGS-65626"),
51-
exceptionWithJira("openshift-kube-controller-manager/kube-controller-manager-guard-", "https://issues.redhat.com/browse/OCPBUGS-65626"),
52-
exceptionWithJira("openshift-kube-scheduler/openshift-kube-scheduler-guard-", "https://issues.redhat.com/browse/OCPBUGS-65626"),
53-
exceptionWithJira("openshift-monitoring/monitoring-plugin-", "https://issues.redhat.com/browse/OCPBUGS-65630"),
48+
// This exception is being kept as there is still an open PR for this ticket.
49+
// TODO(ehearne-redhat): check back on this ticket to review progress.
5450
exceptionWithJira("openshift-multus/multus-", "https://issues.redhat.com/browse/OCPBUGS-65631"),
55-
exceptionWithJira("openshift-network-console/networking-console-plugin-", "https://issues.redhat.com/browse/OCPBUGS-65633"),
56-
exceptionWithJira("openshift-network-diagnostics/network-check-target-", "https://issues.redhat.com/browse/OCPBUGS-65633"),
57-
exceptionWithJira("default/verify-all-openshiftcommunityoperators-", "https://issues.redhat.com/browse/OCPBUGS-65634"),
58-
exceptionWithJira("default/verify-all-openshiftredhatmarketplace-", "https://issues.redhat.com/browse/OCPBUGS-65634"),
59-
exceptionWithJira("default/verify-all-openshiftcertifiedoperators-", "https://issues.redhat.com/browse/OCPBUGS-65634"),
60-
exceptionWithJira("default/verify-all-openshiftredhatoperators-", "https://issues.redhat.com/browse/OCPBUGS-65634"),
61-
exceptionWithJira("openshift-cluster-version/version-", "https://issues.redhat.com/browse/OCPBUGS-65621"),
62-
exceptionWithJira("kube-system/konnectivity-agent-", "https://issues.redhat.com/browse/OCPBUGS-65636"),
63-
exceptionWithJira("openshift-multus/multus-additional-cni-plugins-", "https://issues.redhat.com/browse/OCPBUGS-65631"),
64-
exceptionWithJira("openshift-multus/cni-sysctl-allowlist-ds-", "https://issues.redhat.com/browse/OCPBUGS-65631"),
65-
exceptionWithJira("default/verify-metas-openshiftcertifiedoperators-", "https://issues.redhat.com/browse/OCPBUGS-65634"),
66-
exceptionWithJira("default/verify-metas-openshiftcommunityoperators-", "https://issues.redhat.com/browse/OCPBUGS-65634"),
67-
exceptionWithJira("default/verify-metas-openshiftredhatmarketplace-", "https://issues.redhat.com/browse/OCPBUGS-65634"),
68-
exceptionWithJira("default/verify-metas-openshiftredhatoperators-", "https://issues.redhat.com/browse/OCPBUGS-65634"),
69-
exceptionWithJira("openshift-cluster-api/capv-controller-manager-", "https://issues.redhat.com/browse/OCPBUGS-65637"), // keep until CAPV goes GA.
70-
71-
// Handle the one outlier (Namespace only check) manually
72-
func(pod corev1.Pod) (string, bool) {
73-
if pod.Namespace == "openshift-marketplace" {
74-
return "https://issues.redhat.com/browse/OCPBUGS-65867", true
75-
}
76-
return "", false
77-
},
78-
79-
// These exceptions were found after the monitor test was merged.
80-
exceptionWithJira("openshift-cnv/kubevirt-apiserver-proxy-", "https://issues.redhat.com/browse/OCPBUGS-70353"),
81-
exceptionWithJira("openshift-cnv/kubevirt-console-plugin-", "https://issues.redhat.com/browse/OCPBUGS-70353"),
82-
exceptionWithJira("kube-system/global-pull-secret-syncer-", "https://issues.redhat.com/browse/OCPBUGS-70354"),
83-
exceptionWithJira("openshift-nmstate/nmstate-console-plugin-", "https://issues.redhat.com/browse/OCPBUGS-77474"),
84-
85-
// Handle the outlier (Namespace only check) manually
86-
func(pod corev1.Pod) (string, bool) {
87-
if pod.Namespace == "openshift-cluster-csi-drivers" {
88-
return "https://issues.redhat.com/browse/OCPBUGS-70355", true
89-
}
90-
return "", false
91-
},
92-
// Handle the outlier manually
9351
// This one checks if it is a debug pod or not.
52+
// debug pod does not run by default on an OpenShift cluster.
53+
// debug pod has showed up in some e2e tests. In order to
54+
// stop these tests from failing we include it here.
9455
func(pod corev1.Pod) (string, bool) {
9556
for annotation := range pod.Annotations {
9657
if strings.Contains(annotation, "debug.openshift.io") {

0 commit comments

Comments
 (0)