Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions test/extended/util/cluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,3 +290,20 @@ func (c *ClusterConfiguration) MatchFn() func(string) bool {
}
return matchFn
}

func HasCapability(clusterVersion *configv1.ClusterVersion, desiredCapability string) bool {
for _, ec := range clusterVersion.Status.Capabilities.EnabledCapabilities {
if string(ec) == desiredCapability {
return true
}
}
return false
}
func KnowsCapability(clusterVersion *configv1.ClusterVersion, desiredCapability string) bool {
for _, ec := range clusterVersion.Status.Capabilities.KnownCapabilities {
if string(ec) == desiredCapability {
return true
}
}
return false
}
30 changes: 25 additions & 5 deletions test/extended/util/disruption/frontends/known_backends.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ package frontends
import (
"context"

utilruntime "k8s.io/apimachinery/pkg/util/runtime"

configclient "github.com/openshift/client-go/config/clientset/versioned"
"github.com/openshift/origin/pkg/monitor"
"github.com/openshift/origin/pkg/monitor/backenddisruption"
"github.com/openshift/origin/test/extended/util/cluster"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/rest"
e2e "k8s.io/kubernetes/test/e2e/framework"
)

func StartAllIngressMonitoring(ctx context.Context, m monitor.Recorder, clusterConfig *rest.Config) error {
Expand All @@ -17,12 +20,29 @@ func StartAllIngressMonitoring(ctx context.Context, m monitor.Recorder, clusterC
if err := createOAuthRouteAvailableWithConnectionReuse().StartEndpointMonitoring(ctx, m, nil); err != nil {
return err
}
if err := createConsoleRouteAvailableWithNewConnections().StartEndpointMonitoring(ctx, m, nil); err != nil {

// Some jobs explicitly disable the console and other features. Check if it's disabled and if so,
// do not run a disruption monitoring backend for it.
configClient, err := configclient.NewForConfig(clusterConfig)
if err != nil {
return err
}
if err := createConsoleRouteAvailableWithConnectionReuse().StartEndpointMonitoring(ctx, m, nil); err != nil {
return err
clusterVersion, err := configClient.ConfigV1().ClusterVersions().Get(context.TODO(), "version", metav1.GetOptions{})
if err != nil {
e2e.Failf("Failed to get cluster version: %v", err)
}
// If the cluster does not know about the Console capability, it likely predates 4.12 and we can assume
// it has it by default. This is to catch possible future scenarios where we upgrade 4.11 no cap to 4.12 no cap.
if !cluster.KnowsCapability(clusterVersion, "Console") ||
cluster.HasCapability(clusterVersion, "Console") {
if err := createConsoleRouteAvailableWithNewConnections().StartEndpointMonitoring(ctx, m, nil); err != nil {
return err
}
if err := createConsoleRouteAvailableWithConnectionReuse().StartEndpointMonitoring(ctx, m, nil); err != nil {
return err
}
}

return nil
}

Expand Down