Merge branch 'openshift:main' into update-tests-to-dotnet-8

Author: rhdmalone

pkg/cmd/openshift-tests/run-upgrade/options.go

@@ -72,7 +72,10 @@ func (o *RunUpgradeSuiteOptions) UpgradeTestPreSuite() error {
 	if err := clusterdiscovery.InitializeTestFramework(exutil.TestContext, config, o.GinkgoRunSuiteOptions.DryRun); err != nil {
 		return err
 	}
-	klog.V(4).Infof("Loaded test configuration: %#v", exutil.TestContext)
+	// Redact the bearer token exposure
+	testContextString := fmt.Sprintf("%#v", exutil.TestContext)
+	redactedTestContext := exutil.RedactBearerToken(testContextString)
+	klog.V(4).Infof("Loaded test configuration: %s", redactedTestContext)
 
 	return nil
 }

pkg/defaultmonitortests/types.go

@@ -8,7 +8,6 @@ import (
 	"github.com/openshift/origin/pkg/monitortests/authentication/requiredsccmonitortests"
 	admupgradestatus "github.com/openshift/origin/pkg/monitortests/cli/adm_upgrade/status"
 	azuremetrics "github.com/openshift/origin/pkg/monitortests/cloud/azure/metrics"
-	"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/clusterversionchecker"
 	"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/legacycvomonitortests"
 	"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/operatorstateanalyzer"
 	"github.com/openshift/origin/pkg/monitortests/clusterversionoperator/terminationmessagepolicy"
@@ -86,7 +85,6 @@ func ListAllMonitorTests() []string {
 }
 
 func NewMonitorTestsFor(info monitortestframework.MonitorTestInitializationInfo) (monitortestframework.MonitorTestRegistry, error) {
-
 	// get tests and apply any filtering defined in info
 	var startingRegistry monitortestframework.MonitorTestRegistry
 
@@ -174,7 +172,6 @@ func newUniversalMonitorTests(info monitortestframework.MonitorTestInitializatio
 	monitorTestRegistry.AddMonitorTestOrDie("termination-message-policy", "Cluster Version Operator", terminationmessagepolicy.NewAnalyzer())
 	monitorTestRegistry.AddMonitorTestOrDie("operator-state-analyzer", "Cluster Version Operator", operatorstateanalyzer.NewAnalyzer())
 	monitorTestRegistry.AddMonitorTestOrDie("required-scc-annotation-checker", "Cluster Version Operator", requiredsccmonitortests.NewAnalyzer())
-	monitorTestRegistry.AddMonitorTestOrDie("cluster-version-checker", "Cluster Version Operator", clusterversionchecker.NewClusterVersionChecker())
 
 	monitorTestRegistry.AddMonitorTestOrDie("etcd-log-analyzer", "etcd", etcdloganalyzer.NewEtcdLogAnalyzer())
 	monitorTestRegistry.AddMonitorTestOrDie("legacy-etcd-invariants", "etcd", legacyetcdmonitortests.NewLegacyTests())

pkg/monitor/backenddisruption/disruption_backend_sampler.go

@@ -79,6 +79,8 @@ type BackendSampler struct {
 	stopRunning context.CancelFunc
 	// consumptionFinished is closed when the consumer is done
 	consumptionFinished chan struct{}
+
+	samplerHooks []SamplerHook
 }
 
 type routeCoordinates struct {
@@ -195,7 +197,7 @@ func (b *BackendSampler) WithTLSConfig(tlsConfig *tls.Config) *BackendSampler {
 	return b
 }
 
-// WithTLSConfig sets both the CA bundle for trusting the server and the client cert/key pair for identifying to the server
+// WithExpectedStatusCode sets the expected http status
 func (b *BackendSampler) WithExpectedStatusCode(statusCode int) *BackendSampler {
 	b.expectedStatusCode = statusCode
 	return b
@@ -223,6 +225,12 @@ func (b *BackendSampler) WithExpectedBodyRegex(expectedBodyRegex string) *Backen
 	return b
 }
 
+// WithSamplerHooks adds a list of hooks for the sampler to call at different stages of disruption detection
+func (b *BackendSampler) WithSamplerHooks(samplerHooks []SamplerHook) *BackendSampler {
+	b.samplerHooks = samplerHooks
+	return b
+}
+
 // bodyMatches checks the body content and returns an error if it doesn't match the expected.
 func (b *BackendSampler) bodyMatches(body []byte) error {
 	switch {
@@ -620,6 +628,9 @@ func (b *disruptionSampler) consumeSamples(ctx context.Context, consumerDoneCh c
 				monitorRecorder.EndInterval(previousIntervalID, currSample.startTime)
 			}
 
+			for _, hook := range b.backendSampler.samplerHooks {
+				hook.DisruptionStarted(ctx)
+			}
 			// start a new interval with the new error
 			message, eventReason, level := DisruptionBegan(b.backendSampler.GetLocator().OldLocator(), b.backendSampler.GetConnectionType(), currentError, currSample.getRequestAuditID())
 			framework.Logf("%s", message.BuildString())
@@ -653,6 +664,10 @@ func (b *disruptionSampler) consumeSamples(ctx context.Context, consumerDoneCh c
 				monitorRecorder.EndInterval(previousIntervalID, currSample.startTime)
 			}
 
+			for _, hook := range b.backendSampler.samplerHooks {
+				hook.DisruptionStarted(ctx)
+			}
+
 			message, eventReason, level := DisruptionBegan(b.backendSampler.GetLocator().OldLocator(), b.backendSampler.GetConnectionType(), currentError, currSample.getRequestAuditID())
 			framework.Logf("%s", message.BuildString())
 			eventRecorder.Eventf(