Merge pull request #549 from JoelSpeed/bump-capi-operator

OCPBUGS-55947: Update manifests to remove reliance on v1beta1 admission registration

Author: openshift-merge-bot[bot]

openshift/infrastructure-components-openshift.yaml

@@ -18406,7 +18406,7 @@ spec:
   selector:
     cluster.x-k8s.io/provider: infrastructure-aws
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingAdmissionPolicy
 metadata:
   name: openshift-cluster-api-protect-awscluster
@@ -18430,7 +18430,7 @@ spec:
     message: InfraCluster resources with metadata.name corresponding to the cluster
       infrastructureName cannot be deleted.
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingAdmissionPolicyBinding
 metadata:
   name: openshift-cluster-api-protect-awscluster

openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-aws.yaml

@@ -18408,7 +18408,7 @@ data:
       selector:
         cluster.x-k8s.io/provider: infrastructure-aws
     ---
-    apiVersion: admissionregistration.k8s.io/v1beta1
+    apiVersion: admissionregistration.k8s.io/v1
     kind: ValidatingAdmissionPolicy
     metadata:
       name: openshift-cluster-api-protect-awscluster
@@ -18432,7 +18432,7 @@ data:
         message: InfraCluster resources with metadata.name corresponding to the cluster
           infrastructureName cannot be deleted.
     ---
-    apiVersion: admissionregistration.k8s.io/v1beta1
+    apiVersion: admissionregistration.k8s.io/v1
     kind: ValidatingAdmissionPolicyBinding
     metadata:
       name: openshift-cluster-api-protect-awscluster

openshift/tools/go.mod

@@ -4,7 +4,7 @@ go 1.22.7
 
 toolchain go1.23.6
 
-require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20250326163512-302c8534aab9
+require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20250509150604-ac5aa33f14d7
 
 require (
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect

openshift/tools/go.sum

@@ -116,8 +116,8 @@ github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y=
 github.com/onsi/gomega v1.36.0/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 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/cluster-capi-operator/manifests-gen v0.0.0-20250326163512-302c8534aab9 h1:/13h1O+FN12St4+EbR949pf5zGazrwbdFdPVemiOUj0=
-github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20250326163512-302c8534aab9/go.mod h1:4+57eaR8Pv6wpuhZhmImQOixmRMUgVN/ugesZddG8xc=
+github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20250509150604-ac5aa33f14d7 h1:SS+1xU25s6waQabfKAdjGFQed7WdY75WWz/UqCaizUg=
+github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20250509150604-ac5aa33f14d7/go.mod h1:4+57eaR8Pv6wpuhZhmImQOixmRMUgVN/ugesZddG8xc=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go

@@ -201,7 +201,7 @@ github.com/munnerz/goautoneg
 # github.com/opencontainers/go-digest v1.0.0
 ## explicit; go 1.13
 github.com/opencontainers/go-digest
-# github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20250326163512-302c8534aab9
+# github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20250509150604-ac5aa33f14d7
 ## explicit; go 1.22.7
 github.com/openshift/cluster-capi-operator/manifests-gen
 # github.com/pelletier/go-toml/v2 v2.2.2