Skip to content

[release-4.19] OCPBUGS-55998: Update manifests to remove reliance on v1beta1 admission registration #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
openshift-cherrypick-robot wants to merge 2 commits into from
Closed

[release-4.19] OCPBUGS-55998: Update manifests to remove reliance on v1beta1 admission registration #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f6db8e
UPSTREAM: <carry>: Update manifests-gen dependency
JoelSpeed May 9, 2025
f4225d9
UPSTREAM: <carry>: Update generated manifests
JoelSpeed May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openshift/infrastructure-components-openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion openshift/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@damdo damdo May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, do we want to use the latest release-4.19 branch of the manifests-gen?
This might work too, but keeping the same branch level reference might be better?

Copy link

@JoelSpeed JoelSpeed May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you think that's preferable I'll close this and create a replacement with the 4.19 tag, but the 4.19 branch of capi operator hasn't merged yet so that will have to wait

Copy link
Member

@damdo damdo May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might be preferrable as an approach yeah. But if we are in a hurry we can merge this and create a new Pr once the capi operator one has merged.

Copy link
Member

@damdo damdo May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JoelSpeed you can now use cluster-capi-operator's 72ad6eb commit, which landed in release-4.19 for this.


require (
github.com/MakeNowJust/heredoc v1.0.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions openshift/tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions ...t/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion openshift/tools/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down