using latest fork bump for o/api

Author: miyadav

go.mod

@@ -115,4 +115,4 @@ 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-20260617162329-2cf942dc34c9
+replace github.com/openshift/api => github.com/miyadav/api v0.0.0-20260618103613-8816b16ded02

go.sum

@@ -96,8 +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-20260617162329-2cf942dc34c9 h1:4g4WrcEUqtgQFhXfl1DrCFV6XYoR01k728G5LqEvP9I=
-github.com/miyadav/api v0.0.0-20260617162329-2cf942dc34c9/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
+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=

lib/capability/capability.go

@@ -9,25 +9,34 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 )
 
-// featureGatedCapabilities maps feature gate names to the capabilities they
-// gate. When a feature gate is absent from the enabled set, its capabilities
-// are excluded from Known, Enabled, and baseline capability set resolution.
-// This mirrors the FeatureGateAwareEnum annotations on ClusterVersionCapability
-// in the openshift/api types.
-var featureGatedCapabilities = map[string][]configv1.ClusterVersionCapability{
-	"CRDCompatibilityRequirementOperator": {
-		configv1.ClusterVersionCapabilityCompatibilityRequirements,
-		configv1.ClusterVersionCapabilityClusterAPI,
+// 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 their required feature gates are not in enabledFeatureGates.
+// 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 gate, caps := range featureGatedCapabilities {
-		if !enabledFeatureGates.Has(gate) {
-			excluded.Insert(caps...)
+	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

lib/capability/capability_test.go

@@ -14,8 +14,8 @@ import (
 // allFeatureGates returns a feature gate set with all gates that gate capabilities enabled.
 func allFeatureGates() sets.Set[string] {
 	gates := sets.New[string]()
-	for gate := range featureGatedCapabilities {
-		gates.Insert(gate)
+	for _, capGates := range featureGatedCapabilities {
+		gates.Insert(capGates...)
 	}
 	return gates
 }