Skip to content

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-06-09-112600_amd64-2026-06-09_arm64-2026-06-10 #6849

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
Jun 10, 2026
Merged

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-06-09-112600_amd64-2026-06-09_arm64-2026-06-10 #6849

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
4185da9
update last_rebase.sh
Jun 10, 2026
46f2a8b
update changelog
Jun 10, 2026
a429542
update etcd/go.mod
Jun 10, 2026
907394f
update etcd/vendor
Jun 10, 2026
fa3cd68
update component images
Jun 10, 2026
d87e030
update manifests
Jun 10, 2026
a6f9d52
update buildfiles
Jun 10, 2026
5ce3059
Update AI Model Serving for MicroShift
Jun 10, 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.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-06-09-012537
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-10-025037
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-06-08-075337
OCP_VERSION := 5.0.0-0.nightly-2026-06-09-112600
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:53ff24eb2aa039458a2b6063e7ad6d54a192047f2e683965938fdbc3af964081
digest: sha256:457d82310a2ecd6823e5eb2a1650d14443c2730ecda4d62ad8b88d181f63463d
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:c0c398bbac716ad20b404521beb4e7b19065ca07b49d81842c6f0b7e4bfe8f9a
digest: sha256:db6025036ff280675e8d784ab0457acfcfa29ec4af35e823e64f04901d39da72
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-06-09-012537"
"base": "5.0.0-0.nightly-arm64-2026-06-10-025037"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:12f6644c521588d72e607d5761c7fa3e9a73bb0aab88b08420a8c5e4d4236ec5",
Expand Down
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-06-08-075337"
"base": "5.0.0-0.nightly-2026-06-09-112600"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:53ff24eb2aa039458a2b6063e7ad6d54a192047f2e683965938fdbc3af964081",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c0c398bbac716ad20b404521beb4e7b19065ca07b49d81842c6f0b7e4bfe8f9a"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:457d82310a2ecd6823e5eb2a1650d14443c2730ecda4d62ad8b88d181f63463d",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:db6025036ff280675e8d784ab0457acfcfa29ec4af35e823e64f04901d39da72"
}
}
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "2.25.6"
"base": "2.25.7"
},
"images": {
"ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest",
Expand Down
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:341f8ea2724f3487c90d649b64749f6fa2d5f97ca8f00dce227725e8bca03ef9
digest: sha256:1e28d2b718e7ad024fd6ac20e5ec4ac5e30ebcc81c136b0c733165a47483625b
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:9b7343b0927caee13e51334c6d9e8d2d85e0f4c671f6a3d20de2b2076726f1aa
digest: sha256:cae1efda5b44d38b54fbc0fa7acee126a8334b4af380691f8c05981d27afb690
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:694eff563bee1f5c0366c51b9adb17f3ff563199075a162c1587639b04b6f918
digest: sha256:cd84fae073953125e6eed47e7feacb146161df6d5222f5d899704686f917c50d

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:9b7343b0927caee13e51334c6d9e8d2d85e0f4c671f6a3d20de2b2076726f1aa
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cae1efda5b44d38b54fbc0fa7acee126a8334b4af380691f8c05981d27afb690
- 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:341f8ea2724f3487c90d649b64749f6fa2d5f97ca8f00dce227725e8bca03ef9
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1e28d2b718e7ad024fd6ac20e5ec4ac5e30ebcc81c136b0c733165a47483625b
target:
kind: Deployment
labelSelector: app=catalog-operator
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "5.0.0-0.nightly-arm64-2026-06-09-012537"
"base": "5.0.0-0.nightly-arm64-2026-06-10-025037"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a65b0dcf06f57dd03e2569f33649f06bc51f0845ceea01ecb141b76eaea485c1",
Expand Down
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-06-08-075337"
"base": "5.0.0-0.nightly-2026-06-09-112600"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:341f8ea2724f3487c90d649b64749f6fa2d5f97ca8f00dce227725e8bca03ef9",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9b7343b0927caee13e51334c6d9e8d2d85e0f4c671f6a3d20de2b2076726f1aa",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:694eff563bee1f5c0366c51b9adb17f3ff563199075a162c1587639b04b6f918"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1e28d2b718e7ad024fd6ac20e5ec4ac5e30ebcc81c136b0c733165a47483625b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cae1efda5b44d38b54fbc0fa7acee126a8334b4af380691f8c05981d27afb690",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cd84fae073953125e6eed47e7feacb146161df6d5222f5d899704686f917c50d"
}
}
8 changes: 4 additions & 4 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-06-09-012537"
"base": "5.0.0-0.nightly-arm64-2026-06-10-025037"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:335cc4f16ae535d0d2e72206f63bba97db6c7f3d7ae8896842e179548e1db76b",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9c3900c948954ad3c9206147f75a9cd3039e6e95947f4bf82ee994db9317202a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:192be02391dc3a8ba2d2074063ed09b1a1a9780053f2d74230b5ba3776e542d3",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b3308350dc53d829dcdad213454159c207ecc634dd2378db4916dea3614c9c9c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6f5dc0bdcbb044810e7b09b01f80df866b3c3af938bd150d818c2914344fb4b2",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:59eba69120cff661709251ed6c21cc5b53ec8f288b5576014f8d893705153e99",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a2216f75ff054a66023649e397c9571b31a63664962ec5aa4d19843e1855d105",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:56ac733f8a19c57d0027aba6bebd7063d85f1cf1b6f474c0180cd8f7d862c71f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cbcbf4bacdc37322bfa70addad27cbc09d1d57dae05e0be5c0bdbab27fd4edc3",
"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:d83e3dcf4ab1942ce4f2c24d1245e83e30c154bc70dd368b0affbd3da25f59d2"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a1d1ef4683809a939a4c7e44d459e141c9c1be5808bfba303fd7a422373a5070"
}
}
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-06-08-075337"
"base": "5.0.0-0.nightly-2026-06-09-112600"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:96c4bfe15029ca7ed406b4a0cb5c9baad5b0a4074f45227fa2471613cd9f18f7",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7855fc379cb5132a46297e8eb1ab6ef79519c6c5b7197a67efe92f9c4446a77d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b6328004015f0b0367b4f345a8a985fbe7310ae06f8a6d16ce798ee5c7bc899e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:694eff563bee1f5c0366c51b9adb17f3ff563199075a162c1587639b04b6f918",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:434a1eb0d9d8cfa841791514bd4cafe51e27b2ba3cb52ee906a0bde5b300c1b8",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f80444cc3da6b00878bbbea034b4122d40e88ce47aa00486d6874d8a49a2dfd1",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1f972056e73eae5769a2aef0a68f8ea0ad796c953e7a03909cda2312fb759a62",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4e9157049bcb87590c356e522fb74ddb350b5f6e375f2007e36b20ecc841cd13",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3707f170213eda5d37f45c8f2f5605c3d4db80acd55f3b7943d90ad0248f8582",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:39fdc41a150c6665c192f1ec06563c5c1f7b8f65e8377a5e2d16cf495c5bca50",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cd84fae073953125e6eed47e7feacb146161df6d5222f5d899704686f917c50d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:78d59d56dd6fb55ffa858fc96f7e67193a28b3baac9cfca46ee1b6a1a4e1bca4",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0b69d8c02c7d6231928b1737e74ee30ade20bce70887b6c7c1d68ae034bc9dcd",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:065512cd13378b366cd1adad78b9047f099bd777dccd0dbb4a99f25f504381e4",
"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:5e138693e4635a21ec4b037759ec023a72102601cd43af51512bc5ca589d266a"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c254280d6a89ed1d0c570544fd1ae40e804fc3c81dc671d161e56bb922add9e9"
}
}
10 changes: 5 additions & 5 deletions etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a // from etcd
)

