Skip to content

[release-4.22] OCPBUGS-92055: Fix isNoOLMFeatureGateEnabled to check only the current cluster version #31338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
openshift-cherrypick-robot wants to merge 1 commit into from
+11 −1
Closed

[release-4.22] OCPBUGS-92055: Fix isNoOLMFeatureGateEnabled to check only the current cluster version #31338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion test/extended/router/gatewayapicontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,18 +643,28 @@ func isIPv6OrDualStack(oc *exutil.CLI) (bool, error) {
}

func isNoOLMFeatureGateEnabled(oc *exutil.CLI) (bool, error) {
cv, err := oc.AdminConfigClient().ConfigV1().ClusterVersions().Get(context.TODO(), "version", metav1.GetOptions{})
if err != nil {
return false, fmt.Errorf("failed to get ClusterVersion: %v", err)
}
currentVersion := cv.Status.Desired.Version

fgs, err := oc.AdminConfigClient().ConfigV1().FeatureGates().Get(context.TODO(), "cluster", metav1.GetOptions{})
if err != nil {
return false, fmt.Errorf("failed to get cluster FeatureGates: %v", err)
}
for _, fg := range fgs.Status.FeatureGates {
if fg.Version != currentVersion {
continue
}
for _, enabledFG := range fg.Enabled {
if enabledFG.Name == "GatewayAPIWithoutOLM" {
e2e.Logf("GatewayAPIWithoutOLM featuregate is enabled")
e2e.Logf("GatewayAPIWithoutOLM featuregate is enabled for version %s", currentVersion)
return true, nil
}
}
}
e2e.Logf("GatewayAPIWithoutOLM featuregate is not enabled for version %s", currentVersion)
return false, nil
}

Expand Down