Add Boxcutter FG mapping

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

go.mod

@@ -2,6 +2,9 @@ module github.com/openshift/cluster-olm-operator
 
 go 1.24.6
 
+// MUST BE REMOVED BEFORE MERGE
+replace github.com/openshift/api => github.com/anik120/openshift-api v0.0.0-20251113203504-11f7307b75ad
+
 require (
 	github.com/TwiN/deepmerge v0.2.2
 	github.com/blang/semver/v4 v4.0.0

go.sum

@@ -26,6 +26,8 @@ github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cq
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/TwiN/deepmerge v0.2.2 h1:FUG9QMIYg/j2aQyPPhA3XTFJwXSNHI/swaR4Lbyxwg4=
 github.com/TwiN/deepmerge v0.2.2/go.mod h1:4OHvjV3pPNJCJZBHswYAwk6rxiD8h8YZ+9cPo7nu4oI=
+github.com/anik120/openshift-api v0.0.0-20251113203504-11f7307b75ad h1:EbKPpd737XnSW1rw7rw5b6U7oN6c7SZRJ6vhTUj9fcE=
+github.com/anik120/openshift-api v0.0.0-20251113203504-11f7307b75ad/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
 github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
@@ -296,8 +298,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
-github.com/openshift/api v0.0.0-20251111013132-5c461e21bdb7 h1:fdvcDJySvjVJctbPbdLPoMiMk+bls34+eq6tWOqdFZg=
-github.com/openshift/api v0.0.0-20251111013132-5c461e21bdb7/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
 github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee h1:+Sp5GGnjHDhT/a/nQ1xdp43UscBMr7G5wxsYotyhzJ4=
 github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 h1:9JBeIXmnHlpXTQPi7LPmu1jdxznBhAE7bb1K+3D8gxY=

internal/featuregates/mapper.go

@@ -23,6 +23,7 @@ const (
 	// WebhookProviderCertManager: This is something that always needs to be disabled downstream
 	WebhookProviderOpenshiftServiceCA = "WebhookProviderOpenshiftServiceCA"
 	WebhookProviderCertManager        = "WebhookProviderCertManager"
+	NewOLMBoxCutterRuntime            = "BoxcutterRuntime"
 )
 
 type MapperInterface interface {
@@ -79,6 +80,9 @@ func NewMapper() *Mapper {
 		features.FeatureGateNewOLMCatalogdAPIV1Metas: func(v *helmvalues.HelmValues, enabled bool) error {
 			return enableCatalogdFeature(v, enabled, APIV1MetasHandler)
 		},
+		features.FeatureGateNewOLMBoxCutterRuntime: func(v *helmvalues.HelmValues, enabled bool) error {
+			return enableOperatorControllerFeature(v, enabled, NewOLMBoxCutterRuntime)
+		},
 	}
 
 	for _, m := range []gateMapFunc{featureGates} {

internal/featuregates/mapper_test.go

@@ -34,6 +34,7 @@ func TestMapper_DownstreamFeatureGates(t *testing.T) {
 		features.FeatureGateNewOLMOwnSingleNamespace,
 		features.FeatureGateNewOLMWebhookProviderOpenshiftServiceCA,
 		features.FeatureGateNewOLMCatalogdAPIV1Metas,
+		features.FeatureGateNewOLMBoxCutterRuntime,
 	}
 
 	if len(gates) != len(expectedGates) {
@@ -68,6 +69,12 @@ func TestMapper_UpstreamForDownstream(t *testing.T) {
 			enabled:        false,
 			expectFunc:     true,
 		},
+		{
+			name:           "valid downstream gate - boxcutter runtime",
+			downstreamGate: features.FeatureGateNewOLMBoxCutterRuntime,
+			enabled:        false,
+			expectFunc:     true,
+		},
 		{
 			name:           "valid downstream gate - webhook provider",
 			downstreamGate: features.FeatureGateNewOLMWebhookProviderOpenshiftServiceCA,

vendor/github.com/openshift/api/features.md

@@ -366,7 +366,7 @@ github.com/opencontainers/go-digest
 ## explicit; go 1.18
 github.com/opencontainers/image-spec/specs-go
 github.com/opencontainers/image-spec/specs-go/v1
-# github.com/openshift/api v0.0.0-20251111013132-5c461e21bdb7
+# github.com/openshift/api v0.0.0-20251111013132-5c461e21bdb7 => github.com/anik120/openshift-api v0.0.0-20251113203504-11f7307b75ad
 ## explicit; go 1.24.0
 github.com/openshift/api
 github.com/openshift/api/annotations
@@ -1904,3 +1904,4 @@ sigs.k8s.io/structured-merge-diff/v6/value
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v3
 sigs.k8s.io/yaml/kyaml
+# github.com/openshift/api => github.com/anik120/openshift-api v0.0.0-20251113203504-11f7307b75ad