Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-01-053925_amd64-2024-11-01_arm64-2024-11-03 #4135

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 8 commits into from
Closed

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-01-053925_amd64-2024-11-01_arm64-2024-11-03 #4135

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
324b691
update last_rebase.sh
Nov 4, 2024
5358700
update changelog
Nov 4, 2024
91a6245
update microshift/go.mod
Nov 4, 2024
3e32ff2
update microshift/vendor
Nov 4, 2024
3e85cec
update etcd/go.mod
Nov 4, 2024
9fe702c
update etcd/vendor
Nov 4, 2024
5cc6d44
update manifests
Nov 4, 2024
8453f08
update buildfiles
Nov 4, 2024
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.18.0-0.nightly-arm64-2024-10-30-201653
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-03-180130
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.18.0-0.nightly-2024-10-30-122220
OCP_VERSION := 4.18.0-0.nightly-2024-11-01-053925
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.18.0-0.nightly-arm64-2024-10-30-201653"
"base": "4.18.0-0.nightly-arm64-2024-11-03-180130"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fed16f6fca30c2bdf59dffe7d02110be21ded32eabe2b1d96220d3838c0857fd",
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.18.0-0.nightly-2024-10-30-122220"
"base": "4.18.0-0.nightly-2024-11-01-053925"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6a863d5beff574d72bdcd1c48e6a441d875f878eaca203dd3702988293e7024",
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:8cff3c3b3b6215f20200363e15521d5e7f8d054687d1ab0d4b0586f14159e30d
digest: sha256:30cad836e788b5a31331dba660a2c3968e861b4cc75990aad7ec43c1a721cb62
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:41de8a6a302b713a3d56c44e53559b626a69b82cf9508444ca7c2075432562b1
digest: sha256:a1e8263803424bc37ef81f1cdf2cf3ffc060437d81a2ad59c617f6b6f8e5175d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb
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:41de8a6a302b713a3d56c44e53559b626a69b82cf9508444ca7c2075432562b1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1e8263803424bc37ef81f1cdf2cf3ffc060437d81a2ad59c617f6b6f8e5175d
- 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:8cff3c3b3b6215f20200363e15521d5e7f8d054687d1ab0d4b0586f14159e30d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30cad836e788b5a31331dba660a2c3968e861b4cc75990aad7ec43c1a721cb62
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:3f8242f977f72e3b517bb75547b8d0b786c12494388f1e7a57c5a64508aba16c
digest: sha256:f6729e5265cf30c53b0b310a9c4490b7dd54e1508b77515b7d535a38e11cfb8d
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:72c5ef8bd769afe6e70cb29097e1697da8738c872e3344640a870fdecb548927
digest: sha256:8a0fc4d93dbe9a6758f665785b6340fd06f741bc9364880434871c343c5021bc
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6
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:72c5ef8bd769afe6e70cb29097e1697da8738c872e3344640a870fdecb548927
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a0fc4d93dbe9a6758f665785b6340fd06f741bc9364880434871c343c5021bc
- 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:3f8242f977f72e3b517bb75547b8d0b786c12494388f1e7a57c5a64508aba16c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6729e5265cf30c53b0b310a9c4490b7dd54e1508b77515b7d535a38e11cfb8d
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.18.0-0.nightly-arm64-2024-10-30-201653"
"base": "4.18.0-0.nightly-arm64-2024-11-03-180130"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cff3c3b3b6215f20200363e15521d5e7f8d054687d1ab0d4b0586f14159e30d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41de8a6a302b713a3d56c44e53559b626a69b82cf9508444ca7c2075432562b1",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30cad836e788b5a31331dba660a2c3968e861b4cc75990aad7ec43c1a721cb62",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1e8263803424bc37ef81f1cdf2cf3ffc060437d81a2ad59c617f6b6f8e5175d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb"
}
}
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.18.0-0.nightly-2024-10-30-122220"
"base": "4.18.0-0.nightly-2024-11-01-053925"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f8242f977f72e3b517bb75547b8d0b786c12494388f1e7a57c5a64508aba16c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72c5ef8bd769afe6e70cb29097e1697da8738c872e3344640a870fdecb548927",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6729e5265cf30c53b0b310a9c4490b7dd54e1508b77515b7d535a38e11cfb8d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a0fc4d93dbe9a6758f665785b6340fd06f741bc9364880434871c343c5021bc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6"
}
}
6 changes: 3 additions & 3 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.18.0-0.nightly-arm64-2024-10-30-201653"
"base": "4.18.0-0.nightly-arm64-2024-11-03-180130"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19dd81d38f155b0c9f8bd1d59d915732a015ab8a31d9aea8c918569243e663ac",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67895d042821f254a13d03257501ca0b3f6d1706cfab06301bc153e01c8eff54",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08d70c98fd079964f5be126cb62edece672f86c0a1ce191c8e1b0cd594e36aa6",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81c1a10e114040fdabb833838a41a65ad553562e48eedc7ab03182d445b9cdd5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7940bd1bf3684fb874c1b8a18ae4d4ef5976c2a20938c1078adc15be16efa6d7",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c434eeae4ff4e2cfcecaeeaee94bced44a15414ef1ec452d7b00eb9c1d79da0",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:308ddae5bcd27e0744096c50c8e1ae094e0babd2537807e76b12bdbcb625ed9d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab066fd06426a603df78265fff782bc85ad16b16b51fdf1e0b7fe1f6fc2d3f83",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
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,13 +1,13 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-10-30-122220"
"base": "4.18.0-0.nightly-2024-11-01-053925"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66080fa737cf46146d371f7fd140e16321bda206760627a37eb2de92c94278cb",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:158f7ed92780f7fc7c629e857d99acf05a86489c6db1794e39ae5829886b77d9",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4a1372b849882dd2da0127cbd5068a4e3076db82ca9ae641b9b7189d3dcc8b5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ae743b405c52cc8589d838efd88c32bc4d8f8a442a88e47b7dd2e57f7443e59",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:266c910cbaca56efdcf151d898884febb7e92860857fda5250f735932f985b5a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:038dc26fd648be4ea9c38dc24d7fed78504569544e481ca3289411077bf24773",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f60bb3e2e42085b82096277c09906c2fc64083a9d8d5aba56c177aa547c4b7f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:94cfcb0bee376098dbc504974a79db0c3a747f5cb5f7a4cab9a4c527f9dc9fff",
"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 @@ -145,12 +145,12 @@ require (

replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240806135314-3946b2b7b2a8 // from kubernetes
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b // from etcd
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241031155853-3b0a2d211610 // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610 // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241031155853-3b0a2d211610 // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610 // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241031155853-3b0a2d211610 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241031155853-3b0a2d211610 // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241025232031-7ca9eb1e9e5c // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241025232031-7ca9eb1e9e5c // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241025232031-7ca9eb1e9e5c // 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 @@ -178,18 +178,18 @@ github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2 h1:wCRdyt+nHnJsfuLMJ
github.com/openshift/api v0.0.0-20241004095111-b1f700bdd8d2/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f h1:JMEDso3xFUIDULgFJmcrTfyPpigF3NyyaP07Yy8tHmI=
github.com/openshift/build-machinery-go v0.0.0-20240910153727-5725581bdf8f/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:igQekI6NBRUxNacLzRGFksldPX1ZbT/uF4DK8VH8ATk=
github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:6EKE1j9bBJfZiELuXTOBdPOolOM5hdmvpEQyxlcIt1s=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E=
github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:pSBLiDEIjqp+vWInjcgsykiwGkWEebmKFCun/mgIkCc=
github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:gv1dSmjwARNmCBhsGWDQO3N7vqiOTOSDDnC4A+TVoUg=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:KkGysAG4nEwFOZE4NB4KLAKYgvNd4hcF7Ge04ATARv4=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI=
github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b h1:edbZx56R31SYGz9q7jp866bXCRIwyBWIbVWCNFQdohA=
github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s=
github.com/openshift/etcd/api/v3 v3.5.1-0.20241031155853-3b0a2d211610 h1:h/q5R55bsNBjDkBwlg3DctdzcJG8YwEaY12OV4VcrE0=
github.com/openshift/etcd/api/v3 v3.5.1-0.20241031155853-3b0a2d211610/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610 h1:a6aghEHAG6TdAKvKPJfvw/zjnWri5y4n0BS4mzb/g00=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E=
github.com/openshift/etcd/client/v3 v3.5.1-0.20241031155853-3b0a2d211610 h1:7z2lpWbJEhmCDVois0ainqbIGonBaTjYcnXV5Q/M+Tw=
github.com/openshift/etcd/client/v3 v3.5.1-0.20241031155853-3b0a2d211610/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610 h1:1/ZSpGo4jhv8nLqMVR6N9IFfuK3iJmCI1R+ss539US8=
github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20241031155853-3b0a2d211610 h1:6vtkyrLihCTx+OEfFVbOdr0bMUxjOn07VhyfXktHa0Q=
github.com/openshift/etcd/raft/v3 v3.5.1-0.20241031155853-3b0a2d211610/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI=
github.com/openshift/etcd/server/v3 v3.5.1-0.20241031155853-3b0a2d211610 h1:94i8EN0eYfaC4ZkqkD1iB+/hfXWGvtMKbDSMNDF7+Os=
github.com/openshift/etcd/server/v3 v3.5.1-0.20241031155853-3b0a2d211610/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241025232031-7ca9eb1e9e5c h1:bIGSshbw79unEv44zEjOA4G0M3Oq8ZCeWt100aT+5DQ=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241025232031-7ca9eb1e9e5c/go.mod h1:Dm/iYMJ6/U1e9rvAbrngZcVY7I8bYUHkzPrToon6cTc=
github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241025232031-7ca9eb1e9e5c h1:3Z+5wGoK6MYjj6nzn/LQw/Wr5N9fJqXGH15HGg9Hj5M=
Expand Down
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 @@ -272,7 +272,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.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/api/v3 v3.5.16 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241031155853-3b0a2d211610
## explicit; go 1.22
go.etcd.io/etcd/api/v3/authpb
go.etcd.io/etcd/api/v3/etcdserverpb
Expand All @@ -281,7 +281,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.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/client/pkg/v3 v3.5.16 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610
## explicit; go 1.22
go.etcd.io/etcd/client/pkg/v3/fileutil
go.etcd.io/etcd/client/pkg/v3/logutil
Expand All @@ -294,14 +294,14 @@ go.etcd.io/etcd/client/pkg/v3/types
# go.etcd.io/etcd/client/v2 v2.305.16
## explicit; go 1.22
go.etcd.io/etcd/client/v2
# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241031155853-3b0a2d211610
## 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.16 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/pkg/v3 v3.5.16 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610
## explicit; go 1.22
go.etcd.io/etcd/pkg/v3/adt
go.etcd.io/etcd/pkg/v3/contention
Expand All @@ -318,14 +318,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.16 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/raft/v3 v3.5.16 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241031155853-3b0a2d211610
## 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.13 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/server/v3 v3.5.13 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241031155853-3b0a2d211610
## explicit; go 1.22
go.etcd.io/etcd/server/v3/auth
go.etcd.io/etcd/server/v3/config
Expand Down Expand Up @@ -1063,12 +1063,12 @@ sigs.k8s.io/yaml/goyaml.v3
# 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.20240806135314-3946b2b7b2a8
# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241029125623-825fc46f2c1b
# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241031155853-3b0a2d211610
# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610
# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241031155853-3b0a2d211610
# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241031155853-3b0a2d211610
# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241031155853-3b0a2d211610
# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241031155853-3b0a2d211610
# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241025232031-7ca9eb1e9e5c
# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241025232031-7ca9eb1e9e5c
# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241025232031-7ca9eb1e9e5c
Expand Down
Loading