bump(github.com/openshift/api): DeploymentConfig: drop capability from the enabled-by-default set

Author: ingvagabund

go.mod

@@ -33,6 +33,8 @@ require (
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
 
+replace github.com/openshift/api => github.com/ingvagabund/api v0.0.0-20240710095333-9834d9d2e14c
+
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect

go.sum

@@ -51,6 +51,8 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/ingvagabund/api v0.0.0-20240710095333-9834d9d2e14c h1:/PzXqfU1iOlQzGgiv2eurWzs//KP8uPMidoVQxb8HNM=
+github.com/ingvagabund/api v0.0.0-20240710095333-9834d9d2e14c/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
@@ -87,8 +89,6 @@ github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY
 github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
 github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
 github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
-github.com/openshift/api v0.0.0-20240709002213-329ea3755649 h1:SNRfdvELziNiUypTjDGz4L48Zg/pwpXB/Ktj1KiG210=
-github.com/openshift/api v0.0.0-20240709002213-329ea3755649/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
 github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
 github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
 github.com/openshift/library-go v0.0.0-20240709182732-b94141242b0c h1:J79MQ2jYap7l9ugCosp73mIcb6PNcXeczINlyfGC7XA=

lib/capability/capability_test.go

@@ -34,7 +34,7 @@ func TestSetCapabilities(t *testing.T) {
 					},
 				},
 			},
-			wantKnownKeys:   configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
+			wantKnownKeys:   configv1.KnownClusterVersionCapabilities,
 			wantEnabledKeys: []configv1.ClusterVersionCapability{},
 		},
 		{name: "set capabilities 4_11",
@@ -46,7 +46,7 @@ func TestSetCapabilities(t *testing.T) {
 					},
 				},
 			},
-			wantKnownKeys: configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
+			wantKnownKeys: configv1.KnownClusterVersionCapabilities,
 			wantEnabledKeys: []configv1.ClusterVersionCapability{
 				configv1.ClusterVersionCapabilityBaremetal,
 				configv1.ClusterVersionCapabilityMarketplace,
@@ -63,7 +63,7 @@ func TestSetCapabilities(t *testing.T) {
 					},
 				},
 			},
-			wantKnownKeys:   configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
+			wantKnownKeys:   configv1.KnownClusterVersionCapabilities,
 			wantEnabledKeys: configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
 		},
 		{name: "set capabilities None with additional",
@@ -75,7 +75,7 @@ func TestSetCapabilities(t *testing.T) {
 					},
 				},
 			},
-			wantKnownKeys:   configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
+			wantKnownKeys:   configv1.KnownClusterVersionCapabilities,
 			wantEnabledKeys: []configv1.ClusterVersionCapability{"cap1", "cap2", "cap3"},
 		},
 		{name: "set capabilities 4_11 with additional",
@@ -87,7 +87,7 @@ func TestSetCapabilities(t *testing.T) {
 					},
 				},
 			},
-			wantKnownKeys: configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent],
+			wantKnownKeys: configv1.KnownClusterVersionCapabilities,
 			wantEnabledKeys: []configv1.ClusterVersionCapability{
 				configv1.ClusterVersionCapabilityBaremetal,
 				configv1.ClusterVersionCapabilityMarketplace,
@@ -105,7 +105,7 @@ func TestSetCapabilities(t *testing.T) {
 			if test.config.Spec.Capabilities == nil || (test.config.Spec.Capabilities != nil &&
 				len(test.config.Spec.Capabilities.BaselineCapabilitySet) == 0) {
 
-				test.wantKnownKeys = configv1.ClusterVersionCapabilitySets[DefaultCapabilitySet]
+				test.wantKnownKeys = configv1.KnownClusterVersionCapabilities
 				test.wantEnabledKeys = configv1.ClusterVersionCapabilitySets[DefaultCapabilitySet]
 			}
 			if len(caps.KnownCapabilities) != len(test.wantKnownKeys) {

vendor/github.com/openshift/api/config/v1/types_cluster_version.go

@@ -104,7 +104,7 @@ github.com/munnerz/goautoneg
 # github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
 ## explicit
 github.com/mwitkow/go-conntrack
-# github.com/openshift/api v0.0.0-20240709002213-329ea3755649
+# github.com/openshift/api v0.0.0-20240709002213-329ea3755649 => github.com/ingvagabund/api v0.0.0-20240710095333-9834d9d2e14c
 ## explicit; go 1.22.0
 github.com/openshift/api/config/v1
 github.com/openshift/api/config/v1/zz_generated.crd-manifests
@@ -790,3 +790,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
+# github.com/openshift/api => github.com/ingvagabund/api v0.0.0-20240710095333-9834d9d2e14c