Merge pull request #2720 from tssurya/consume-latest-ocp-api

CORENET-5704: Consume latest vendoring from ocp api repo

Author: openshift-merge-bot[bot]

bindata/cloud-network-config-controller/common/001-crd.yaml

@@ -127,6 +127,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
               node:
                 description: 'node is the node name, as specified by the Kubernetes
                   field: node.metadata.name'

go.mod

@@ -107,7 +107,7 @@ require (
 )
 
 require (
-	github.com/openshift/api v0.0.0-20250313134101-8a7efbfb5316
+	github.com/openshift/api v0.0.0-20250530142525-6ff8c5bc1096
 	github.com/openshift/client-go v0.0.0-20250313171320-82b12a9e232b
 	github.com/openshift/library-go v0.0.0-20250313122028-477d5d90df06
 	github.com/openshift/machine-config-operator v0.0.1-0.20250301161121-24d9a767570d

go.sum

@@ -282,8 +282,8 @@ github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/openshift/api v0.0.0-20250313134101-8a7efbfb5316 h1:iJ1OkAUvFbQPB6qWRDxrH1jj8iA9GA/Jx2vYz7o+i1E=
-github.com/openshift/api v0.0.0-20250313134101-8a7efbfb5316/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
+github.com/openshift/api v0.0.0-20250530142525-6ff8c5bc1096 h1:Rm691Jk4EONgIZLL1lY95QGoZ1YMzCu7sSZVVWlzmXE=
+github.com/openshift/api v0.0.0-20250530142525-6ff8c5bc1096/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
 github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 h1:Pw/OKhN0r8HZcR4No8qh0QygTvuYsDeZhHsK6T9LC+I=
 github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/client-go v0.0.0-20250313171320-82b12a9e232b h1:nsobBSHT30SHY3j5PBG0E2i5AFY9cUxWuWk7Aen4qnQ=

manifests/0000_70_cluster-network-operator_01_egr_crd.yaml

@@ -243,6 +243,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
             required:
             - conditions
             type: object

manifests/0000_70_network_01_networks-Default.crd.yaml

@@ -7,7 +7,6 @@ metadata:
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
-    release.openshift.io/feature-set: CustomNoUpgrade
   name: networks.operator.openshift.io
 spec:
   group: operator.openshift.io