Skip to content

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-05-11-124243_amd64-2026-05-11_arm64-2026-05-12 #6653

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

Merged
openshift-merge-bot merged 8 commits into from
May 12, 2026
Merged

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-05-11-124243_amd64-2026-05-11_arm64-2026-05-12 #6653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86d976b
update last_rebase.sh
May 12, 2026
7a718e3
update changelog
May 12, 2026
89d66c3
update microshift/deps
May 12, 2026
ce319a1
update etcd/go.mod
May 12, 2026
c03b6fe
update etcd/vendor
May 12, 2026
12e0a3b
update component images
May 12, 2026
1dd1d95
update manifests
May 12, 2026
9375306
update buildfiles
May 12, 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=5f099ccd1e8345f615d10381290909a8ca581b66
KUBE_GIT_COMMIT=f9b62a69d4a05e10b2b7cf8d40afa37f9dcd0938
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-06-233705
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-05-12-005002
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-05-231020
OCP_VERSION := 5.0.0-0.nightly-2026-05-11-124243
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:39553f8b8ee836be1f442665fc55be7642261b7766f4b2fff0b30718abc9dae2
digest: sha256:73f11be8a6070813c96e4d8ff2d2e24e2a109605e3b841f9a9d3a3d8b55f3e4b
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:6cbb31dceaec7a3fd771c614b804176e0947bc4e5278e3af167b9b1ba744e740
digest: sha256:149ee8fd8551c31560aa16d13735cfbba52170c9d8426c0976a948be977f20a0
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:9e3d2bea43fd760020304e1b77e4d8b22c1effb0c575bb00efda8ce4c73f0ead
digest: sha256:e8415fc215551f96f07f530ef639f2d34a19a46cad9366dc6c9032e5d99fe072
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:12943ba669bad24ae74176906654bd96b46827714f7e0bb46db338d920215ede
digest: sha256:ff48e2a9e74c7df6f9c32584f0e57042ee220b55f057250458c7f7d1b192958d
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "5.0.0-0.nightly-arm64-2026-05-06-233705"
"base": "5.0.0-0.nightly-arm64-2026-05-12-005002"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:39553f8b8ee836be1f442665fc55be7642261b7766f4b2fff0b30718abc9dae2",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6cbb31dceaec7a3fd771c614b804176e0947bc4e5278e3af167b9b1ba744e740"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:73f11be8a6070813c96e4d8ff2d2e24e2a109605e3b841f9a9d3a3d8b55f3e4b",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:149ee8fd8551c31560aa16d13735cfbba52170c9d8426c0976a948be977f20a0"
}
}
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "5.0.0-0.nightly-2026-05-05-231020"
"base": "5.0.0-0.nightly-2026-05-11-124243"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9e3d2bea43fd760020304e1b77e4d8b22c1effb0c575bb00efda8ce4c73f0ead",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:12943ba669bad24ae74176906654bd96b46827714f7e0bb46db338d920215ede"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e8415fc215551f96f07f530ef639f2d34a19a46cad9366dc6c9032e5d99fe072",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ff48e2a9e74c7df6f9c32584f0e57042ee220b55f057250458c7f7d1b192958d"
}
}
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:882318cac95ca934668849dcd7d5da9a9198c968c6b561ac9bb43b28c5454ff2
digest: sha256:21c33428b24b91c0a43f5d0cfdf36f7edd3fbb8993608ab8064f278c97db27dc
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:cf89dd206b52c7bb704d6609e90d47fe116a68bcf5c6e20525bebf9fe2d9b370
digest: sha256:675807ed89d3bb4f0902ec755b5c274d1ab56cf5ca147234545be15385a1ea81
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:0446463c285378b96336a9bcfdc1560181ceb3c2c2c9d0e1274c4978d043a10e
digest: sha256:cec571651e2c2d3baa6563a668640de47885aa0edb29c50d0e0b9de801ed087a

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cf89dd206b52c7bb704d6609e90d47fe116a68bcf5c6e20525bebf9fe2d9b370
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:675807ed89d3bb4f0902ec755b5c274d1ab56cf5ca147234545be15385a1ea81
- 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:882318cac95ca934668849dcd7d5da9a9198c968c6b561ac9bb43b28c5454ff2
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:21c33428b24b91c0a43f5d0cfdf36f7edd3fbb8993608ab8064f278c97db27dc
target:
kind: Deployment
labelSelector: app=catalog-operator
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:9af145c15f17fbc08ff3490c71e6a69fdb364914be5ae3c3cf0498d55cbc40c9
digest: sha256:e57542abded69dd4d611b2d2b3d71cf822ec4723fd7f9fc84e7e2299006e3d34
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:bc549adfc831847203871fe9ebd1a4c9f54ab5f94843a3c4f20c9f9553984767
digest: sha256:b0f06b001f73caed321f1aa4e47864a304e1c82088a6ca09c9dda41a923ff225
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:3482ea3d2b8dce334f07b89086fdb06543d1a1680b4e71f937fbd13a171c42cf
digest: sha256:f13c5c6ca411b698f12b86ae816dedf4c3955550567c99ed5f391219cda638a4

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:bc549adfc831847203871fe9ebd1a4c9f54ab5f94843a3c4f20c9f9553984767
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b0f06b001f73caed321f1aa4e47864a304e1c82088a6ca09c9dda41a923ff225
- 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:9af145c15f17fbc08ff3490c71e6a69fdb364914be5ae3c3cf0498d55cbc40c9
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e57542abded69dd4d611b2d2b3d71cf822ec4723fd7f9fc84e7e2299006e3d34
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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-06-233705"
"base": "5.0.0-0.nightly-arm64-2026-05-12-005002"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:882318cac95ca934668849dcd7d5da9a9198c968c6b561ac9bb43b28c5454ff2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cf89dd206b52c7bb704d6609e90d47fe116a68bcf5c6e20525bebf9fe2d9b370",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0446463c285378b96336a9bcfdc1560181ceb3c2c2c9d0e1274c4978d043a10e"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:21c33428b24b91c0a43f5d0cfdf36f7edd3fbb8993608ab8064f278c97db27dc",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:675807ed89d3bb4f0902ec755b5c274d1ab56cf5ca147234545be15385a1ea81",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cec571651e2c2d3baa6563a668640de47885aa0edb29c50d0e0b9de801ed087a"
}
}
8 changes: 4 additions & 4 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-05-231020"
"base": "5.0.0-0.nightly-2026-05-11-124243"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9af145c15f17fbc08ff3490c71e6a69fdb364914be5ae3c3cf0498d55cbc40c9",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:bc549adfc831847203871fe9ebd1a4c9f54ab5f94843a3c4f20c9f9553984767",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3482ea3d2b8dce334f07b89086fdb06543d1a1680b4e71f937fbd13a171c42cf"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e57542abded69dd4d611b2d2b3d71cf822ec4723fd7f9fc84e7e2299006e3d34",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b0f06b001f73caed321f1aa4e47864a304e1c82088a6ca09c9dda41a923ff225",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f13c5c6ca411b698f12b86ae816dedf4c3955550567c99ed5f391219cda638a4"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.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-arm64-2026-05-06-233705"
"base": "5.0.0-0.nightly-arm64-2026-05-12-005002"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3277eaa3a85a72ce660972f7baebbe0748e7c9f011856c0a663dd46456275484",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e9864b5d80dfd8f55aabae4b59c1589d5c5632085def754a3857a34b8a371f73",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7f283ab977c67b26b55efc5476855e16e24a46b453a01a2d8ff389aca4db4547",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0446463c285378b96336a9bcfdc1560181ceb3c2c2c9d0e1274c4978d043a10e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f571b5d5727dd2f1ab6093338bf12d9fad21d6672a2fa3f3a5db0997ebc76d25",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cc92fce3d1515a67507dde231828df292e47d8c1e10bf399d12cf395ff9d5178",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b6761de6a76f9dad5eaef988546747c4836b3ead5e619d20026824a9dc2b0893",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e86d9cc51e3a9fa6d60a74334b7e67605cabf06c21d20c8eeda451163e5ac6d7",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d15b0434daaf74307dc657f01b0e839113975673b29631cabecf60b6b5d7ad41",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a7822f60917bfce09cff143e72a6b2390306758349d6427f5b6538b360762fe2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cec571651e2c2d3baa6563a668640de47885aa0edb29c50d0e0b9de801ed087a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a0c062b4b9d1c63228ee2e64f2685a7bc1bffa77b868ef26a8235914b91b9300",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1ac9976abdc1f970ca46f8501acc9fb0138e05c563dbadf05feb54d26dec3266",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:224586cfd55f819b3c5902fd9b4de5d5ac972367685401c3a900991adffc864a",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ce0f839b8e9c87191ea14eb415d2e4da4f938f31d67e22b00ecea232528ed4c5"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6f26fbaa1f82868643a3cbea3e2653e8d2c0989a2f6cf89e5d56287171600e0b"
}
}
18 changes: 9 additions & 9 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-05-231020"
"base": "5.0.0-0.nightly-2026-05-11-124243"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e8b207ab1f79cd199ed14b049e94c0b20575a432f345c6b26958e93f8bd0950f",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:304935bdd611c30672df711b3a2ef97166a103adbf8b001cdf5e4f4522da5271",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0549986bcbce883d1025bf92e21226e3a651405f543b97e39a9cec663aa975ce",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3482ea3d2b8dce334f07b89086fdb06543d1a1680b4e71f937fbd13a171c42cf",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a1665452c9943ca04b084e2f6b5016690ac820212687a3767ff1c89bdeb1a6f6",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:928bc512af4f6a8372f90d9e3c1aae0e5f11def3ad36e94e96be9abf0e98c718",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5e568f1c00750c8e248388b53d4c3b12a5cdb714e350a74a5199c52ec11c8613",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4af05674c7b071a474fc313fb5690ff3075c4570741ad4c9299b9faaf69047d2",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:69861b394424bf154055f1686c29f33f0921a806950ac110be7729c708377562",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:74e83c0a70aba0011572975f16db81baacd50d2a4f475e6c01a6e16a4588a0d6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f13c5c6ca411b698f12b86ae816dedf4c3955550567c99ed5f391219cda638a4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1a9368809cdec543a6536cb5468f31b6b17d7fee5d19fcab10935502552bf633",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:afcd66c0f0a7916c06e3e0e1a002865f87f4860ec9e5b0ceb4808f5caa4248dd",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f655382abcff36918f10887506d45788529526a5885a915615253076e0c1b976",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2fb9d63f94d6f17f4ddd326d2dd8f78b041b8001747117919eb87e30a6a150f4"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:035898ef78e775142f00f4de268fd24aac0e3f52dc689b2a02f172d506bcea9b"
}
}
8 changes: 5 additions & 3 deletions deps/github.com/openshift/kubernetes/test/e2e/apimachinery/watchlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,13 @@ var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithFeatureGate(
f.Namespace.Name,
time.Duration(0),
nil,
nil,
func(options *metav1.ListOptions) {
options.LabelSelector = "watchlist=true"
},
)

