[Draft] - bumping with o/api changes to reflect new capabilities

go.mod

@@ -114,3 +114,5 @@ require (
 )
 
 replace github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12
+
+replace github.com/openshift/api => github.com/miyadav/api v0.0.0-20260618103613-8816b16ded02

go.sum

@@ -96,6 +96,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/miyadav/api v0.0.0-20260618103613-8816b16ded02 h1:3+MX3YjdG+fdc7TO12YT1wsWvHkzpzlqvEK765+Y778=
+github.com/miyadav/api v0.0.0-20260618103613-8816b16ded02/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
 github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=
 github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -114,8 +116,6 @@ github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
 github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
 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-20260416105050-3c6b218b8a80 h1:r0S/yoZAI0iWo1JvoIijaIgWGWf/izg4WiV7Wrtz16k=
-github.com/openshift/api v0.0.0-20260416105050-3c6b218b8a80/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
 github.com/openshift/client-go v0.0.0-20260416131737-a19e91702ab5 h1:R5gdIA+R7MONtwKIEfZ7WM0k9ELv6GM2AbYApaCRNrA=
 github.com/openshift/client-go v0.0.0-20260416131737-a19e91702ab5/go.mod h1:u56GmXEMF6bvws8ipkT1ZRNJH52RF5sZ/yRP+6PwkH4=
 github.com/openshift/controller-runtime-common v0.0.0-20260428152732-64ee174f5e2e h1:k89oIo2EjX0PRSdi1kesktCyWp50SC9WwKurvupvRGs=

lib/capability/capability.go

@@ -9,6 +9,54 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 )
 
+// featureGatedCapabilities maps each gated capability to the feature gates
+// that can make it available. A capability is included when ANY of its listed
+// gates is present in the enabled set. This mirrors the FeatureGateAwareEnum
+// annotations on ClusterVersionCapability in the openshift/api types.
+var featureGatedCapabilities = map[configv1.ClusterVersionCapability][]string{
+	configv1.ClusterVersionCapabilityCompatibilityRequirements: {
+		"CRDCompatibilityRequirementOperator",
+		"ClusterAPIMachineManagement",
+	},
+	configv1.ClusterVersionCapabilityClusterAPI: {
+		"ClusterAPIMachineManagement",
+	},
+}
+
+// gatedCapabilities returns the set of capabilities that should be excluded
+// because none of their enabling feature gates are in enabledFeatureGates.
+func gatedCapabilities(enabledFeatureGates sets.Set[string]) sets.Set[configv1.ClusterVersionCapability] {
+	excluded := sets.New[configv1.ClusterVersionCapability]()
+	for cap, gates := range featureGatedCapabilities {
+		enabled := false
+		for _, gate := range gates {
+			if enabledFeatureGates.Has(gate) {
+				enabled = true
+				break
+			}
+		}
+		if !enabled {
+			excluded.Insert(cap)
+		}
+	}
+	return excluded
+}
+
+// FilterByFeatureGates returns the subset of capabilities whose required
+// feature gates are enabled.
+func FilterByFeatureGates(capabilities []configv1.ClusterVersionCapability,
+	enabledFeatureGates sets.Set[string]) []configv1.ClusterVersionCapability {
+
+	excluded := gatedCapabilities(enabledFeatureGates)
+	var filtered []configv1.ClusterVersionCapability
+	for _, c := range capabilities {
+		if !excluded.Has(c) {
+			filtered = append(filtered, c)
+		}
+	}
+	return filtered
+}
+
 type ClusterCapabilities struct {
 	Known             sets.Set[configv1.ClusterVersionCapability]
 	Enabled           sets.Set[configv1.ClusterVersionCapability]
@@ -35,15 +83,19 @@ func SortedList(s sets.Set[configv1.ClusterVersionCapability]) []configv1.Cluste
 // SetCapabilities populates and returns cluster capabilities from ClusterVersion's capabilities specification and a
 // collection of capabilities that are enabled including implicitly enabled.
 // It ensures that each capability in the collection is still enabled in the returned cluster capabilities
-// and recognizes all implicitly enabled ones.
+// and recognizes all implicitly enabled ones. Capabilities gated behind feature gates that are not in
+// enabledFeatureGates are excluded from both Known and Enabled sets.
 func SetCapabilities(config *configv1.ClusterVersion,
-	capabilities []configv1.ClusterVersionCapability) ClusterCapabilities {
+	capabilities []configv1.ClusterVersionCapability,
+	enabledFeatureGates sets.Set[string]) ClusterCapabilities {
+
+	excluded := gatedCapabilities(enabledFeatureGates)
 
 	var clusterCapabilities ClusterCapabilities
-	clusterCapabilities.Known = sets.New[configv1.ClusterVersionCapability](configv1.KnownClusterVersionCapabilities...)
+	clusterCapabilities.Known = sets.New[configv1.ClusterVersionCapability](configv1.KnownClusterVersionCapabilities...).Difference(excluded)
 
 	clusterCapabilities.Enabled, clusterCapabilities.ImplicitlyEnabled =
-		categorizeEnabledCapabilities(config.Spec.Capabilities, capabilities)
+		categorizeEnabledCapabilities(config.Spec.Capabilities, capabilities, excluded)
 
 	return clusterCapabilities
 }
@@ -87,22 +139,31 @@ func GetCapabilitiesStatus(capabilities ClusterCapabilities) configv1.ClusterVer
 
 // categorizeEnabledCapabilities categorizes enabled capabilities by implicitness from cluster version's
 // capabilities specification and a collection of capabilities that are enabled including implicitly enabled.
+// Capabilities in the excluded set are filtered from all sources (baseline set, additional, and prior enabled).
 func categorizeEnabledCapabilities(capabilitiesSpec *configv1.ClusterVersionCapabilitiesSpec,
-	capabilities []configv1.ClusterVersionCapability) (sets.Set[configv1.ClusterVersionCapability],
+	capabilities []configv1.ClusterVersionCapability,
+	excluded sets.Set[configv1.ClusterVersionCapability]) (sets.Set[configv1.ClusterVersionCapability],
 	sets.Set[configv1.ClusterVersionCapability]) {
 
 	capSet := configv1.ClusterVersionCapabilitySetCurrent
 
 	if capabilitiesSpec != nil && len(capabilitiesSpec.BaselineCapabilitySet) > 0 {
 		capSet = capabilitiesSpec.BaselineCapabilitySet
 	}
-	enabled := sets.New[configv1.ClusterVersionCapability](configv1.ClusterVersionCapabilitySets[capSet]...)
+	enabled := sets.New[configv1.ClusterVersionCapability](configv1.ClusterVersionCapabilitySets[capSet]...).Difference(excluded)
 
 	if capabilitiesSpec != nil {
-		enabled.Insert(capabilitiesSpec.AdditionalEnabledCapabilities...)
+		for _, c := range capabilitiesSpec.AdditionalEnabledCapabilities {
+			if !excluded.Has(c) {
+				enabled.Insert(c)
+			}
+		}
 	}
 	implicitlyEnabled := sets.New[configv1.ClusterVersionCapability]()
 	for _, k := range capabilities {
+		if excluded.Has(k) {
+			continue
+		}
 		if !enabled.Has(k) {
 			implicitlyEnabled.Insert(k)
 			enabled.Insert(k)