Skip to content

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-05-28-160024_amd64-2026-05-28_arm64-2026-05-28 #6765

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
microshift-rebase-script wants to merge 10 commits into from
Closed

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-05-28-160024_amd64-2026-05-28_arm64-2026-05-28 #6765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a46d901
update last_rebase.sh
May 29, 2026
e526c99
update changelog
May 29, 2026
39b8349
update microshift/go.mod
May 29, 2026
8e6d88f
update microshift/deps
May 29, 2026
6727816
update microshift/vendor
May 29, 2026
50cd450
update etcd/go.mod
May 29, 2026
a27a73f
update etcd/vendor
May 29, 2026
4889fde
update component images
May 29, 2026
4069f52
update manifests
May 29, 2026
aaf0d3d
update buildfiles
May 29, 2026
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
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=35
KUBE_GIT_VERSION=v1.35.3
KUBE_GIT_COMMIT=73359c58edaa0a838b8557b8743ad5860a955272
KUBE_GIT_COMMIT=99b75aa92a7f60c4446ee29f54d511f140a8aed0
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-05-26-222818
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-05-28-222818
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 5.0.0-0.nightly-2026-05-26-174704
OCP_VERSION := 5.0.0-0.nightly-2026-05-28-160024
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "5.0.0-0.nightly-arm64-2026-05-26-222818"
"base": "5.0.0-0.nightly-arm64-2026-05-28-222818"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9731df837f9dc3677bf2676d9a739eb12f76a38b1870a00792cd70e5dff9f03b",
Expand Down
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "5.0.0-0.nightly-2026-05-26-174704"
"base": "5.0.0-0.nightly-2026-05-28-160024"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0d60eed5435b727796d71713f0e4edae2f8cf009e0c5af2c42747a1b100dfd33",
Expand Down
11 changes: 2 additions & 9 deletions assets/components/openshift-dns/dns/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,8 @@ spec:
failureThreshold: 5
resources:
requests:
{{- range $key, $value := .DNSRequests }}
{{ $key }}: {{ $value }}
{{- end }}
{{- if .DNSLimits }}
limits:
{{- range $key, $value := .DNSLimits }}
{{ $key }}: {{ $value }}
{{- end }}
{{- end }}
cpu: 50m
memory: 70Mi
securityContext:
readOnlyRootFilesystem: true
image: '{{ .ReleaseImage.coredns }}'
Expand Down
4 changes: 2 additions & 2 deletions assets/crd/route.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,13 +558,13 @@ spec:
- termination
type: object
x-kubernetes-validations:
- message: cannot have both spec.tls.certificate and spec.tls.externalCertificate
rule: '!(has(self.certificate) && has(self.externalCertificate))'
- message: 'cannot have both spec.tls.termination: passthrough and
spec.tls.insecureEdgeTerminationPolicy: Allow'
rule: 'has(self.termination) && has(self.insecureEdgeTerminationPolicy)
? !((self.termination==''passthrough'') && (self.insecureEdgeTerminationPolicy==''Allow''))
: true'
- message: cannot have both spec.tls.certificate and spec.tls.externalCertificate
rule: '!(has(self.certificate) && has(self.externalCertificate))'
to:
description: |-
to is an object the route should use as the primary backend. Only the Service kind
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:2c558201f20ace0b9821fb503987b4e2935e274f234814985a88d904750db9f1
digest: sha256:62283e52d11c75defea93afdf86f8d50e8028155bde588b4d43298f7204c4188
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:08137e8f36709774747cba2b02b945c11133d03b4a9d44c89708d4510298d21d
digest: sha256:8ce7c9323a5e3e69503fa94cbf7089deffaa37fe4aeb949fdf3e6f227f8a93ae
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:0053edf86c2a802a62a07af974324ad4f1aa37c5f85164255321d8bf676820fc
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:08137e8f36709774747cba2b02b945c11133d03b4a9d44c89708d4510298d21d
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8ce7c9323a5e3e69503fa94cbf7089deffaa37fe4aeb949fdf3e6f227f8a93ae
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2c558201f20ace0b9821fb503987b4e2935e274f234814985a88d904750db9f1
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:62283e52d11c75defea93afdf86f8d50e8028155bde588b4d43298f7204c4188
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:321f65bd957eb4610b14e8144d764af9515c61a03bc2cb3b80cbeffae1caecd4
digest: sha256:7f415763ee0a7c205f5e6f11b4fa5aff0aaa0eda109288aaf8d123f6dba59d3b
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:c57766ca2613f6401fdaf07edd918f071548e73b059e7e173625f112d687ce51
digest: sha256:770b6bc7d12769e0fd835da058fc4d31c96cc7b6a6511d52ee9393ea6a81a17b
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:021ef755badbca515d58b612e314b021ef2f50312811c9721b1f4c5f2c6b8529
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c57766ca2613f6401fdaf07edd918f071548e73b059e7e173625f112d687ce51
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:770b6bc7d12769e0fd835da058fc4d31c96cc7b6a6511d52ee9393ea6a81a17b
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:321f65bd957eb4610b14e8144d764af9515c61a03bc2cb3b80cbeffae1caecd4
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7f415763ee0a7c205f5e6f11b4fa5aff0aaa0eda109288aaf8d123f6dba59d3b
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "5.0.0-0.nightly-arm64-2026-05-26-222818"
"base": "5.0.0-0.nightly-arm64-2026-05-28-222818"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2c558201f20ace0b9821fb503987b4e2935e274f234814985a88d904750db9f1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:08137e8f36709774747cba2b02b945c11133d03b4a9d44c89708d4510298d21d",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:62283e52d11c75defea93afdf86f8d50e8028155bde588b4d43298f7204c4188",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8ce7c9323a5e3e69503fa94cbf7089deffaa37fe4aeb949fdf3e6f227f8a93ae",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0053edf86c2a802a62a07af974324ad4f1aa37c5f85164255321d8bf676820fc"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "5.0.0-0.nightly-2026-05-26-174704"
"base": "5.0.0-0.nightly-2026-05-28-160024"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:321f65bd957eb4610b14e8144d764af9515c61a03bc2cb3b80cbeffae1caecd4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c57766ca2613f6401fdaf07edd918f071548e73b059e7e173625f112d687ce51",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7f415763ee0a7c205f5e6f11b4fa5aff0aaa0eda109288aaf8d123f6dba59d3b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:770b6bc7d12769e0fd835da058fc4d31c96cc7b6a6511d52ee9393ea6a81a17b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:021ef755badbca515d58b612e314b021ef2f50312811c9721b1f4c5f2c6b8529"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "5.0.0-0.nightly-arm64-2026-05-26-222818"
"base": "5.0.0-0.nightly-arm64-2026-05-28-222818"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b09be655df91261f96df64a17c9af8754238f9de772e06c1af14fc2f7e8a2918",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:477b23e4acc6f370f1083ed2ff9d29800475b67d604aba5ef9dbcdede647d528",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8ce94c719d49cdc98b56a4595bbbff75721381e0e2432b4d93faa1e54793b2be",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0053edf86c2a802a62a07af974324ad4f1aa37c5f85164255321d8bf676820fc",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c4e4917c83de2f90fa2ca0159cedc4b567cd43ea78e930cc545ae82bc20ab8ab",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:af5e12c36f61bb875e0964b33df921ab95efae7f940405a70ac04c4c041f320d",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2d655ca263dd1cca079e6093e8d630cfb1c5badd8e4fe8ddf188e5c71e650701",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:098ad69386ec4e9523e604081d2e562cd0f93a6cbae18af46bbf290c02cf3b0a",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:851f03cc7e38750d55d9d526dd1b7ca5f4babc4ecf5860066a106c73ebe7c122"
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "5.0.0-0.nightly-2026-05-26-174704"
"base": "5.0.0-0.nightly-2026-05-28-160024"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5834bc2fe2f60d6ddcd1e52c3f3d6f542213cd97c06c4fe9a98de979fde6f772",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:521fdf9daae2a5e9427b1f337d6f7d574e1e07cba0fbedc5dcdecc200944b240",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0f5e8e002ada1f7adc0116b8393fdeacabfcc418924134a7f49fa55b4b298117",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:021ef755badbca515d58b612e314b021ef2f50312811c9721b1f4c5f2c6b8529",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:de7d3cab66356363569fe490cc954a1899ba008c17c12222cd44f5a0c93792e3",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f517e497d9e363f83bffcb31da6a7ce65fd596e3b7f34a845ddb5369a686c796",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:33402db6db336615409b979a031a8cae93b6141986df0d5bd60e2b44978daf63",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:64bdd7ad7048c1a3258e57f0182a37582404c3bcca5fb7b24314a0497d2c60b2",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:73866ac98e9c07e10e29a7e53eef7938e2fda7864a9d9fb195aeb1c2efe55d19"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3554be064fdbdc1255b5f09fcc2e1c28c126d03c4527cadf332d92ebd038d9c9"
}
}
6 changes: 3 additions & 3 deletions deps/github.com/openshift/kubernetes/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ require (
github.com/opencontainers/cgroups v0.0.3
github.com/opencontainers/selinux v1.13.0
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818
github.com/openshift/api v0.0.0-20260408092441-8b086e6b9eb9
github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9
github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31
github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7
github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6
github.com/openshift/client-go v0.0.0-20260512113608-deb4dc54551a
github.com/openshift/library-go v0.0.0-20260520180710-3a6f949c22c3
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
github.com/prometheus/client_golang v1.23.2
github.com/prometheus/client_model v0.6.2
Expand Down
14 changes: 8 additions & 6 deletions deps/github.com/openshift/kubernetes/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,15 +324,15 @@ github.com/opencontainers/selinux v1.13.0 h1:Zza88GWezyT7RLql12URvoxsbLfjFx988+L
github.com/opencontainers/selinux v1.13.0/go.mod h1:XxWTed+A/s5NNq4GmYScVy+9jzXhGBVEOAyucdRUY8s=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818 h1:jJLE/aCAqDf8U4wc3bE1IEKgIxbb0ICjCNVFA49x/8s=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
github.com/openshift/api v0.0.0-20260408092441-8b086e6b9eb9 h1:+4hiHKWaTxwZMhyGkOtEWcPaVBbfIup2w91Ik005eHs=
github.com/openshift/api v0.0.0-20260408092441-8b086e6b9eb9/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9 h1:yb8ul1HPFYhO04yp0D8T/qSySZnKv210f4nE//i/Bdg=
github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31 h1:oYPQMrkzyk002L5aN8I2tkUHTEu9lsVrc1qiJmHJdXU=
github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31/go.mod h1:mnTsMMTtXSPBQzqBp5HXBjLvliveKenRADFQy9m5jc0=
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7 h1:5GSoQlywIwYsRCw3qN+ZDmN6HrXTMZfI33bdRNm2jRQ=
github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7/go.mod h1:HhXTUIMhgzxR3Ln/zEkr4QjTL0NN7A+t9Py/we9j2ug=
github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6 h1:xjqy0OolrFdJ+ofI/aD0+2k9+MSk5anP5dXifFt539Q=
github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6/go.mod h1:D797O/ssKTNglbrGchjIguFq+DbyRYdeds5w4/VTrKM=
github.com/openshift/client-go v0.0.0-20260512113608-deb4dc54551a h1:EKx2XhOKehd1C5ptY7IrLl4WV35E8kP0pRPnG5BUZXk=
github.com/openshift/client-go v0.0.0-20260512113608-deb4dc54551a/go.mod h1:V933kvY/cb/Un7UCEOhXHUySNX327u7Epe8g9KNqg2Q=
github.com/openshift/library-go v0.0.0-20260520180710-3a6f949c22c3 h1:AHjJETxL4n2ocMHBY7Epqex574puUSJjKIUkbasYAKI=
github.com/openshift/library-go v0.0.0-20260520180710-3a6f949c22c3/go.mod h1:gKG9lctU0yEftSoT3DUyeIWz1oAgF0EHUpwI4pnCo4o=
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7 h1:02E4Ttpu+7yCQLQxtY42JfcfHU7TBGnje6uB2ytBSdU=
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
Expand Down Expand Up @@ -553,12 +553,14 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo=
gopkg.in/evanphx/json-patch.v4 v4.13.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
gopkg.in/go-jose/go-jose.v2 v2.6.3 h1:nt80fvSDlhKWQgSWyHyy5CfmlQr+asih51R8PTWNKKs=
gopkg.in/go-jose/go-jose.v2 v2.6.3/go.mod h1:zzZDPkNNw/c9IE7Z9jr11mBZQhKQTMzoEEIoEdZlFBI=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Expand Down
2 changes: 2 additions & 0 deletions deps/github.com/openshift/kubernetes/go.work.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 h1:PFWFSkpArPNJxFX4ZKWAk9NSeRoZaXschn+ULa4xVek=
sigs.k8s.io/kustomize/cmd/config v0.20.1 h1:4APUORmZe2BYrsqgGfEKdd/r7gM6i43egLrUzilpiFo=
11 changes: 6 additions & 5 deletions ...netes/openshift-kube-apiserver/admission/customresourcevalidation/route/validate_route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ func toRoute(uncastObj runtime.Object) (*routev1.Route, field.ErrorList) {
}

type routeV1 struct {
secretsGetter func() corev1client.SecretsGetter
sarGetter func() authorizationv1client.SubjectAccessReviewsGetter
routeValidationOptsGetter func() RouteValidationOptionGetter
secretsGetter func() corev1client.SecretsGetter
sarGetter func() authorizationv1client.SubjectAccessReviewsGetter
}

func (r routeV1) ValidateCreate(ctx context.Context, obj runtime.Object) field.ErrorList {
Expand All @@ -51,7 +50,8 @@ func (r routeV1) ValidateCreate(ctx context.Context, obj runtime.Object) field.E
return errs
}

return routevalidation.ValidateRoute(ctx, routeObj, r.sarGetter().SubjectAccessReviews(), r.secretsGetter(), r.routeValidationOptsGetter().GetValidationOptions())
// RouteValidationOptions param to be removed after bumping library-go
return routevalidation.ValidateRoute(ctx, routeObj, r.sarGetter().SubjectAccessReviews(), r.secretsGetter())
}

