Skip to content

Set OKD as default featureset for OKD clusters #1287

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

Open
Prashanth684 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Set OKD as default featureset for OKD clusters #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af3e38b
Update openshift/api to pull in OKD featureset
Prashanth684 Dec 17, 2025
518a8d4
Set OKD as default featureset for OKD clusters
Prashanth684 Jan 5, 2026
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
3 changes: 2 additions & 1 deletion Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
WORKDIR /go/src/github.com/openshift/cluster-version-operator
COPY . .
RUN hack/build-go.sh; \
ARG TAGS=""
RUN TAGS="${TAGS}" hack/build-go.sh; \
mkdir -p /tmp/build; \
cp _output/linux/$(go env GOARCH)/cluster-version-operator _output/linux/$(go env GOARCH)/cluster-version-operator-tests.gz /tmp/build/

Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ require (
github.com/onsi/ginkgo/v2 v2.21.0
github.com/onsi/gomega v1.35.1
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250220212757-b9c4d98a0c45
github.com/openshift/api v0.0.0-20251127005036-0e3c378fdedc
github.com/openshift/client-go v0.0.0-20251201171210-333716c1124a
github.com/openshift/api v0.0.0-20251214014457-bfa868a22401
github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c
github.com/openshift/library-go v0.0.0-20251120164824-14a789e09884
github.com/operator-framework/api v0.17.1
github.com/operator-framework/operator-lifecycle-manager v0.22.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250220212757-b9c4d98a0c45 h1:hXpbYtP3iTh8oy/RKwKkcMziwchY3fIk95ciczf7cOA=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250220212757-b9c4d98a0c45/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
github.com/openshift/api v0.0.0-20251127005036-0e3c378fdedc h1:p83VYAk7mlqYZrMaKuu2bBNNLUKBUSCa6YzjPDqbOlk=
github.com/openshift/api v0.0.0-20251127005036-0e3c378fdedc/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
github.com/openshift/client-go v0.0.0-20251201171210-333716c1124a h1:iJYjd+rxyjMa3Sk6Vg55secJ4yMrabr/ulnTiy+vDH0=
github.com/openshift/client-go v0.0.0-20251201171210-333716c1124a/go.mod h1:WD7m8ADeqiAKTHWx/mBoE/1MFMtnt9MYTyBOnf0L3LI=
github.com/openshift/api v0.0.0-20251214014457-bfa868a22401 h1:goMf6pBtRFSQaVElFk6K+GIAqnv7O84p7PJHH6pDz/E=
github.com/openshift/api v0.0.0-20251214014457-bfa868a22401/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c h1:TBE0Gl+oCo/SNEhLKZQNNH/SWHXrpGyhAw7P0lAqdHg=
github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c/go.mod h1:IsynOWZAfdH+BgWimcFQRtI41Id9sgdhsCEjIk8ACLw=
github.com/openshift/library-go v0.0.0-20251120164824-14a789e09884 h1:6512TMT14gnXQ4vyshzAQGjkctU0PO9G+y0tcBjw6Vk=
github.com/openshift/library-go v0.0.0-20251120164824-14a789e09884/go.mod h1:ErDfiIrPHH+menTP/B4LKd0nxFDdvCbTamAc6SWMIh8=
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI=
Expand Down
7 changes: 6 additions & 1 deletion hack/build-go.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ LDFLAGS_TEST_EXTENSION+=" -X '${OPENSHIFT_TESTS_EXTENSION_MODULE}/pkg/version.Bu
LDFLAGS_TEST_EXTENSION+=" -X '${OPENSHIFT_TESTS_EXTENSION_MODULE}/pkg/version.GitTreeState=${GIT_TREE_STATE}'"

echo "Building ${REPO} cluster-version-operator-tests binary (${VERSION_OVERRIDE})"
TAGS_FLAG=""
if [ -n "${TAGS:-}" ]; then
TAGS_FLAG="-tags=${TAGS}"
fi
GO_COMPLIANCE_POLICY="exempt_all" CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} \
go build \
${GOFLAGS} \
${TAGS_FLAG} \
-ldflags "${LDFLAGS_TEST_EXTENSION}" \
-o "${BIN_PATH}/cluster-version-operator-tests" \
"${REPO}/cmd/cluster-version-operator-tests/..."
Expand All @@ -35,4 +40,4 @@ gzip --keep --force "${BIN_PATH}/cluster-version-operator-tests"
# Build the cluster-version-operator binary
GLDFLAGS+="-X ${REPO}/pkg/version.Raw=${VERSION_OVERRIDE}"
echo "Building ${REPO} cluster-version-operator binary (${VERSION_OVERRIDE})"
GOOS=${GOOS} GOARCH=${GOARCH} go build ${GOFLAGS} -ldflags "${GLDFLAGS}" -o ${BIN_PATH}/cluster-version-operator ${REPO}/cmd/cluster-version-operator/...
GOOS=${GOOS} GOARCH=${GOARCH} go build ${GOFLAGS} ${TAGS_FLAG} -ldflags "${GLDFLAGS}" -o ${BIN_PATH}/cluster-version-operator ${REPO}/cmd/cluster-version-operator/...
50 changes: 43 additions & 7 deletions pkg/start/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/sets"
coreinformers "k8s.io/client-go/informers"
Expand Down Expand Up @@ -46,6 +47,7 @@ import (
"github.com/openshift/cluster-version-operator/pkg/featuregates"
"github.com/openshift/cluster-version-operator/pkg/internal"
"github.com/openshift/cluster-version-operator/pkg/payload"
"github.com/openshift/cluster-version-operator/pkg/version"
)