_ = addWellKnownSecrets(ctx, f)
expectedSecrets, err := metadataClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).List(ctx, metav1.ListOptions{})
expectedSecrets, err := metadataClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).List(ctx, metav1.ListOptions{LabelSelector: "watchlist=true"})
framework.ExpectNoError(err)

ginkgo.By("Starting the secret meta informer")
Expand All @@ -131,7 +133,7 @@ var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithFeatureGate(
_, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Update(ctx, secret, metav1.UpdateOptions{})
framework.ExpectNoError(err)

expectedSecrets, err = metadataClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).List(ctx, metav1.ListOptions{})
expectedSecrets, err = metadataClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).List(ctx, metav1.ListOptions{LabelSelector: "watchlist=true"})
framework.ExpectNoError(err)
verifyStoreFor(ctx, verifyPartialObjectMetadataStore(toPointerSlice(expectedSecrets.Items), secretMetaInformer.Informer().GetStore()))
})
Expand Down
26 changes: 13 additions & 13 deletions etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ require (
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/net v0.51.0 // indirect
golang.org/x/net v0.52.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/term v0.41.0 // indirect
golang.org/x/text v0.36.0 // indirect
golang.org/x/time v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
Expand Down Expand Up @@ -133,13 +133,13 @@ require (
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
go.etcd.io/bbolt v1.4.3 // indirect
go.etcd.io/etcd/api/v3 v3.6.8
go.etcd.io/etcd/client/pkg/v3 v3.6.8 // indirect
go.etcd.io/etcd/client/v3 v3.6.8 // indirect
go.etcd.io/etcd/pkg/v3 v3.6.5 // indirect
go.etcd.io/etcd/api/v3 v3.6.11
go.etcd.io/etcd/client/pkg/v3 v3.6.11 // indirect
go.etcd.io/etcd/client/v3 v3.6.11 // indirect
go.etcd.io/etcd/pkg/v3 v3.6.11 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
golang.org/x/crypto v0.48.0 // indirect
golang.org/x/crypto v0.49.0 // indirect
google.golang.org/grpc v1.79.3 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
Expand All @@ -148,11 +148,11 @@ require (

replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7 // from kubernetes
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849 // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260312150232-d8d67b8ce849 // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849 // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849 // from etcd
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245 // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 // from etcd
)

replace (
Expand Down
Loading