OKD-259: Bump openshift/api and add support for OKD featureset specific CRDs

go.mod

@@ -20,8 +20,8 @@ require (
 	github.com/google/go-cmp v0.7.0
 	github.com/google/gopacket v1.1.19
 	github.com/istio-ecosystem/sail-operator v0.0.0-20250513111011-30be83268d6b
-	github.com/openshift/api v0.0.0-20251120154321-0952bf66a5db
-	github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
+	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-20251021141706-f489e811f030
 	github.com/operator-framework/api v0.30.0
 	github.com/pkg/errors v0.9.1

go.sum

@@ -342,10 +342,10 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
 github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
 github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
-github.com/openshift/api v0.0.0-20251120154321-0952bf66a5db h1:PlacUG7XpFA+5UTHgCE5qCLXMQop+QVDgMePMasMzEQ=
-github.com/openshift/api v0.0.0-20251120154321-0952bf66a5db/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
-github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 h1:9JBeIXmnHlpXTQPi7LPmu1jdxznBhAE7bb1K+3D8gxY=
-github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235/go.mod h1:L49W6pfrZkfOE5iC1PqEkuLkXG4W0BX4w8b+L2Bv7fM=
+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-20251021141706-f489e811f030 h1:dbv8ZYDWIl22A5WBjQJTKeENM08f8HwMBuv8glDXO/0=
 github.com/openshift/library-go v0.0.0-20251021141706-f489e811f030/go.mod h1:OlFFws1AO51uzfc48MsStGE4SFMWlMZD0+f5a/zCtKI=
 github.com/operator-framework/api v0.30.0 h1:44hCmGnEnZk/Miol5o44dhSldNH0EToQUG7vZTl29kk=

hack/update-generated-crd.sh

@@ -4,10 +4,8 @@ set -euo pipefail
 function install_crd {
   local SRC="$1"
   local DST="$2"
-  if [[ -e "$SRC" ]]
-  then
-    if [[ -e "$DST" ]]
-    then
+  if [[ -e "$SRC" ]]; then
+    if [[ -e "$DST" ]]; then
       if ! diff -Naup "$SRC" "$DST"; then
         cp "$SRC" "$DST"
         echo "updated CRD: $SRC => $DST"
@@ -19,8 +17,7 @@ function install_crd {
       echo "updated CRD: $SRC => $DST"
     fi
   else
-    if [[ -e "$DST" ]]
-    then
+    if [[ -e "$DST" ]]; then
       rm "$DST"
       echo "removed CRD that not vendored: $DST"
     else
@@ -51,3 +48,7 @@ install_crd \
 install_crd \
   "vendor/github.com/openshift/api/operatoringress/v1/zz_generated.crd-manifests/0000_50_dns_01_dnsrecords.crd.yaml" \
   "manifests/00-custom-resource-definition-internal.yaml"
+
+install_crd \
+  "vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-OKD.crd.yaml" \
+  "manifests/00-custom-resource-definition-OKD.yaml"

hack/verify-generated-crd.sh

@@ -4,10 +4,8 @@ set -euo pipefail
 function verify_crd {
   local SRC="$1"
   local DST="$2"
-  if [[ -e "$SRC" ]]
-  then
-    if [[ -e "$DST" ]]
-    then
+  if [[ -e "$SRC" ]]; then
+    if [[ -e "$DST" ]]; then
       if ! diff -Naup "$SRC" "$DST"; then
         echo "inconsistent CRD: $SRC => $DST"
         exit 1
@@ -17,8 +15,7 @@ function verify_crd {
       exit 1
     fi
   else
-    if [[ -e "$DST" ]]
-    then
+    if [[ -e "$DST" ]]; then
       echo "extra CRD: $DST"
       exit 1
     fi
@@ -45,3 +42,7 @@ verify_crd \
 verify_crd \
   "vendor/github.com/openshift/api/operatoringress/v1/zz_generated.crd-manifests/0000_50_dns_01_dnsrecords.crd.yaml" \
   "manifests/00-custom-resource-definition-internal.yaml"
+
+verify_crd \
+  "vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-OKD.crd.yaml" \
+  "manifests/00-custom-resource-definition-OKD.yaml"