const (
Expand Down Expand Up @@ -188,7 +190,8 @@ func (o *Options) Run(ctx context.Context) error {
}

clusterVersionConfigInformerFactory, configInformerFactory := o.prepareConfigInformerFactories(cb)
startingFeatureSet, startingCvoGates, err := o.processInitialFeatureGate(ctx, configInformerFactory)
configClient := cb.ClientOrDie("feature-gate-migration")
startingFeatureSet, startingCvoGates, err := o.processInitialFeatureGate(ctx, configInformerFactory, configClient)
if err != nil {
return fmt.Errorf("error processing feature gates: %w", err)
}
Expand Down Expand Up @@ -242,7 +245,7 @@ func (o *Options) getOpenShiftVersion() string {
return releaseMetadata.Version
}

func (o *Options) processInitialFeatureGate(ctx context.Context, configInformerFactory configinformers.SharedInformerFactory) (configv1.FeatureSet, featuregates.CvoGates, error) {
func (o *Options) processInitialFeatureGate(ctx context.Context, configInformerFactory configinformers.SharedInformerFactory, configClient clientset.Interface) (configv1.FeatureSet, featuregates.CvoGates, error) {
var startingFeatureSet configv1.FeatureSet
var cvoGates featuregates.CvoGates

Expand All @@ -266,19 +269,52 @@ func (o *Options) processInitialFeatureGate(ctx context.Context, configInformerF
gate, err := featureGates.Get("cluster")
switch {
case apierrors.IsNotFound(err):
// if we have no featuregates, then the cluster is using the default featureset, which is "".
// This excludes everything that could possibly depend on a different feature set.
startingFeatureSet = ""
klog.Infof("FeatureGate not found in cluster, will assume default feature set %q at startup", startingFeatureSet)
// if we have no featuregates and this is an OKD build, then the cluster is using OKD featureset.
// The FeatureGate resource will be created by the installer.
if version.IsSCOS() {
startingFeatureSet = configv1.FeatureSet(configv1.OKD)
klog.Infof("FeatureGate not found in cluster, will assume OKD feature set %q at startup", startingFeatureSet)
} else {
klog.Infof("FeatureGate not found in cluster, using default feature set at startup")
}
case err != nil:
// This should not happen because featureGates is backed by the informer cache which successfully synced earlier
klog.Errorf("Failed to get FeatureGate from cluster: %v", err)
return startingFeatureSet, cvoGates, fmt.Errorf("failed to get FeatureGate from informer cache: %w", err)
default:
clusterFeatureGate = gate
startingFeatureSet = gate.Spec.FeatureSet
cvoGates = featuregates.CvoGatesFromFeatureGate(clusterFeatureGate, cvoOpenShiftVersion)
klog.Infof("FeatureGate found in cluster, using its feature set %q at startup", startingFeatureSet)

// Migrate from Default ("") to OKD for existing clusters during upgrade (only for OKD builds)
if version.IsSCOS() && (startingFeatureSet == "" || startingFeatureSet == configv1.Default) {
klog.Infof("Detected Default feature set, migrating to OKD feature set")

// Patch the FeatureGate to change from Default to OKD
patchData := []byte(fmt.Sprintf(`{"spec":{"featureSet":"%s"}}`, configv1.OKD))
patchedGate, patchErr := configClient.ConfigV1().FeatureGates().Patch(
ctx,
"cluster",
types.MergePatchType,
patchData,
metav1.PatchOptions{},
)
if patchErr != nil {
klog.Errorf("Failed to migrate FeatureGate from Default to OKD: %v", patchErr)
klog.Warningf("Continuing with Default feature set; migration will be retried on next restart")
// Continue with Default - don't fail startup
} else {
klog.Infof("Successfully migrated FeatureGate from Default to OKD")
startingFeatureSet = configv1.FeatureSet(configv1.OKD)
clusterFeatureGate = patchedGate

// Note: The FeatureChangeStopper will detect this change and trigger a restart
// This is expected and ensures CVO starts cleanly with the new feature set
klog.Infof("CVO will restart to apply OKD feature set changes")
}
}
// Compute CVO gates from the feature gate (potentially migrated)
cvoGates = featuregates.CvoGatesFromFeatureGate(clusterFeatureGate, cvoOpenShiftVersion)
}
Comment on lines +288 to 318
Copy link

@coderabbitai coderabbitai bot Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

# First, let's examine the actual file to see the code in context
head -320 pkg/start/start.go | tail -50

Repository: openshift/cluster-version-operator

Length of output: 2518

🏁 Script executed:

# Also check the line count of the file
wc -l pkg/start/start.go

Repository: openshift/cluster-version-operator

Length of output: 100

🏁 Script executed:

# Search for tests related to SCOS migration or feature set migration
find . -name "*test*.go" -type f | xargs rg -l "SCOS|migration|OKD.*featureSet" 2>/dev/null | head -20

Repository: openshift/cluster-version-operator

Length of output: 150

🏁 Script executed:

# Look for test files specifically in the start package
find pkg/start -name "*test*.go" -type f

Repository: openshift/cluster-version-operator

Length of output: 113

🏁 Script executed:

# Check the integration test file for migration-related tests
cat pkg/start/start_integration_test.go | head -100

Repository: openshift/cluster-version-operator

Length of output: 2464

🏁 Script executed:

# Search specifically for tests covering the migration path
rg -n "IsSCOS|Default.*OKD|featureSet.*migration|SCOS" pkg/start/start_integration_test.go -B2 -A10

Repository: openshift/cluster-version-operator

Length of output: 60

🏁 Script executed:

# Check what version.IsSCOS() checks
rg -n "IsSCOS" pkg/ -A3 | head -40

Repository: openshift/cluster-version-operator

Length of output: 1007

🏁 Script executed:

# Look for tests that cover the patch operation on FeatureGates
rg -n "Patch|featureSet" pkg/start/start_integration_test.go -B3 -A5

Repository: openshift/cluster-version-operator

Length of output: 60

🏁 Script executed:

# Let's check the full integration test file to see what's covered
wc -l pkg/start/start_integration_test.go

Repository: openshift/cluster-version-operator

Length of output: 117

🏁 Script executed:

# Search for all test functions in the integration test file
rg -n "^func Test" pkg/start/start_integration_test.go

Repository: openshift/cluster-version-operator

Length of output: 265

🏁 Script executed:

# Search more broadly for any mention of migration or Default in tests
rg -n "migration|Default|OKD" pkg/start/start_integration_test.go

Repository: openshift/cluster-version-operator

Length of output: 1019

🏁 Script executed:

# Look at the actual MergePatchType implementation to understand idempotency
rg -n "MergePatchType" pkg/ -B2 -A2

Repository: openshift/cluster-version-operator

Length of output: 284

🏁 Script executed:

# Check if there are unit tests or other tests that might cover the migration
find pkg/ -name "*.go" -type f -exec grep -l "SCOS.*Default\|Default.*OKD\|migration" {} \;

Repository: openshift/cluster-version-operator

Length of output: 165

🏁 Script executed:

# Look at what the "feature-gate-migration" test infrastructure does
rg -n "feature-gate-migration" pkg/start/start_integration_test.go -B5 -A15

Repository: openshift/cluster-version-operator

Length of output: 3341

🏁 Script executed:

# Search for tests that actually set up Default feature set scenario
rg -n "Default\|configv1.Default" pkg/start/start_integration_test.go -B3 -A3

Repository: openshift/cluster-version-operator

Length of output: 60

🏁 Script executed:

# Check the full context around line 195 to see the actual test setup
sed -n '190,250p' pkg/start/start_integration_test.go

Repository: openshift/cluster-version-operator

Length of output: 2519

🏁 Script executed:

# Look for any setup or test helper functions that configure feature gates
rg -n "featureSet|FeatureGate" pkg/start/start_integration_test.go -B2 -A5

Repository: openshift/cluster-version-operator

Length of output: 1586

🏁 Script executed:

# Find the processInitialFeatureGate function to see if it contains the migration logic
rg -n "func.*processInitialFeatureGate" pkg/ -A100 | head -150

Repository: openshift/cluster-version-operator

Length of output: 7139

🏁 Script executed:

# Alternatively, search for it in start.go
rg -n "processInitialFeatureGate" pkg/start/start.go -B5 -A50 | head -100

Repository: openshift/cluster-version-operator

Length of output: 5458

🏁 Script executed:

# Look for the exact function in the file
ast-grep --pattern 'func $(name) processInitialFeatureGate($_) {
  $$$
}'

Repository: openshift/cluster-version-operator

Length of output: 60

🏁 Script executed:

# Let's check where the migration code snippet appears in the file
sed -n '250,330p' pkg/start/start.go

Repository: openshift/cluster-version-operator

Length of output: 3697

🏁 Script executed:

# Let's verify if there are any specific test cases for the Default->OKD migration scenario
rg -n "Default|OKD" pkg/start/start_integration_test.go -B5 -A5 | head -80

Repository: openshift/cluster-version-operator

Length of output: 1922

🏁 Script executed:

# Check if the FeatureGate resource is actually set up in test fixtures with Default value
rg -n "FeatureGate\|featureSet" pkg/start/start_integration_test.go -B3 -A3 | head -100

Repository: openshift/cluster-version-operator

Length of output: 60

🏁 Script executed:

# Look for any test setup that creates FeatureGate objects
rg -n "FeatureGate.*Default\|Default.*featureSet" pkg/ -type go -B2 -A2

Repository: openshift/cluster-version-operator

Length of output: 105

🏁 Script executed:

# Search for where FeatureGate is created/set up in tests
rg -n "FeatureGate" pkg/start/start_integration_test.go -B3 -A3

Repository: openshift/cluster-version-operator

Length of output: 1127

🏁 Script executed:

# Look for test helper functions that might set up featuresets
rg -n "func.*Helper\|func.*Setup" pkg/start/start_integration_test.go -A5

Repository: openshift/cluster-version-operator

Length of output: 60

🏁 Script executed:

# Check if Default is mentioned anywhere in test files
rg -n "configv1.Default" pkg/start/ --type go

Repository: openshift/cluster-version-operator

Length of output: 196

🏁 Script executed:

# Search more broadly for migration-related tests in the whole repo
find pkg -name "*.go" -type f -exec grep -l "Default.*OKD\|migration.*Default" {} \;

Repository: openshift/cluster-version-operator

Length of output: 96

🏁 Script executed:

# Check the full test file to understand test setup and if Default featureset is ever created
grep -n "FeatureSet\|featureSet" pkg/start/start_integration_test.go

Repository: openshift/cluster-version-operator

Length of output: 60

🏁 Script executed:

# Look for helper functions in test file that might create FeatureGate fixtures
rg -n "func.*feature\|NewFeatureGate\|FeatureGate" pkg/start/start_integration_test.go -i

Repository: openshift/cluster-version-operator

Length of output: 60

🏁 Script executed:

# Check if there's a testutil or helper package that sets up feature gates
find pkg -name "*testutil*" -o -name "*test*helper*" | xargs ls -la 2>/dev/null

Repository: openshift/cluster-version-operator

Length of output: 1593

🏁 Script executed:

# Verify that the migration scenario (Default->OKD) is explicitly tested
rg -n "startingFeatureSet.*Default\|Default.*startingFeatureSet" pkg/ --type go -B2 -A2

Repository: openshift/cluster-version-operator

Length of output: 60

🏁 Script executed:

# Check if JSON merge patch is truly idempotent by looking at how k8s handles it
web_search
Kubernetes JSON merge patch idempotency behavior

Repository: openshift/cluster-version-operator

Length of output: 177

🌐 Web query:

Kubernetes JSON merge patch idempotency behavior MergePatchType

💡 Result:

Short answer: JSON Merge Patch (MergePatchType / application/merge-patch+json) is effectively idempotent — applying the same merge patch repeatedly yields the same resulting resource after the first application. This follows the RFC 7386 MergePatch rules (fields are added/replaced; null removes a member), and Kubernetes implements this behavior (JSON-merge replaces lists entirely and uses null to remove fields). Caveats: if your patch is a non-object it replaces the whole document; lists are replaced (not merged); and strategic-merge (the default) has different list semantics. (rfc-editor.org)

Sources:

  • RFC 7386 (JSON Merge Patch) — processing rules and null-for-delete semantics. [1]
  • Kubernetes docs on patch types (kubectl patch / JSON merge patch behavior). [2]

Citations:

🏁 Script executed:

# Let's check if there are any dedicated tests for this migration path
find pkg -name "*.go" -type f | xargs grep -l "processInitialFeatureGate"

Repository: openshift/cluster-version-operator

Length of output: 132

🏁 Script executed:

# Check test file setup to see how featuresets are being initialized
sed -n '100,200p' pkg/start/start_integration_test.go

Repository: openshift/cluster-version-operator

Length of output: 2933

🏁 Script executed:

# Look at the whole test structure to understand the test cases
rg -n "func Test" pkg/start/start_integration_test.go -A1

Repository: openshift/cluster-version-operator

Length of output: 370

🏁 Script executed:

# Let's see if there's any setup in the test that creates a FeatureGate with Default value
sed -n '150,250p' pkg/start/start_integration_test.go | grep -i "featuregate\|defaultclusterprofile"

Repository: openshift/cluster-version-operator

Length of output: 445

🏁 Script executed:

# Check if there are any unit tests (as opposed to integration tests) for the migration logic
find pkg/start -name "*.go" | xargs grep -l "TestUnit\|Test.*processInitialFeatureGate" 2>/dev/null

Repository: openshift/cluster-version-operator

Length of output: 62

🏁 Script executed:

# Look at what happens when FeatureGate is not found vs Default value
sed -n '270,320p' pkg/start/start.go

Repository: openshift/cluster-version-operator

Length of output: 2528

🏁 Script executed:

# Verify the exact conditions: both "" and configv1.Default trigger migration
rg -n "configv1.OKD\|configv1.Default" pkg/start/start.go -B2 -A2

Repository: openshift/cluster-version-operator

Length of output: 60

Add test coverage for Default→OKD migration scenario.

The migration logic is well-implemented and safe:

  • Correctly triggers only for SCOS builds with Default/empty feature set
  • Uses appropriate MergePatchType patch (idempotent per RFC 7386)
  • Handles errors gracefully without failing startup
  • Updates local state consistently after successful patch
  • Properly computes CVO gates from the potentially-migrated feature gate

However, the integration tests call processInitialFeatureGate() but don't explicitly test the migration path itself—they don't set up a cluster with a Default featureset to verify the patch operation and state transition. Consider adding a test case that creates a FeatureGate with Default value and verifies it gets migrated to OKD during startup.


if cvoGates.UnknownVersion() {
Expand Down
9 changes: 6 additions & 3 deletions pkg/start/start_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
}

clusterVersionConfigInformerFactory, configInformerFactory := options.prepareConfigInformerFactories(cb)
featureset, gates, err := options.processInitialFeatureGate(context.Background(), configInformerFactory)
configClient := cb.ClientOrDie("feature-gate-migration")
featureset, gates, err := options.processInitialFeatureGate(context.Background(), configInformerFactory, configClient)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -333,7 +334,8 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
}

clusterVersionConfigInformerFactory, configInformerFactory := options.prepareConfigInformerFactories(cb)
featureset, gates, err := options.processInitialFeatureGate(context.Background(), configInformerFactory)
configClient := cb.ClientOrDie("feature-gate-migration")
featureset, gates, err := options.processInitialFeatureGate(context.Background(), configInformerFactory, configClient)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -536,7 +538,8 @@ metadata:
}

clusterVersionConfigInformerFactory, configInformerFactory := options.prepareConfigInformerFactories(cb)
featureset, gates, err := options.processInitialFeatureGate(context.Background(), configInformerFactory)
configClient := cb.ClientOrDie("feature-gate-migration")
featureset, gates, err := options.processInitialFeatureGate(context.Background(), configInformerFactory, configClient)
if err != nil {
t.Fatal(err)
}
Expand Down
7 changes: 7 additions & 0 deletions pkg/version/scos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//go:build scos

package version

func init() {
SCOS = true
}
10 changes: 10 additions & 0 deletions pkg/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,14 @@ var (

// String is the human-friendly representation of the version.
String = fmt.Sprintf("ClusterVersionOperator %s", Raw)

// SCOS is a setting to enable CentOS Stream CoreOS-only modifications.
// This is set via the scos build tag.
SCOS = false
)

// IsSCOS returns true if CentOS Stream CoreOS-only modifications are enabled.
// This is enabled via the scos build tag for OKD builds.
func IsSCOS() bool {
return SCOS
}
2 changes: 0 additions & 2 deletions vendor/github.com/openshift/api/config/v1/register.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions vendor/github.com/openshift/api/config/v1/types_feature.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/openshift/api/config/v1/types_image_policy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading