Skip to content

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-03-30-095330_amd64-2025-03-30_arm64-2025-03-30 #4745

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
Mar 31, 2025
Merged

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-03-30-095330_amd64-2025-03-30_arm64-2025-03-30 #4745

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
48676fa
update last_rebase.sh
Mar 31, 2025
c88fd8c
update changelog
Mar 31, 2025
092a64c
update microshift/go.mod
Mar 31, 2025
80286c8
update microshift/vendor
Mar 31, 2025
03da891
update etcd/go.mod
Mar 31, 2025
32c249d
update etcd/vendor
Mar 31, 2025
c87bcc8
update manifests
Mar 31, 2025
b320a95
update buildfiles
Mar 31, 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
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 := 4.17.0-0.nightly-arm64-2025-03-21-203908
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-03-30-095339
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 := 4.17.0-0.nightly-2025-03-21-203905
OCP_VERSION := 4.17.0-0.nightly-2025-03-30-095330
2 changes: 1 addition & 1 deletion assets/optional/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": "4.17.0-0.nightly-arm64-2025-03-21-203908"
"base": "4.17.0-0.nightly-arm64-2025-03-30-095339"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bcdeafc4d3b536b8404ff9c386641ab91c9a89a8f5f139a2e38605cb97efaf4f",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/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": "4.17.0-0.nightly-2025-03-21-203905"
"base": "4.17.0-0.nightly-2025-03-30-095330"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0f93cbbd028d351a9233d751909be9c1d604c2e7a0a26f775910c2eaa670334",
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-v4.0-art-dev
digest: sha256:87f570165ee65ef1bcd57d1165dc6e6e57d3598ccc68a1b81e798c1d6fe28ee2
digest: sha256:32ca867c6a43749af3cfd51560a9a4ddde1d8058746c2a25cea5d62a92c33219
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9822a8338272fb124fddf217be4933b9759f846de3d0ddc1f77b7d4ac78156b2
digest: sha256:ffe8d39c0494c5c2c69f206c1658dee5704654402cc7cee2c4f93dcba1b29914
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bb50690f218a3432fa9bc3bf4f684d4d43956add2bd2f168ded3b30be5f8a999
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-v4.0-art-dev@sha256:9822a8338272fb124fddf217be4933b9759f846de3d0ddc1f77b7d4ac78156b2
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffe8d39c0494c5c2c69f206c1658dee5704654402cc7cee2c4f93dcba1b29914
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87f570165ee65ef1bcd57d1165dc6e6e57d3598ccc68a1b81e798c1d6fe28ee2
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32ca867c6a43749af3cfd51560a9a4ddde1d8058746c2a25cea5d62a92c33219
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-v4.0-art-dev
digest: sha256:e5b3f22c2fc3c5c7fd26239ae79d4954bed36956df69854af6247f9e0d683725
digest: sha256:e13f78b6d152078060b9aea818c632a9ca07ec66854bee6c246767e422c6aef3
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:1729c087f7ab2bd110d260ebbfd595ea681fbdeca4a28fa5565526edc0da8b48
digest: sha256:6855dcc19a4c1715e1bfcf1005f46434a7fcb714d9a911a894e519b065a75bf8
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6e4f75ceee40445563645e5f4ac11c0b0829550af20d4c38886afac6da3c0036
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-v4.0-art-dev@sha256:1729c087f7ab2bd110d260ebbfd595ea681fbdeca4a28fa5565526edc0da8b48
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6855dcc19a4c1715e1bfcf1005f46434a7fcb714d9a911a894e519b065a75bf8
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5b3f22c2fc3c5c7fd26239ae79d4954bed36956df69854af6247f9e0d683725
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e13f78b6d152078060b9aea818c632a9ca07ec66854bee6c246767e422c6aef3
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": "4.17.0-0.nightly-arm64-2025-03-21-203908"
"base": "4.17.0-0.nightly-arm64-2025-03-30-095339"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87f570165ee65ef1bcd57d1165dc6e6e57d3598ccc68a1b81e798c1d6fe28ee2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9822a8338272fb124fddf217be4933b9759f846de3d0ddc1f77b7d4ac78156b2",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32ca867c6a43749af3cfd51560a9a4ddde1d8058746c2a25cea5d62a92c33219",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffe8d39c0494c5c2c69f206c1658dee5704654402cc7cee2c4f93dcba1b29914",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb50690f218a3432fa9bc3bf4f684d4d43956add2bd2f168ded3b30be5f8a999"
}
}
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": "4.17.0-0.nightly-2025-03-21-203905"
"base": "4.17.0-0.nightly-2025-03-30-095330"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5b3f22c2fc3c5c7fd26239ae79d4954bed36956df69854af6247f9e0d683725",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1729c087f7ab2bd110d260ebbfd595ea681fbdeca4a28fa5565526edc0da8b48",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e13f78b6d152078060b9aea818c632a9ca07ec66854bee6c246767e422c6aef3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6855dcc19a4c1715e1bfcf1005f46434a7fcb714d9a911a894e519b065a75bf8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e4f75ceee40445563645e5f4ac11c0b0829550af20d4c38886afac6da3c0036"
}
}
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,13 +1,13 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2025-03-21-203908"
"base": "4.17.0-0.nightly-arm64-2025-03-30-095339"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3faa8c92cf36942be1c790440c315a0c69b31b5b73cb02424beccdb1a1b9a45",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a647bd3b53dfa0ef60937b668f50b8bb00892efa76e285d3384b24b24294a358",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0528a04c55a77af19587214b35f4617b67cc7a7a2811124f353be126a026455",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb50690f218a3432fa9bc3bf4f684d4d43956add2bd2f168ded3b30be5f8a999",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af4c197ab6b0e6a9347694e5be4c8ccc9fe1e3fd4ac4083a3ede5370bff83801",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1780ca8ee737875afb6c8a96601d414ca505840dfd544280af6fa94f3f352f95",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05f52a1fe755bdf22e11b31feee75b190de72e7cab6bd709c91441f8b6e77457",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59a722f6cc29be056935a86c365111d3d836c00edb4b81ec52da9cca4cc446ef",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.17.0-0.nightly-2025-03-21-203905"
"base": "4.17.0-0.nightly-2025-03-30-095330"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26f9af72197f11c62f80b34c4f6fe1c2f6dcc0ecc9591e9b4347a92c4da2509d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da1680f5cb1a52583d0ae54f4b25a3763e36fdac3c4f4f4cbe8051deace50ad9",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83dacde2460b57671d199d19682f896a8e615a16a5e4499d01f861d10f6c63f9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e4f75ceee40445563645e5f4ac11c0b0829550af20d4c38886afac6da3c0036",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c4fd62521458c124bf6a1fa5b7350bb585d57715d4fc395a672d0eaa9a6c628",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:afbe2210f9bb66fc9f0263919119286397258a0cacbc9e2e0e8111029268aac7",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5c59fac3063f0a93c52e24c2edee144b61a1cb457b8f1225e85fb6971479e2f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db09b4618ecb561d858ab191f63a26b6c2b349a71180abaf7730bcc61544561d",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
12 changes: 6 additions & 6 deletions etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@ require (

replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67 // from etcd
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250220215240-98fe56995ed8 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250220215240-98fe56995ed8 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250220215240-98fe56995ed8 // staging kubernetes
Expand Down
24 changes: 12 additions & 12 deletions etcd/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,18 +188,18 @@ github.com/openshift/api v0.0.0-20240530053948-b01900f1982a h1:EyLN5c8dxine8V9Xa
github.com/openshift/api v0.0.0-20240530053948-b01900f1982a/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bqBwrXG7sbJUqP1Og1bR8FvVh7qb7CrMgy9saKmOZFs=
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:vg1EKpxpEMPTORr0oGfp9lC7fVpkzOEb7/yl6XVk89k=
github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:AiUJPSSK1FP1WSpkRMNeodQfS7tcB9buD0vaTkRK9Q4=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4=
github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:gaqXHtWNg5p0NgKxfCVwiJT7VldXrxG1hWFgxYMxPN0=
github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:FTAEt3cam2o7XUf95LznKjJL8PUHiZK9WXY0n5IXY1o=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:gb4CDXuN/OgzUgj+VmUFumLYQ2FUMDC6r/plLIjHPI8=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:ajbPQl76LrBfP8IUiSZoRhi6vg8b8BaHLOUlOjS6mD8=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:XBaZHTJt3nLnpS8hMDR55Sxrq76cEC4xWYMBYSY3jcs=
github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67 h1:EiwmxtPnQrTzWT/p3foglF+5tsdUiQWU+V/EjNHirwA=
github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67/go.mod h1:waeL2uw6TdXniXaus105tiK1aSbblIBi21uk8y7D6Ng=
github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:KDmVLESmkDriKG4MPZqM2tLXOkPBU42g/vx5+uJpipg=
github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:qUwxpfcARa5CUStVCc8wn/RPxVFXUP/QULvwMhWEwIc=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4=
github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:Cy1JopdDy8ee4sMnik5QlEFMcVFp9iffEc6uInOSMCI=
github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:F8jRsELr4KTSxh1YTjLWbj3bPRlzmY8sAjigjN4L6co=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:gb4CDXuN/OgzUgj+VmUFumLYQ2FUMDC6r/plLIjHPI8=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:uj9xDiUqkD3pa0CxGChj9A5RKWEV5mEMww2NU2K3qms=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:XBaZHTJt3nLnpS8hMDR55Sxrq76cEC4xWYMBYSY3jcs=
github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a h1:zqzMxqY1vJ2OG1WxTjkoyGD62AHI/JuTxJtEkmkbgDc=
github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a/go.mod h1:waeL2uw6TdXniXaus105tiK1aSbblIBi21uk8y7D6Ng=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250220215240-98fe56995ed8 h1:9hBOGDodzfsCybJB1IFHQjy1NIPmlmId1TYBzS/fblM=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250220215240-98fe56995ed8/go.mod h1:hMUQemCrSBowF7/LZGr+EhP5qHwJimo5aDDjsUUdc6s=
github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250220215240-98fe56995ed8 h1:AkhckUDfYSwrd438MjkgXvL8uOi1yve1xLmOqN66oeY=
Expand Down
4 changes: 1 addition & 3 deletions etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go
View file
Open in desktop

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

24 changes: 12 additions & 12 deletions etcd/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ github.com/xlab/treeprint
# go.etcd.io/bbolt v1.3.11
## explicit; go 1.22
go.etcd.io/bbolt
# go.etcd.io/etcd/api/v3 v3.5.18 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/api/v3 v3.5.18 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
## explicit; go 1.22
go.etcd.io/etcd/api/v3/authpb
go.etcd.io/etcd/api/v3/etcdserverpb
Expand All @@ -279,7 +279,7 @@ go.etcd.io/etcd/api/v3/membershippb
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/client/pkg/v3 v3.5.18 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/client/pkg/v3 v3.5.18 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
## explicit; go 1.22
go.etcd.io/etcd/client/pkg/v3/fileutil
go.etcd.io/etcd/client/pkg/v3/logutil
Expand All @@ -292,14 +292,14 @@ go.etcd.io/etcd/client/pkg/v3/types
# go.etcd.io/etcd/client/v2 v2.305.18
## explicit; go 1.22
go.etcd.io/etcd/client/v2
# go.etcd.io/etcd/client/v3 v3.5.18 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/client/v3 v3.5.18 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
## explicit; go 1.22
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.5.18 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/pkg/v3 v3.5.18 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
## explicit; go 1.22
go.etcd.io/etcd/pkg/v3/adt
go.etcd.io/etcd/pkg/v3/contention
Expand All @@ -316,14 +316,14 @@ 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/raft/v3 v3.5.18 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/raft/v3 v3.5.18 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
## explicit; go 1.22
go.etcd.io/etcd/raft/v3
go.etcd.io/etcd/raft/v3/confchange
go.etcd.io/etcd/raft/v3/quorum
go.etcd.io/etcd/raft/v3/raftpb
go.etcd.io/etcd/raft/v3/tracker
# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
## explicit; go 1.22
go.etcd.io/etcd/server/v3/auth
go.etcd.io/etcd/server/v3/config
Expand Down Expand Up @@ -1050,12 +1050,12 @@ sigs.k8s.io/yaml
# github.com/openshift/microshift/pkg/config => ../pkg/config
# github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial
# github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250321131051-abfca6b7fe67
# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325012632-0d9e0a907c4a
# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250220215240-98fe56995ed8
# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250220215240-98fe56995ed8
# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250220215240-98fe56995ed8
Expand Down
Loading