add env var gate for degraded mode

Signed-off-by: nhamza <nhamza@redhat.com>

Author: Neilhamza

cmd/openshift-tests/openshift-tests.go

@@ -63,8 +63,15 @@ func main() {
 		os.Unsetenv("ENABLE_STORAGE_GCE_PD_DRIVER")
 	}
 
+	// Detect intentionally degraded clusters (e.g. TNF degraded) based on
+	// CI-provided environment signals and propagate that context to extended tests
+	if os.Getenv("DEGRADED_NODE") == "true" {
+		exutil.ClusterDegraded = true
+		logrus.Infof("openshift-tests targeting intentionally degraded cluster")
+	}
+
 	pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
-	//pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
+	// pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
 
 	extensionRegistry, originExtension, err := extensions.InitializeOpenShiftTestsExtensionFramework()
 	if err != nil {

test/extended/operators/certs.go

@@ -32,7 +32,6 @@ import (
 	"github.com/openshift/library-go/pkg/certs/cert-inspection/certgraphutils"
 	"github.com/openshift/library-go/pkg/operator/resource/resourceread"
 
-	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/origin/pkg/certs"
 	"github.com/openshift/origin/pkg/monitortestlibrary/platformidentification"
 	testresult "github.com/openshift/origin/pkg/test/ginkgo/result"
@@ -129,10 +128,10 @@ var _ = g.Describe(fmt.Sprintf("[sig-arch][Late][Jira:%q]", "kube-apiserver"), g
 		// Skip metal jobs if test image pullspec cannot be determined
 		if jobType.Platform != "metal" || err == nil {
 			o.Expect(err).NotTo(o.HaveOccurred())
-			topo, topoErr := exutil.GetControlPlaneTopology(oc)
-			o.Expect(topoErr).NotTo(o.HaveOccurred())
 
-			if *topo == configv1.DualReplicaTopologyMode {
+			// Only relax on-disk cert collection when the cluster is intentionally degraded
+			// and the topology is Two-Node Fencing (DualReplica).
+			if exutil.ClusterDegraded && exutil.IsTwoNodeFencing(ctx, configClient) {
 				readyMasters, _ := filterReadyNodes(masters)
 				onDiskPKIContent, err = fetchOnDiskCertificates(ctx, kubeClient, oc.AdminConfig(), readyMasters, openshiftTestImagePullSpec)
 				o.Expect(err).NotTo(o.HaveOccurred())

test/extended/util/framework.go

@@ -327,7 +327,6 @@ func WaitForOpenShiftNamespaceImageStreams(oc *CLI) error {
 
 	// Check to see if SamplesOperator managementState is Removed
 	out, err := oc.AsAdmin().Run("get").Args("configs.samples.operator.openshift.io", "cluster", "-o", "yaml").Output()
-
 	if err != nil {
 		e2e.Logf("\n  error on getting samples operator CR: %+v\n%#v\n", err, out)
 	}
@@ -781,7 +780,7 @@ func VarSubOnFile(srcFile string, destFile string, vars map[string]string) error
 			k = "${" + k + "}"
 			srcString = strings.Replace(srcString, k, v, -1) // -1 means unlimited replacements
 		}
-		err = ioutil.WriteFile(destFile, []byte(srcString), 0644)
+		err = ioutil.WriteFile(destFile, []byte(srcString), 0o644)
 	}
 	return err
 }
@@ -1654,11 +1653,11 @@ func restoreFixtureAsset(dir, name string) error {
 	if err != nil {
 		return err
 	}
-	err = os.MkdirAll(assetFilePath(dir, filepath.Dir(name)), os.FileMode(0755))
+	err = os.MkdirAll(assetFilePath(dir, filepath.Dir(name)), os.FileMode(0o755))
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(assetFilePath(dir, name), data, 0640)
+	err = ioutil.WriteFile(assetFilePath(dir, name), data, 0o640)
 	if err != nil {
 		return err
 	}
@@ -1990,10 +1989,10 @@ type GitRepo struct {
 // AddAndCommit commits a file with its content to local repo
 func (r GitRepo) AddAndCommit(file, content string) error {
 	dir := filepath.Dir(file)
-	if err := os.MkdirAll(filepath.Join(r.RepoPath, dir), 0777); err != nil {
+	if err := os.MkdirAll(filepath.Join(r.RepoPath, dir), 0o777); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(filepath.Join(r.RepoPath, file), []byte(content), 0666); err != nil {
+	if err := ioutil.WriteFile(filepath.Join(r.RepoPath, file), []byte(content), 0o666); err != nil {
 		return err
 	}
 	if err := r.repo.Add(r.RepoPath, file); err != nil {
@@ -2347,6 +2346,8 @@ func IsTwoNodeFencing(ctx context.Context, configClient clientconfigv1.Interface
 	return infrastructure.Status.ControlPlaneTopology == configv1.DualReplicaTopologyMode
 }
 
+var ClusterDegraded bool
+
 func groupName(groupVersionName string) string {
 	return strings.Split(groupVersionName, "/")[0]
 }