replace (
Expand Down
20 changes: 10 additions & 10 deletions etcd/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,16 @@ github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9 h1:yb8ul1HPFYhO04yp0
github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af h1:UiYYMi/CCV+kwWrXuXfuUSOY2yNXOpWpNVgHc6aLQlE=
github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 h1:8YsERr2Pg/hIfxcdwdXzZg8yZGNc+CtxpRmaYFVHKhA=
github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245/go.mod h1:HYfTh0jyh+uFgp6gMbxJteIDYY97yMuYz85Rnw6Gy9o=
github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245 h1:Rpg4gRsQ3KgxS6P7kIyjwwrvxGfoVzEkYpf0MTzxWB8=
github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245/go.mod h1:DysuMe/inqRyC/1tjRR6hReH/VV9Lufs27YKSKBWWJg=
github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 h1:++zoFBX5EUFEj75nsJNh6I/FkvRWKjm95cSwFV0FhYY=
github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245/go.mod h1:vOTDMCo+fGPEClJqcFEFSqZ+8e7WKV7AyqJjX//HR2w=
github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 h1:KLbp27TVKtrrCxWpoyMb86M7Pw9xiD91YciRej1XXCM=
github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245/go.mod h1:L/M2AmhhJ1+3WFRMiJv4Ra0z2hJGYVcsU6q+58NDFfc=
github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 h1:s+OzXjBwHuoUIucTcyhwLpwFj/WhYfT3mIbZOw/CFMs=
github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245/go.mod h1:WGWPgjHk4fWKoC1ftSMuPvUbdOBqeqvc/pDBPQgN1aw=
github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a h1:PdwvzQOXy3n6kOyy8Y6fN+BWjTdeaXHpV8et36hDuCw=
github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a/go.mod h1:HYfTh0jyh+uFgp6gMbxJteIDYY97yMuYz85Rnw6Gy9o=
github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a h1:vwsXYQf1QuliCQMOaWxD05BooXpQtu6Y6qKgS0t6Eh4=
github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a/go.mod h1:DysuMe/inqRyC/1tjRR6hReH/VV9Lufs27YKSKBWWJg=
github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a h1:orM1bvAMCPb8fZhnvYj9/dReLDF8F16jrsNuqsU8ni8=
github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a/go.mod h1:vOTDMCo+fGPEClJqcFEFSqZ+8e7WKV7AyqJjX//HR2w=
github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a h1:7zZDJeCxDZgS6MVK0odd6soDOspiXq16qhCasfcWwps=
github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a/go.mod h1:L/M2AmhhJ1+3WFRMiJv4Ra0z2hJGYVcsU6q+58NDFfc=
github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a h1:GqkRh6b4b21jVs+iqRC3n/zuCnp+mErGY3JGwTzEL4c=
github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a/go.mod h1:WGWPgjHk4fWKoC1ftSMuPvUbdOBqeqvc/pDBPQgN1aw=
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=
Expand Down
20 changes: 10 additions & 10 deletions etcd/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ go.etcd.io/bbolt
go.etcd.io/bbolt/errors
go.etcd.io/bbolt/internal/common
go.etcd.io/bbolt/internal/freelist
# go.etcd.io/etcd/api/v3 v3.6.11 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245
# go.etcd.io/etcd/api/v3 v3.6.11 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a
## explicit; go 1.25.0
go.etcd.io/etcd/api/v3/authpb
go.etcd.io/etcd/api/v3/etcdserverpb
Expand All @@ -306,7 +306,7 @@ go.etcd.io/etcd/api/v3/mvccpb
go.etcd.io/etcd/api/v3/v3rpc/rpctypes
go.etcd.io/etcd/api/v3/version
go.etcd.io/etcd/api/v3/versionpb
# go.etcd.io/etcd/client/pkg/v3 v3.6.11 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245
# go.etcd.io/etcd/client/pkg/v3 v3.6.11 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a
## explicit; go 1.25.0
go.etcd.io/etcd/client/pkg/v3/fileutil
go.etcd.io/etcd/client/pkg/v3/logutil
Expand All @@ -317,14 +317,14 @@ go.etcd.io/etcd/client/pkg/v3/tlsutil
go.etcd.io/etcd/client/pkg/v3/transport
go.etcd.io/etcd/client/pkg/v3/types
go.etcd.io/etcd/client/pkg/v3/verify
# go.etcd.io/etcd/client/v3 v3.6.11 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245
# go.etcd.io/etcd/client/v3 v3.6.11 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a
## explicit; go 1.25.0
go.etcd.io/etcd/client/v3
go.etcd.io/etcd/client/v3/concurrency
go.etcd.io/etcd/client/v3/credentials
go.etcd.io/etcd/client/v3/internal/endpoint
go.etcd.io/etcd/client/v3/internal/resolver
# go.etcd.io/etcd/pkg/v3 v3.6.11 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245
# go.etcd.io/etcd/pkg/v3 v3.6.11 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a
## explicit; go 1.25.0
go.etcd.io/etcd/pkg/v3/adt
go.etcd.io/etcd/pkg/v3/contention
Expand All @@ -343,7 +343,7 @@ go.etcd.io/etcd/pkg/v3/runtime
go.etcd.io/etcd/pkg/v3/schedule
go.etcd.io/etcd/pkg/v3/traceutil
go.etcd.io/etcd/pkg/v3/wait
# go.etcd.io/etcd/server/v3 v3.6.5 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245
# go.etcd.io/etcd/server/v3 v3.6.5 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a
## explicit; go 1.25.0
go.etcd.io/etcd/server/v3/auth
go.etcd.io/etcd/server/v3/config
Expand Down Expand Up @@ -1110,11 +1110,11 @@ sigs.k8s.io/yaml
sigs.k8s.io/yaml/kyaml
# github.com/openshift/microshift => ../
# github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7
# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245
# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245
# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245
# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245
# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245
# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a
# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a
# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a
# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a
# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a
# k8s.io/api => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/api
# k8s.io/apiextensions-apiserver => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver
# k8s.io/apimachinery => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f80444cc3da6b00878bbbea034b4122d40e88ce47aa00486d6874d8a49a2dfd1"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0b69d8c02c7d6231928b1737e74ee30ade20bce70887b6c7c1d68ae034bc9dcd"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a2216f75ff054a66023649e397c9571b31a63664962ec5aa4d19843e1855d105"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:56ac733f8a19c57d0027aba6bebd7063d85f1cf1b6f474c0180cd8f7d862c71f"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading