From 507c74e56dd73bb3345c87f86b00c9a278e87435 Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Fri, 9 May 2025 17:07:46 +0100 Subject: [PATCH 1/2] UPSTREAM: : Update manifests-gen dependency --- openshift/tools/go.mod | 2 +- openshift/tools/go.sum | 4 ++-- .../cluster-capi-operator/manifests-gen/customizations.go | 4 ++-- openshift/tools/vendor/modules.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openshift/tools/go.mod b/openshift/tools/go.mod index 2d3f0cb7ce..df59e1d45c 100644 --- a/openshift/tools/go.mod +++ b/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-20250513083705-9de86dc17b4f require ( github.com/MakeNowJust/heredoc v1.0.0 // indirect diff --git a/openshift/tools/go.sum b/openshift/tools/go.sum index 9ebb43e195..4a0d043106 100644 --- a/openshift/tools/go.sum +++ b/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-20250513083705-9de86dc17b4f h1:rGmPwhtbu2hX85Td2c5nqU0h/vF9lExU4Xq1G+eG8ys= +github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20250513083705-9de86dc17b4f/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= diff --git a/openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go b/openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go index 612e631307..a3efa37df2 100644 --- a/openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go +++ b/openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go @@ -341,7 +341,7 @@ func mergeMaps[K comparable, V any](maps ...map[K]V) map[K]V { func addInfraClusterProtectionPolicy(objs []unstructured.Unstructured, providerName string) []unstructured.Unstructured { policy := &unstructured.Unstructured{ Object: map[string]interface{}{ - "apiVersion": "admissionregistration.k8s.io/v1beta1", + "apiVersion": "admissionregistration.k8s.io/v1", "kind": "ValidatingAdmissionPolicy", "metadata": map[string]interface{}{ "name": "openshift-cluster-api-protect-" + providerName + "cluster", @@ -374,7 +374,7 @@ func addInfraClusterProtectionPolicy(objs []unstructured.Unstructured, providerN binding := &unstructured.Unstructured{ Object: map[string]interface{}{ - "apiVersion": "admissionregistration.k8s.io/v1beta1", + "apiVersion": "admissionregistration.k8s.io/v1", "kind": "ValidatingAdmissionPolicyBinding", "metadata": map[string]interface{}{ "name": "openshift-cluster-api-protect-" + providerName + "cluster", diff --git a/openshift/tools/vendor/modules.txt b/openshift/tools/vendor/modules.txt index b4e70f0794..441667d916 100644 --- a/openshift/tools/vendor/modules.txt +++ b/openshift/tools/vendor/modules.txt @@ -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-20250513083705-9de86dc17b4f ## explicit; go 1.22.7 github.com/openshift/cluster-capi-operator/manifests-gen # github.com/pelletier/go-toml/v2 v2.2.2 From 29a948745b99f0a02c81f62a6aa7912b37d652aa Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Fri, 9 May 2025 17:29:12 +0100 Subject: [PATCH 2/2] UPSTREAM: : Update generated manifests --- openshift/infrastructure-components-openshift.yaml | 4 ++-- .../0000_30_cluster-api_04_cm.infrastructure-aws.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openshift/infrastructure-components-openshift.yaml b/openshift/infrastructure-components-openshift.yaml index b303eecd01..67afcad1fc 100644 --- a/openshift/infrastructure-components-openshift.yaml +++ b/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 diff --git a/openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-aws.yaml b/openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-aws.yaml index e65a762637..9c18b12901 100644 --- a/openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-aws.yaml +++ b/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