Merge pull request #29534 from neisw/infra-termination-policy

NO-JIRA: Support known namespaces for terminationMessagePolicy tests

Author: openshift-merge-bot[bot]

pkg/monitortestlibrary/platformidentification/operator_mapping.go

@@ -231,6 +231,7 @@ func init() {
 	utilruntime.Must(addNamespaceMapping("openshift-service-ca-operator", "service-ca"))
 	utilruntime.Must(addNamespaceMapping("openshift-user-workload-monitoring", "Unknown"))
 	utilruntime.Must(addNamespaceMapping("openshift-vsphere-infra", "Unknown"))
+	utilruntime.Must(addNamespaceMapping("openshift-infra", "Unknown"))
 
 	KnownNamespaces = sets.StringKeySet(namespaceToBugzillaComponent)
 }

pkg/monitortests/clusterversionoperator/terminationmessagepolicy/monitortest.go

@@ -9,6 +9,7 @@ import (
 	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	"github.com/openshift/origin/pkg/monitor/monitorapi"
 	"github.com/openshift/origin/pkg/monitortestframework"
+	"github.com/openshift/origin/pkg/monitortestlibrary/platformidentification"
 	"github.com/openshift/origin/pkg/test/ginkgo/junitapi"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -89,6 +90,7 @@ func (w *terminationMessagePolicyChecker) CollectData(ctx context.Context, stora
 		if strings.HasPrefix(pod.Namespace, "openshift-must-gather") {
 			continue
 		}
+
 		if _, ok := failuresByNamespace[pod.Namespace]; !ok {
 			failuresByNamespace[pod.Namespace] = []string{}
 		}
@@ -131,8 +133,10 @@ func (w *terminationMessagePolicyChecker) CollectData(ctx context.Context, stora
 		),
 	}
 
+	observedNamespace := map[string]bool{}
 	junits := []*junitapi.JUnitTestCase{}
 	for _, namespace := range sets.StringKeySet(failuresByNamespace).List() {
+		observedNamespace[namespace] = true
 		testName := fmt.Sprintf("[sig-arch] all containers in ns/%v must have terminationMessagePolicy=%v", namespace, corev1.TerminationMessageFallbackToLogsOnError)
 		failingContainers := sets.NewString(failuresByNamespace[namespace]...)
 		if len(failingContainers) == 0 {
@@ -207,6 +211,19 @@ func (w *terminationMessagePolicyChecker) CollectData(ctx context.Context, stora
 
 	}
 
+	knownNamespaces := platformidentification.KnownNamespaces
+	for _, namespace := range sets.StringKeySet(knownNamespaces).List() {
+		// if we didn't observe this namespace then create the passing test to ensure the test is always created
+		if _, ok := observedNamespace[namespace]; !ok {
+			testName := fmt.Sprintf("[sig-arch] all containers in ns/%v must have terminationMessagePolicy=%v", namespace, corev1.TerminationMessageFallbackToLogsOnError)
+			junits = append(junits, &junitapi.JUnitTestCase{
+				Name:      testName,
+				SystemOut: "",
+				SystemErr: "",
+			})
+		}
+	}
+
 	return nil, junits, nil
 }