func (r routeV1) ValidateUpdate(ctx context.Context, obj runtime.Object, oldObj runtime.Object) field.ErrorList {
Expand All @@ -65,7 +65,8 @@ func (r routeV1) ValidateUpdate(ctx context.Context, obj runtime.Object, oldObj
return errs
}

return routevalidation.ValidateRouteUpdate(ctx, routeObj, routeOldObj, r.sarGetter().SubjectAccessReviews(), r.secretsGetter(), r.routeValidationOptsGetter().GetValidationOptions())
// RouteValidationOptions param to be removed after bumping library-go
return routevalidation.ValidateRouteUpdate(ctx, routeObj, routeOldObj, r.sarGetter().SubjectAccessReviews(), r.secretsGetter())
}

func (routeV1) ValidateStatusUpdate(_ context.Context, obj runtime.Object, oldObj runtime.Object) field.ErrorList {
Expand Down
1 change: 0 additions & 1 deletion .../openshift-kube-apiserver/admission/customresourcevalidation/route/validate_route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ func (a *validateCustomResourceWithClient) setupWithFakeClient() {
c := fake.NewSimpleClientset()
a.secretsGetter = c.CoreV1()
a.sarGetter = c.AuthorizationV1()
a.routeValidationOptsGetter = NewRouteValidationOpts()
}

// TestValidateRoutePlugin verifies if the route validation plugin can handle admits
Expand Down
31 changes: 0 additions & 31 deletions ...etes/openshift-kube-apiserver/admission/customresourcevalidation/route/validation_opts.go
View file
Open in desktop

This file was deleted.

Loading