From e7a204b8abe1082828062b40516311387f76cbf5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Apr 2024 05:11:25 +0000 Subject: [PATCH 1/9] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index b6bd57e0a7..aa4c06b5f3 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-04-16-033023" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-04-17-052059" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-04-23-014733" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-04-23-172135" From 9f09e20667deabcc7857a5ba94ca834dac5e0966 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Apr 2024 05:11:26 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 101 +++++++++++++++++++++++++++++- scripts/auto-rebase/commits.txt | 20 +++--- 2 files changed, 109 insertions(+), 12 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index caaa48d676..2cb9ccaa92 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,11 +1,108 @@ -- ovn-kubernetes image-arm64 21ab2315a1b04831a59395171c65e661eede8794 to 2fdbd1bb9fa7b298c8883010958267474c93c955 +- cluster-csi-snapshot-controller-operator embedded-component 73dc400fbbbd7dc131c98199e3b5c5cac957ee83 to d4a1162514ecbf248b04e6e8625d17bc2b775ccd + - 67b2d56 2024-04-08T16:23:43+00:00 create suitable role and roleBinding for csi-snapshot-webhook + +- cluster-kube-apiserver-operator embedded-component d5fb16a69adc72e78da8cd326aae5f88b6cc6b8f to 2eab0f9e27db4399bf8885d62ca338c3d02fdd35 + - d152914 2024-03-28T14:58:13+00:00 Add sno section to alert description + +- etcd embedded-component 070ba48ac446fa25ecd993e04494448a88eaeff2 to b0c0321e61acdf93649ff4b753b2a399ffff411b + - e4635d5c 2024-04-02T19:28:58+02:00 DOWNSTREAM : resolve merge conflicts + - ca34079d 2024-04-02T19:28:39+02:00 DOWNSTREAM : resolve merge conflicts + - c9063a0d 2024-03-30T07:27:31+13:00 version: bump up to 3.5.13 + - 59e3f7df 2024-03-21T07:28:20+00:00 build(deps): bump distroless/static-debian11 from `9be3fcc` to `7e5c6a2` + - 46d2caae 2024-03-18T18:41:17-07:00 [release-3.5] backport fix watch event loss after compaction + - 579b22cf 2024-03-11T20:18:26+01:00 Fix progress notification for watch that doesn't get any events + - 67afad6e 2024-03-08T08:30:03-08:00 Add govuln GitHub workflow + - e6d95c84 2024-03-07T16:03:12-08:00 dependency: bump google.golang.org/protobuf to v1.33.0 + - 722e5cbb 2024-03-06T09:33:17+00:00 Update go version to 1.21.8 + - d76d8479 2024-02-24T15:38:49+00:00 Bump bbolt to 1.3.9 for 3.5 + - f1d1029c 2024-02-23T16:24:13-08:00 dependency: bump github.com/sirupsen/logrus to v1.9.3 + - a1aaa51c 2024-02-19T13:26:15+00:00 add uds test cases into e2e TestAuthority + - 80e2064b 2024-02-19T12:21:31+00:00 Add unix socket test to TestNewURLsValue + - 1a9062ec 2024-02-19T12:21:16+00:00 pkg/types: Support Unix sockets in NewURLS + - 31f097ee 2024-02-18T20:44:25+08:00 added dial-keepalive-time、dial-keepalive-timeout、permit-without-stream arguments to the grpc-proxy + - 4a90575a 2024-02-17T22:16:53-08:00 Backport ignore old leader's leases revoking request + - c486b589 2024-02-17T22:16:29-08:00 tests/e2e: backport e2e cluster setup + - 9635525b 2024-02-17T03:02:19-08:00 *: add test-smoke to the pipeline and update test-smoke + - 7ebbc0f6 2024-02-16T13:52:09-08:00 tools/mod: go mod tidy + - f4633c84 2024-02-15T19:55:22-08:00 *: fix failing shellchecks + - b9b4f1bd 2024-02-15T19:46:22-08:00 server: fix comment to match function name + - 1115eb15 2024-02-13T15:21:07-08:00 tests/e2e: implement EtcdProcess GoFailClientTimeout + - e179686f 2024-02-13T16:01:10+05:30 Make CGO_ENABLED configurable for etcd 3.5 + - 07c4dcb9 2024-02-07T17:00:09-08:00 tests/e2e: use WaitLeader in corrupt test + - 8b249325 2024-02-06T14:29:51-08:00 tests/e2e: implement EtcdProcessCluster WaitLeader + - c37d33c5 2024-02-06T14:29:40-08:00 tests/e2e: implement EtcdProcess Etcdctl + - 62a4bb3b 2024-02-06T19:39:09+01:00 etcd: Add OpenBSD-specific files for SetKeepAlivePeriod handling + - a965801b 2024-02-06T12:11:33+08:00 etcdserver: drain leaky goroutines before test completed + - 26bae5ef 2024-02-05T15:13:42-08:00 tests/e2e: move etcdctl to framework/e2e + - a13f676e 2024-02-02T14:40:15-05:00 [3.5] backport: add backoff to client config + - 3d64877d 2024-02-02T14:25:53-05:00 [3.5] Update to go1.21 + +- kubernetes embedded-component 613e4d8fcdca10207adfa2e18533d9cf29e91df4 to 7bee54d0aa64d001faf2a3c8c72849e4be692ec1 + - c48bf1840 2024-02-26T13:41:57+01:00 UPSTREAM: : openshift-kube-apiserver: add kube-apiserver patches + +- machine-config-operator embedded-component 4ea40c5c81c9624146a24d57aeaaa0616972bb4d to c29fe458496f7351a1e5c60e3af04d400a3d95c1 + - d7cdd951 2024-04-15T21:45:02+00:00 fix: resources were in the wrong indentation level + - c9cc1016 2024-04-04T07:42:04+00:00 kubelet: restorecon necessary files on kubelet's prestart + - a7af688f 2024-01-11T16:36:52+00:00 OCPBUGS-18541: Log network service output to console + +- router image-amd64 b3af193f191b8d20c0b7bac328cb2c397d5c2c27 to 3f833257249c8070da8f3fedd3ab6b3e8ef17cde + - 6cb03e5 2024-04-18T15:15:01+00:00 OCPBUGS-32044: Introduce 'idle-close-on-response' option for frontends + +- ovn-kubernetes image-amd64 21ab2315a1b04831a59395171c65e661eede8794 to ae7f5360d05b928ad10247f58ca9b8dd54242678 + - 0d83ac8 2024-04-15T20:10:07+05:30 Custom v4 and v6 transit switch subnets while creating kind cluster - 439f5ea 2024-04-08T16:24:45+00:00 CARRY: fix 4.14 specific unit tests - 2110452 2024-04-08T15:55:12+00:00 Set mac binding age threshold in gateway routers - 1fd3804 2024-04-08T15:53:58+00:00 Delete HO static mac bindings - fe76441 2024-04-08T15:53:58+00:00 Delete static mac bindings on gateway cleanup - 0c52bfd 2024-04-08T15:53:57+00:00 Add static mac bindings to the Static_Mac_Binding table - 2227800 2024-04-08T15:53:56+00:00 Delete legacy DGP mac binding using client native API + - 7f6d5fb 2024-04-08T11:37:04+01:00 Node IP handler: do not exclude keepalived vips + - 6f31c07 2024-04-08T11:37:04+01:00 EIP multi NIC: in LGW mode, skip IP rules when dst is node IP + - 924e67f 2024-04-08T11:37:04+01:00 Rename non-OVN eips to secondary host eips + - 3f4c721 2024-04-08T11:37:04+01:00 EIP multi NIC: do not remove node IP SNAT + - e0d613c 2024-04-08T11:37:04+01:00 EIP E2E: add multi NIC test where EIP IPs hosted on same inf + - e948098 2024-04-08T11:37:04+01:00 Refactor egress IP controller update 'config' to match current 'state' + - 384613f 2024-04-08T11:37:04+01:00 EIP E2Es: add multi NIC test cases for enable/disable egress + - c75f22a 2024-04-08T11:37:04+01:00 EIP multi NIC: copy routes from main routing table + - 34361f5 2024-04-08T11:37:04+01:00 EIP multi NIC: start dependent controllers before repair + - 4516c23 2024-04-08T11:37:04+01:00 EIP multi NIC: filter only global unicast addresses from host-cidrs + - bc24a5d 2024-04-08T11:36:56+01:00 EIP multi NIC: Add IPV6 support + - 310b3b2 2024-04-08T09:43:42+01:00 EIP multi NIC: continue repairing even if an egress IP is not on link + - d87ab75 2024-04-08T09:43:35+01:00 EIP multi NIC: rename struct field + - 9756aa8 2024-04-08T09:43:29+01:00 Refactor net util to allow passing a netlink.Link obj instead of name + - 7d7a468 2024-04-08T09:43:24+01:00 improve iptables manager code quality and add IPv6 tests + - 7741b13 2024-04-08T09:43:18+01:00 Fix how detect any network following lib change + - abce772 2024-04-08T09:43:12+01:00 Refactor route manager and fix panic + - 0ff1336 2024-04-08T09:42:42+01:00 Upgrade netlink lib to consume default route fix + - 412bb21 2024-04-08T09:31:32+01:00 Add netlink subscriber for link manager + - 123672e 2024-04-08T09:25:40+01:00 Exposes link manager to track MAC address changes -- kubernetes image-arm64 613e4d8fcdca10207adfa2e18533d9cf29e91df4 to 7bee54d0aa64d001faf2a3c8c72849e4be692ec1 +- kubernetes image-amd64 613e4d8fcdca10207adfa2e18533d9cf29e91df4 to 7bee54d0aa64d001faf2a3c8c72849e4be692ec1 - c48bf1840 2024-02-26T13:41:57+01:00 UPSTREAM: : openshift-kube-apiserver: add kube-apiserver patches +- router image-arm64 b3af193f191b8d20c0b7bac328cb2c397d5c2c27 to 3f833257249c8070da8f3fedd3ab6b3e8ef17cde + - 6cb03e5 2024-04-18T15:15:01+00:00 OCPBUGS-32044: Introduce 'idle-close-on-response' option for frontends + +- ovn-kubernetes image-arm64 2fdbd1bb9fa7b298c8883010958267474c93c955 to ae7f5360d05b928ad10247f58ca9b8dd54242678 + - 0d83ac8 2024-04-15T20:10:07+05:30 Custom v4 and v6 transit switch subnets while creating kind cluster + - 7f6d5fb 2024-04-08T11:37:04+01:00 Node IP handler: do not exclude keepalived vips + - 6f31c07 2024-04-08T11:37:04+01:00 EIP multi NIC: in LGW mode, skip IP rules when dst is node IP + - 924e67f 2024-04-08T11:37:04+01:00 Rename non-OVN eips to secondary host eips + - 3f4c721 2024-04-08T11:37:04+01:00 EIP multi NIC: do not remove node IP SNAT + - e0d613c 2024-04-08T11:37:04+01:00 EIP E2E: add multi NIC test where EIP IPs hosted on same inf + - e948098 2024-04-08T11:37:04+01:00 Refactor egress IP controller update 'config' to match current 'state' + - 384613f 2024-04-08T11:37:04+01:00 EIP E2Es: add multi NIC test cases for enable/disable egress + - c75f22a 2024-04-08T11:37:04+01:00 EIP multi NIC: copy routes from main routing table + - 34361f5 2024-04-08T11:37:04+01:00 EIP multi NIC: start dependent controllers before repair + - 4516c23 2024-04-08T11:37:04+01:00 EIP multi NIC: filter only global unicast addresses from host-cidrs + - bc24a5d 2024-04-08T11:36:56+01:00 EIP multi NIC: Add IPV6 support + - 310b3b2 2024-04-08T09:43:42+01:00 EIP multi NIC: continue repairing even if an egress IP is not on link + - d87ab75 2024-04-08T09:43:35+01:00 EIP multi NIC: rename struct field + - 9756aa8 2024-04-08T09:43:29+01:00 Refactor net util to allow passing a netlink.Link obj instead of name + - 7d7a468 2024-04-08T09:43:24+01:00 improve iptables manager code quality and add IPv6 tests + - 7741b13 2024-04-08T09:43:18+01:00 Fix how detect any network following lib change + - abce772 2024-04-08T09:43:12+01:00 Refactor route manager and fix panic + - 0ff1336 2024-04-08T09:42:42+01:00 Upgrade netlink lib to consume default route fix + - 412bb21 2024-04-08T09:31:32+01:00 Add netlink subscriber for link manager + - 123672e 2024-04-08T09:25:40+01:00 Exposes link manager to track MAC address changes + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 5cb068d40d..7d0aeb6fa8 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,17 +1,17 @@ -https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 73dc400fbbbd7dc131c98199e3b5c5cac957ee83 +https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component d4a1162514ecbf248b04e6e8625d17bc2b775ccd https://github.com/openshift/cluster-dns-operator embedded-component 5553a22698ac7fce2cc401ed5884eb1bdb36a02d https://github.com/openshift/cluster-ingress-operator embedded-component d876f5ab48e3748057ec196d90b6f7aae633b081 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component d5fb16a69adc72e78da8cd326aae5f88b6cc6b8f +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2eab0f9e27db4399bf8885d62ca338c3d02fdd35 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 4e059638c2cbf003551ee699106dc024760eece3 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 33f630dc1f890ca59c5e57fb5b6cc24a3f22a1d4 https://github.com/openshift/cluster-network-operator embedded-component d429c8bc14a64bd56fb9160b218bfa75a891219f https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 3985c55f99e1ea013be2db096059c09b2ed98118 https://github.com/openshift/cluster-policy-controller embedded-component 219f6f6f072d867201d4923d39fd8bcaecbe7c59 https://github.com/openshift/csi-external-snapshotter embedded-component a6834536936b16dcd9ee81a8753a2ef6dc208541 -https://github.com/openshift/etcd embedded-component 070ba48ac446fa25ecd993e04494448a88eaeff2 -https://github.com/openshift/kubernetes embedded-component 613e4d8fcdca10207adfa2e18533d9cf29e91df4 +https://github.com/openshift/etcd embedded-component b0c0321e61acdf93649ff4b753b2a399ffff411b +https://github.com/openshift/kubernetes embedded-component 7bee54d0aa64d001faf2a3c8c72849e4be692ec1 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 8558e14a116804168506d06e96eac5a79913a6eb -https://github.com/openshift/machine-config-operator embedded-component 4ea40c5c81c9624146a24d57aeaaa0616972bb4d +https://github.com/openshift/machine-config-operator embedded-component c29fe458496f7351a1e5c60e3af04d400a3d95c1 https://github.com/openshift/openshift-controller-manager embedded-component 27209ef14fcfca236ddba24ac7289bb3d01be8e6 https://github.com/openshift/route-controller-manager embedded-component 1a5e72f41b21f5ebcd6f9dd8227d92ad1fffbb1e https://github.com/openshift/service-ca-operator embedded-component 3c3f82f7112ee4b5656e5c554f9887acdf881175 @@ -20,18 +20,18 @@ https://github.com/openshift/coredns image-amd64 7d3fa777871ed2e5a70715e7f3e71d3 https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/csi-external-snapshotter image-amd64 a6834536936b16dcd9ee81a8753a2ef6dc208541 -https://github.com/openshift/router image-amd64 b3af193f191b8d20c0b7bac328cb2c397d5c2c27 +https://github.com/openshift/router image-amd64 3f833257249c8070da8f3fedd3ab6b3e8ef17cde https://github.com/openshift/kube-rbac-proxy image-amd64 1a646b98d8864e53accb726531d86f084ab13977 -https://github.com/openshift/ovn-kubernetes image-amd64 21ab2315a1b04831a59395171c65e661eede8794 -https://github.com/openshift/kubernetes image-amd64 613e4d8fcdca10207adfa2e18533d9cf29e91df4 +https://github.com/openshift/ovn-kubernetes image-amd64 ae7f5360d05b928ad10247f58ca9b8dd54242678 +https://github.com/openshift/kubernetes image-amd64 7bee54d0aa64d001faf2a3c8c72849e4be692ec1 https://github.com/openshift/service-ca-operator image-amd64 3c3f82f7112ee4b5656e5c554f9887acdf881175 https://github.com/openshift/oc image-arm64 f7b14a92857ad1f28be2e2eaec3ae8229d4c2761 https://github.com/openshift/coredns image-arm64 7d3fa777871ed2e5a70715e7f3e71d3f01785330 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541 -https://github.com/openshift/router image-arm64 b3af193f191b8d20c0b7bac328cb2c397d5c2c27 +https://github.com/openshift/router image-arm64 3f833257249c8070da8f3fedd3ab6b3e8ef17cde https://github.com/openshift/kube-rbac-proxy image-arm64 1a646b98d8864e53accb726531d86f084ab13977 -https://github.com/openshift/ovn-kubernetes image-arm64 2fdbd1bb9fa7b298c8883010958267474c93c955 +https://github.com/openshift/ovn-kubernetes image-arm64 ae7f5360d05b928ad10247f58ca9b8dd54242678 https://github.com/openshift/kubernetes image-arm64 7bee54d0aa64d001faf2a3c8c72849e4be692ec1 https://github.com/openshift/service-ca-operator image-arm64 3c3f82f7112ee4b5656e5c554f9887acdf881175 From 75d5ef758e993a9b720ddee4a9588a3c86d6d7c8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Apr 2024 05:12:04 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 70 ++++++++++++++++++------------------ go.sum | 112 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/go.mod b/go.mod index 6fc29d0614..3499a0c547 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 github.com/vishvananda/netlink v1.1.0 - go.etcd.io/etcd/client/pkg/v3 v3.5.12 + go.etcd.io/etcd/client/pkg/v3 v3.5.13 go.etcd.io/etcd/client/v3 v3.5.7 golang.org/x/sys v0.15.0 gopkg.in/yaml.v3 v3.0.1 @@ -178,7 +178,7 @@ require ( github.com/vishvananda/netns v0.0.2 // indirect github.com/vmware/govmomi v0.30.6 // indirect github.com/xlab/treeprint v1.1.0 // indirect - go.etcd.io/etcd/api/v3 v3.5.12 // indirect + go.etcd.io/etcd/api/v3 v3.5.13 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.35.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect @@ -239,42 +239,42 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240410105739-613e4d8fcdca // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240410105739-613e4d8fcdca // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240416115957-7bee54d0aa64 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230724151845-8558e14a1168 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator diff --git a/go.sum b/go.sum index 927ec7c377..02d4ed84b9 100644 --- a/go.sum +++ b/go.sum @@ -527,64 +527,64 @@ github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb h1:laYRaVm1tMd github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb/go.mod h1:eCLby3OeidJ9+8GcvvGROU6hsCv2XAPQw8EO7d8NbQA= github.com/openshift/cluster-policy-controller v0.0.0-20231027165954-219f6f6f072d h1:Y3Y90mAiEIKhAMJLjl4yPEj6k6Ja+huTI/ZKyp12MZc= github.com/openshift/cluster-policy-controller v0.0.0-20231027165954-219f6f6f072d/go.mod h1:rXrp+7IWLmCxDbD9eQp82PINCIdk2YYfpxd4OEvL03E= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446 h1:X3h+p/RtWxTjXZ2blxETCZdr/Hd9586TUxWbgdZwook= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 h1:WSz7oTHbavmMrb/p75R+P1PrvDaZVZ+7Bjv9IvJVGUs= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446 h1:Dz5KHnQN1MQg89PrMImkp1s9lkmGXhhl7Nz2LhVTLwg= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= -github.com/openshift/kubernetes v0.0.0-20240410105739-613e4d8fcdca h1:YBNwqfZNrnTJ53v22rHiE9tab7mE8RgyBXqW0sdjLEM= -github.com/openshift/kubernetes v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:WinmrmTPGIJAIde4lJ4x6LvHjdQG8E+dd5mWoxjGUGU= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:U849p7TYPDOn10NOFUq2N4sQ/wmoFATuO+0I+QdYeoQ= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:QwsgXhxP1oarPmZ2PN/q64kJOGkH6ivRldlxiy5hmO8= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:l0SY5owduZwbAofIjNPmyJtbQ2dgFFmJ9ytvzeELRDI= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= +github.com/openshift/kubernetes v0.0.0-20240416115957-7bee54d0aa64 h1:I3c8HYkpLzfe4Og9gxwismxTKhQrmqAyZmtvUg81vgM= +github.com/openshift/kubernetes v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:WinmrmTPGIJAIde4lJ4x6LvHjdQG8E+dd5mWoxjGUGU= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230724151845-8558e14a1168 h1:gjPs80PVnSOjK7oBizuGNphNNYBdaevQBw0EvQ5/fsQ= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230724151845-8558e14a1168/go.mod h1:nc9vh1Bd8i4OnTM+uoZeFbRaJJ9uOs1AzaN69SdVnd8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca h1:CJj6g1gJbl7HUilYeJxtuNBJgP6r9XnuUsUV8+howis= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:vleX++La+djaLEQuxFtFLApJHIbUYyCYveaezG0sJyI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240410105739-613e4d8fcdca h1:QGPPOqsu0oGUkKnDdu4yrH2rDs9dGKhM7S5vd5jbtKU= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:jbU4tuB3rW3IAUF8quKUQ4zJ8LhCH9VdQij2GsgnD3A= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca h1:touJsUXdOVFoUDKlDwAaLaElHpgra/6SHgJtqPQDS8o= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:RETAvNJ5aIEjqqgCrjo3P3XWjwzcFEKgujuCKCzlJOA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240410105739-613e4d8fcdca h1:sCinS5XjIXxl9srkFT4pSLIcOFKnsOE3uOCc+f4UD78= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:KfYEEoVHFea7n9BYAZmx4xm1gxoC550bfgZwTvleMjc= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca h1:rhEaGIBkrb/8W9xZaCAwUURWWN+IJ9Ql6fgzNXJfMCc= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:hLakAZMTWzD2fTWCOxLZxR0/XkTl4qZI4gimQbB5r7U= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca h1:/fvOgEKyVm6eFu+o6FeaD/aeGh+O/So/Pe9NgtM99bs= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:RmL8xS33C8fvWXiqIVWAj7LCqh8cOqDm3BTdYrNvS2o= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240410105739-613e4d8fcdca h1:qCyZFNXDniEMUJa6yT9YdJYULmDQOoDgMrz3uDoI/sE= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:PSJG4GtMVxB1CDSbMb+/hLA5ZW2kh3snUO1YX98Smb4= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240410105739-613e4d8fcdca h1:xsZ7tvFwBpzRzKRrY+6c7Y53d3IqaQgqv6d23MV+Ymk= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:L4CkHrOeJmS54+0RQld3MLAi1cKdbpAHufhGysYhGTA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca h1:cq2lQXsrfbMfyiNYdMDrAv4vk1Vt6ZiCqWyuvHjI87M= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:YCRWcgHQy73ELpclt2QyV5bVOJgvp7KIlQudo9VO9NI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240410105739-613e4d8fcdca h1:CmIPeYcT2x1raoMZ5hCRUt7lpWWFc5dh/0t90dkXwU8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:rmskUv6VCuRjVq6rkoO83woFwhGmI2jwXXNp1FSJlks= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240410105739-613e4d8fcdca h1:yE8DsB2yGldNWqxPZHLfuPgJgt7XEM8DRL79ANN/HSU= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:ko4iUe+Tv7F7rzQUPGzyem4asX075gx4rx0WX+OQxVI= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240410105739-613e4d8fcdca h1:J9IIPIvp2QaY4GuhlUswIySwWEP6DK42TpSV75SYrzM= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:/W7GDI9VmBCzZ52Rz11rb4QbBNELt5+hHtQPBH9rYxE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240410105739-613e4d8fcdca h1:HQ1rNZNBKuo1tf9MC5s3IjYGoOdA3J891RifuEAV4Ak= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:LnTY6B0Vb7dkYFJoEBhkA8tAZ1QxWNg1RJkrCqTRIsA= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240410105739-613e4d8fcdca h1:a73V+5xD+aN8PHjTFEPVATTfjHxY4upKDrBkhhMfN7g= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:jS2pCeQRGPZGLVPKYaJrlJWJuwxhN+TMES4j60jnd3s= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240410105739-613e4d8fcdca h1:kWYB//mBxZMQr8bBgPKQQD610N+U2TyPtDg4wc9MYk8= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:o0xtHv/3/q023hVlp3zK/me6/j+uItcLhlvJIgLMwkM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240410105739-613e4d8fcdca h1:Mcql8hpRzNJDHbUyiG/CpQD9ZdnBXjA/cPmN9RI3GB8= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:YzxVnFPD06WK55sDBq65ixAqDCDeSIvxjY/dBPMMzs0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240410105739-613e4d8fcdca h1:OsxvDC/Pr3r2chxTBZi6YFSAhJ6lcAWQ03bqV4FbkG8= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:WlQllmSxmDBMxhuX81c4zlMgB6rxWSs+vBTqdgFdyUE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240410105739-613e4d8fcdca h1:jSny3Ag+9Tve/3HO41zidVxpO5TQtsYjJKb/QPAHcIw= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:O5xVGThvBdjwg+0rdtcLn0JOW4ik5sokmQoWtzlSLPQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca h1:ePVe3pQrwmPoP5FDFEuEZ+BCjIntoa6GrtV2kglOMko= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:Jz7vpzIdU76Ehos1M2gpADPooP6vKVu0GJ8WBObCS0Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240410105739-613e4d8fcdca h1:4xmWbGg3gkWe6LRjnWt2wrSgT/C6cKCPIZe1UzmrOrQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:+tKaVaunTcaiTlL0bNFkAYXGe3KwQBEZ2T3o0Qy7LtQ= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240410105739-613e4d8fcdca h1:fS1MbriBkQGhLmB/h0lOclw2k46K0yVwXhaLbYsvXPw= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:zEbyV30C0vRh3zvhPx88sYGirt1MUfQRBkR0NliPSPs= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240410105739-613e4d8fcdca h1:5ELxdfnXvY2uPtlP461K9x/2nCJ65wNsjsqQdZBH6GU= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:3Q5lbzObtPDemawgtWSH7ZinCW0ww/2xX4WghckqyfA= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240410105739-613e4d8fcdca h1:gv46uA6x3TiaM5O6gdzYcDE0ro4Mp0ckF8GgzL47zDY= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:Xs+anQvvoxcuofGnw73w6YuZTHxR68yU1jAb6N9JmwM= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240410105739-613e4d8fcdca h1:TKo6lXzy0EFUFx9XvmrX4Khks9HWmk6DkSBnKa7+5dU= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:aD8smCv1PAxKem4Ad5Jj8HJUWLN31VS4feDiEq8zlfE= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64 h1:W6WRIWKbgmr7E/NSzoYz1AUN3CdFbpckcDXnC3E9hKI= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:vleX++La+djaLEQuxFtFLApJHIbUYyCYveaezG0sJyI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240416115957-7bee54d0aa64 h1:Xw9wvMi6bhrraRLf6xhjwAcuBFvhmaiUhfNkVbslNuI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:jbU4tuB3rW3IAUF8quKUQ4zJ8LhCH9VdQij2GsgnD3A= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64 h1:jTZCYIahq3GcD0dzr/cPh3/nXVQxfABHihQNQ3tJH3A= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:RETAvNJ5aIEjqqgCrjo3P3XWjwzcFEKgujuCKCzlJOA= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240416115957-7bee54d0aa64 h1:XCa88AB4OvloeSNcfYmiTn+WrKdQpFHp/DQOoL+gZu4= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:KfYEEoVHFea7n9BYAZmx4xm1gxoC550bfgZwTvleMjc= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64 h1:iIJNC7NqeycUmkeIfgQP2BjDd/6UAnYio9FK1nV76Rg= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:hLakAZMTWzD2fTWCOxLZxR0/XkTl4qZI4gimQbB5r7U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64 h1:gsTbYDesVuk2Zr73exuNbJR72v/h8iEnsrOkm/GQSCY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:RmL8xS33C8fvWXiqIVWAj7LCqh8cOqDm3BTdYrNvS2o= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240416115957-7bee54d0aa64 h1:z9AyT4FmPnTyIrBPo4B7D2ZNx5bCqvBxNwBbYyZpWIg= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:PSJG4GtMVxB1CDSbMb+/hLA5ZW2kh3snUO1YX98Smb4= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240416115957-7bee54d0aa64 h1:Xv78CFFeywbsKq5yp9pGDvFK7U03fUxZrR8/C1CWJ0s= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:L4CkHrOeJmS54+0RQld3MLAi1cKdbpAHufhGysYhGTA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64 h1:gBykC7kjVszhhXBzWAMUVVmkH2q6//OVMnACc6oOttY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:YCRWcgHQy73ELpclt2QyV5bVOJgvp7KIlQudo9VO9NI= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240416115957-7bee54d0aa64 h1:TlzvpbBiMGXu8YrBHh0xKu2MYu3VKhH2t6zrHseU4x8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:rmskUv6VCuRjVq6rkoO83woFwhGmI2jwXXNp1FSJlks= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240416115957-7bee54d0aa64 h1:D6lhsEQsotLoXr6bUtP26N/dAe62fm2vfxjOtXcrI0E= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:ko4iUe+Tv7F7rzQUPGzyem4asX075gx4rx0WX+OQxVI= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240416115957-7bee54d0aa64 h1:UbWdVE7tWgHkCDB+2lHxATfj1Jl99yOYG7nw05GCp74= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:/W7GDI9VmBCzZ52Rz11rb4QbBNELt5+hHtQPBH9rYxE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240416115957-7bee54d0aa64 h1:TGC2xzlSJI6BivAcGEHvFI+K5Tz059DAHZfYQ5ppvUU= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:LnTY6B0Vb7dkYFJoEBhkA8tAZ1QxWNg1RJkrCqTRIsA= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240416115957-7bee54d0aa64 h1:9MacyEAUVIJ176tc/SnYHGC2mH5UBHe00dZv0NShuW8= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:jS2pCeQRGPZGLVPKYaJrlJWJuwxhN+TMES4j60jnd3s= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240416115957-7bee54d0aa64 h1:GAY2DTr5S+lNDAuYWrWmlJqNz65POuJ0riU8G1dVmKc= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:o0xtHv/3/q023hVlp3zK/me6/j+uItcLhlvJIgLMwkM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240416115957-7bee54d0aa64 h1:B6QJ3wejpRPJOmyKdnQsehryMliGxvAFSuUSQpHVy9U= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:YzxVnFPD06WK55sDBq65ixAqDCDeSIvxjY/dBPMMzs0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240416115957-7bee54d0aa64 h1:jgX+aghUKnpFmiuGDaWT07wAQwRUAUCCZuSrb+UVHXg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:WlQllmSxmDBMxhuX81c4zlMgB6rxWSs+vBTqdgFdyUE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240416115957-7bee54d0aa64 h1:U/qH7PNS8NiAC9QREk/bklSaVffXqMBvY8VUDTr4Hmk= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:O5xVGThvBdjwg+0rdtcLn0JOW4ik5sokmQoWtzlSLPQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64 h1:4MStL19I1yUlihxoq5iEcWS+Zt/wY3z8yKcNHyvRoYY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:Jz7vpzIdU76Ehos1M2gpADPooP6vKVu0GJ8WBObCS0Q= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240416115957-7bee54d0aa64 h1:q5uDq4ajHmy/zYQKYrx6aUusl6XrZRHCF68cdfwXIbc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:+tKaVaunTcaiTlL0bNFkAYXGe3KwQBEZ2T3o0Qy7LtQ= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240416115957-7bee54d0aa64 h1:fDpgrZCntpxfg/dxH+SVckoDoRfVr2ffdZGj/3SAlaQ= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:zEbyV30C0vRh3zvhPx88sYGirt1MUfQRBkR0NliPSPs= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240416115957-7bee54d0aa64 h1:4otuRlE0wtVYu8CU5IWLOv4BFOkDgQ5zO4pryPvzDe0= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:3Q5lbzObtPDemawgtWSH7ZinCW0ww/2xX4WghckqyfA= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240416115957-7bee54d0aa64 h1:UZoHUEPOlWzyzhZL7mXh1xvEyWvoJRR3MX5i0wTSs5g= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:Xs+anQvvoxcuofGnw73w6YuZTHxR68yU1jAb6N9JmwM= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240416115957-7bee54d0aa64 h1:flBud6JRSxnkhEmNL16PKo4pQQBZXmhbPC8Wd/4E4z8= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:aD8smCv1PAxKem4Ad5Jj8HJUWLN31VS4feDiEq8zlfE= github.com/openshift/library-go v0.0.0-20231030114140-33085da695c8 h1:mHH2dYxSr6EB/UrAOUwvuGJPZ/cay0lhDaPB3Nplbhw= github.com/openshift/library-go v0.0.0-20231030114140-33085da695c8/go.mod h1:ZFwNwC3opc/7aOvzUbU95zp33Lbxet48h80ryH3p6DY= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 h1:PftK9Q7BUD+wj8fNvxtJ+RhxYkcTtd8LcAo1Gk1H1HM= From 8a313c7c721a677b547f31ec3555501e7e23491a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Apr 2024 05:12:20 +0000 Subject: [PATCH 4/9] update microshift/vendor --- .../go.etcd.io/etcd/api/v3/version/version.go | 2 +- .../pkg/v3/transport/keepalive_listener.go | 5 - .../transport/keepalive_listener_openbsd.go | 26 ++++ .../v3/transport/keepalive_listener_unix.go | 24 ++++ .../etcd/client/pkg/v3/types/urls.go | 21 +-- vendor/go.etcd.io/etcd/client/v3/client.go | 19 ++- vendor/go.etcd.io/etcd/client/v3/config.go | 9 ++ .../admission/scheduler/nodeenv/admission.go | 36 ++++- vendor/modules.txt | 128 +++++++++--------- 9 files changed, 185 insertions(+), 85 deletions(-) create mode 100644 vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go create mode 100644 vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go diff --git a/vendor/go.etcd.io/etcd/api/v3/version/version.go b/vendor/go.etcd.io/etcd/api/v3/version/version.go index 4858a08bfe..d20b3a0202 100644 --- a/vendor/go.etcd.io/etcd/api/v3/version/version.go +++ b/vendor/go.etcd.io/etcd/api/v3/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "3.0.0" - Version = "3.5.12" + Version = "3.5.13" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go index 2241d8823e..d00a93dc19 100644 --- a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go +++ b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go @@ -87,11 +87,6 @@ func (l *keepAliveConn) SetKeepAlive(doKeepAlive bool) error { return l.TCPConn.SetKeepAlive(doKeepAlive) } -// SetKeepAlivePeriod sets keepalive period -func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { - return l.TCPConn.SetKeepAlivePeriod(d) -} - // A tlsKeepaliveListener implements a network listener (net.Listener) for TLS connections. type tlsKeepaliveListener struct { net.Listener diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go new file mode 100644 index 0000000000..024c6c2363 --- /dev/null +++ b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go @@ -0,0 +1,26 @@ +// Copyright 2023 The etcd Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//go:build openbsd + +package transport + +import "time" + +// SetKeepAlivePeriod sets keepalive period +func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { + // OpenBSD has no user-settable per-socket TCP keepalive options. + // Refer to https://github.com/etcd-io/etcd/issues/15811. + return nil +} diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go new file mode 100644 index 0000000000..08061f7267 --- /dev/null +++ b/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go @@ -0,0 +1,24 @@ +// Copyright 2023 The etcd Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//go:build !openbsd + +package transport + +import "time" + +// SetKeepAlivePeriod sets keepalive period +func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { + return l.TCPConn.SetKeepAlivePeriod(d) +} diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go b/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go index 9e5d03ff64..49a38967e6 100644 --- a/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go +++ b/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go @@ -36,20 +36,25 @@ func NewURLs(strs []string) (URLs, error) { if err != nil { return nil, err } - if u.Scheme != "http" && u.Scheme != "https" && u.Scheme != "unix" && u.Scheme != "unixs" { + + switch u.Scheme { + case "http", "https": + if _, _, err := net.SplitHostPort(u.Host); err != nil { + return nil, fmt.Errorf(`URL address does not have the form "host:port": %s`, in) + } + + if u.Path != "" { + return nil, fmt.Errorf("URL must not contain a path: %s", in) + } + case "unix", "unixs": + break + default: return nil, fmt.Errorf("URL scheme must be http, https, unix, or unixs: %s", in) } - if _, _, err := net.SplitHostPort(u.Host); err != nil { - return nil, fmt.Errorf(`URL address does not have the form "host:port": %s`, in) - } - if u.Path != "" { - return nil, fmt.Errorf("URL must not contain a path: %s", in) - } all[i] = *u } us := URLs(all) us.Sort() - return us, nil } diff --git a/vendor/go.etcd.io/etcd/client/v3/client.go b/vendor/go.etcd.io/etcd/client/v3/client.go index efa44e8902..8a2225b227 100644 --- a/vendor/go.etcd.io/etcd/client/v3/client.go +++ b/vendor/go.etcd.io/etcd/client/v3/client.go @@ -231,15 +231,30 @@ func (c *Client) dialSetupOpts(creds grpccredentials.TransportCredentials, dopts opts = append(opts, grpc.WithInsecure()) } + unaryMaxRetries := defaultUnaryMaxRetries + if c.cfg.MaxUnaryRetries > 0 { + unaryMaxRetries = c.cfg.MaxUnaryRetries + } + + backoffWaitBetween := defaultBackoffWaitBetween + if c.cfg.BackoffWaitBetween > 0 { + backoffWaitBetween = c.cfg.BackoffWaitBetween + } + + backoffJitterFraction := defaultBackoffJitterFraction + if c.cfg.BackoffJitterFraction > 0 { + backoffJitterFraction = c.cfg.BackoffJitterFraction + } + // Interceptor retry and backoff. // TODO: Replace all of clientv3/retry.go with RetryPolicy: // https://github.com/grpc/grpc-proto/blob/cdd9ed5c3d3f87aef62f373b93361cf7bddc620d/grpc/service_config/service_config.proto#L130 - rrBackoff := withBackoff(c.roundRobinQuorumBackoff(defaultBackoffWaitBetween, defaultBackoffJitterFraction)) + rrBackoff := withBackoff(c.roundRobinQuorumBackoff(backoffWaitBetween, backoffJitterFraction)) opts = append(opts, // Disable stream retry by default since go-grpc-middleware/retry does not support client streams. // Streams that are safe to retry are enabled individually. grpc.WithStreamInterceptor(c.streamClientInterceptor(withMax(0), rrBackoff)), - grpc.WithUnaryInterceptor(c.unaryClientInterceptor(withMax(defaultUnaryMaxRetries), rrBackoff)), + grpc.WithUnaryInterceptor(c.unaryClientInterceptor(withMax(unaryMaxRetries), rrBackoff)), ) return opts, nil diff --git a/vendor/go.etcd.io/etcd/client/v3/config.go b/vendor/go.etcd.io/etcd/client/v3/config.go index 335a288732..6f5b41978d 100644 --- a/vendor/go.etcd.io/etcd/client/v3/config.go +++ b/vendor/go.etcd.io/etcd/client/v3/config.go @@ -88,5 +88,14 @@ type Config struct { // PermitWithoutStream when set will allow client to send keepalive pings to server without any active streams(RPCs). PermitWithoutStream bool `json:"permit-without-stream"` + // MaxUnaryRetries is the maximum number of retries for unary RPCs. + MaxUnaryRetries uint `json:"max-unary-retries"` + + // BackoffWaitBetween is the wait time before retrying an RPC. + BackoffWaitBetween time.Duration `json:"backoff-wait-between"` + + // BackoffJitterFraction is the jitter fraction to randomize backoff wait time. + BackoffJitterFraction float64 `json:"backoff-jitter-fraction"` + // TODO: support custom balancer picker } diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv/admission.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv/admission.go index 62d92ea1a0..b52b824255 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv/admission.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv/admission.go @@ -9,6 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/labels" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/initializer" "k8s.io/client-go/informers" @@ -34,8 +35,10 @@ const ( // podNodeEnvironment is an implementation of admission.MutationInterface. type podNodeEnvironment struct { *admission.Handler - nsLister corev1listers.NamespaceLister - nsListerSynced func() bool + nsLister corev1listers.NamespaceLister + nsListerSynced func() bool + nodeLister corev1listers.NodeLister + nodeListerSynced func() bool // TODO this should become a piece of config passed to the admission plugin defaultNodeSelector string } @@ -72,7 +75,7 @@ func (p *podNodeEnvironment) admit(ctx context.Context, a admission.Attributes, return apierrors.NewForbidden(resource, name, err) } - // If scheduler.alpha.kubernetes.io/node-selector is set on the pod, + // If scheduler.alpha.kubernetes.io/node-selector is set on the namespace, // do not process the pod further. if _, ok := namespace.ObjectMeta.Annotations[kubeProjectNodeSelector]; ok { return nil @@ -82,6 +85,7 @@ func (p *podNodeEnvironment) admit(ctx context.Context, a admission.Attributes, if projectNodeSelector, ok := namespace.ObjectMeta.Annotations[projectv1.ProjectNodeSelector]; ok { selector = projectNodeSelector } + // we might consider in the future to allow advanced syntax selectors and use labels.Parse here instead projectNodeSelector, err := labelselector.Parse(selector) if err != nil { return err @@ -96,6 +100,20 @@ func (p *podNodeEnvironment) admit(ctx context.Context, a admission.Attributes, return apierrors.NewForbidden(resource, name, fmt.Errorf("pod node label selector does not extend project node label selector")) } + if len(pod.Spec.NodeName) > 0 && len(projectNodeSelector) > 0 { + node, err := p.nodeLister.Get(pod.Spec.NodeName) + if err != nil { + return apierrors.NewForbidden(resource, name, fmt.Errorf("cannot validate project node label selector: %v", err)) + } + projectNodeSelectorAdvanced, err := labels.Parse(selector) + if err != nil { + return err + } + if !projectNodeSelectorAdvanced.Matches(labels.Set(node.Labels)) { + return apierrors.NewForbidden(resource, name, fmt.Errorf("pod node name conflicts with project node label selector")) + } + } + // modify pod node selector = project node selector + current pod node selector pod.Spec.NodeSelector = labelselector.Merge(projectNodeSelector, pod.Spec.NodeSelector) @@ -117,14 +135,16 @@ func (p *podNodeEnvironment) SetDefaultNodeSelector(in string) { func (p *podNodeEnvironment) SetExternalKubeInformerFactory(kubeInformers informers.SharedInformerFactory) { p.nsLister = kubeInformers.Core().V1().Namespaces().Lister() p.nsListerSynced = kubeInformers.Core().V1().Namespaces().Informer().HasSynced + p.nodeLister = kubeInformers.Core().V1().Nodes().Lister() + p.nodeListerSynced = kubeInformers.Core().V1().Nodes().Informer().HasSynced } func (p *podNodeEnvironment) waitForSyncedStore(timeout <-chan time.Time) bool { - for !p.nsListerSynced() { + for !p.nsListerSynced() || !p.nodeListerSynced() { select { case <-time.After(100 * time.Millisecond): case <-timeout: - return p.nsListerSynced() + return p.nsListerSynced() && p.nodeListerSynced() } } @@ -138,6 +158,12 @@ func (p *podNodeEnvironment) ValidateInitialization() error { if p.nsListerSynced == nil { return fmt.Errorf("project node environment plugin needs a namespace lister synced") } + if p.nodeLister == nil { + return fmt.Errorf("project node environment plugin needs a node lister") + } + if p.nodeListerSynced == nil { + return fmt.Errorf("project node environment plugin needs a node lister synced") + } return nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index f26cac2f88..1c27b6a07e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -947,24 +947,24 @@ github.com/vmware/govmomi/vim25/xml # github.com/xlab/treeprint v1.1.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.12 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446 -## explicit; go 1.20 +# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac +## explicit; go 1.21 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb 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.12 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 -## explicit; go 1.20 +# go.etcd.io/etcd/client/pkg/v3 v3.5.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac +## explicit; go 1.21 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil go.etcd.io/etcd/client/pkg/v3/systemd 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/v3 v3.5.7 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446 -## explicit; go 1.20 +# go.etcd.io/etcd/client/v3 v3.5.7 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac +## explicit; go 1.21 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint @@ -1333,7 +1333,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/api v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1390,7 +1390,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.27.4 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/apiextensions-apiserver v0.27.4 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1436,7 +1436,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/apimachinery v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1501,7 +1501,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/apiserver v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1660,12 +1660,12 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/client-go v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2002,7 +2002,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.27.6 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/cloud-provider v0.27.6 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2024,14 +2024,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/component-base v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2065,7 +2065,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/component-helpers v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2078,7 +2078,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/controller-manager v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2095,16 +2095,16 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/dynamic-resource-allocation/resourceclaim # k8s.io/gengo v0.0.0-20220913193501-391367153a38 @@ -2123,13 +2123,13 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kms v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/kms v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.27.4 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/kube-aggregator v0.27.4 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2160,7 +2160,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f @@ -2193,13 +2193,13 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta2 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2234,7 +2234,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.27.6 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/kubelet v0.27.6 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2251,7 +2251,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1 k8s.io/kubelet/pkg/apis/podresources/v1 k8s.io/kubelet/pkg/apis/podresources/v1alpha1 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.27.7 => github.com/openshift/kubernetes v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/kubernetes v1.27.7 => github.com/openshift/kubernetes v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3053,7 +3053,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3095,7 +3095,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3110,10 +3110,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/pod-security-admission v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3263,37 +3263,37 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240410105739-613e4d8fcdca -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240416115957-7bee54d0aa64 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230724151845-8558e14a1168 From 4f7a78640931bdbd3e73cd9cf98eb09790585e5a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Apr 2024 05:12:20 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 86 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 61 ++++++++++++++++++------------------- 2 files changed, 74 insertions(+), 73 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 941c3c9d3d..055707490c 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -87,19 +87,19 @@ require ( github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect - github.com/sirupsen/logrus v1.9.0 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect github.com/soheilhy/cmux v0.1.5 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect github.com/xlab/treeprint v1.1.0 // indirect - go.etcd.io/bbolt v1.3.8 // indirect - go.etcd.io/etcd/api/v3 v3.5.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect - go.etcd.io/etcd/client/v2 v2.305.12 // indirect - go.etcd.io/etcd/client/v3 v3.5.12 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect - go.etcd.io/etcd/raft/v3 v3.5.12 // indirect + go.etcd.io/bbolt v1.3.9 // indirect + go.etcd.io/etcd/api/v3 v3.5.13 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect + go.etcd.io/etcd/client/v2 v2.305.13 // indirect + go.etcd.io/etcd/client/v3 v3.5.13 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect + go.etcd.io/etcd/raft/v3 v3.5.13 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/otel v1.20.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect @@ -138,39 +138,39 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240315094017-070ba48ac446 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240315094017-070ba48ac446 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240410105739-613e4d8fcdca // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac // from etcd + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240416115957-7bee54d0aa64 // staging kubernetes ) diff --git a/etcd/go.sum b/etcd/go.sum index 3114f3bcec..aa3b0bcf96 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -284,30 +284,30 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= github.com/openshift/build-machinery-go v0.0.0-20230816154005-5a38e1bfd880 h1:FFRA5mTN0CwySUwJnerfX9oCpT3H2ply4sLhXwMubPY= github.com/openshift/build-machinery-go v0.0.0-20230816154005-5a38e1bfd880/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446 h1:X3h+p/RtWxTjXZ2blxETCZdr/Hd9586TUxWbgdZwook= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 h1:WSz7oTHbavmMrb/p75R+P1PrvDaZVZ+7Bjv9IvJVGUs= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446 h1:Dz5KHnQN1MQg89PrMImkp1s9lkmGXhhl7Nz2LhVTLwg= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 h1:2RnZ4Hv0YmBja92m26TPzWZTkjY8WEs88KveN9OrzLU= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446/go.mod h1:UVwg/QIMoJncyeb/YxvJBJCE/NEwtHWashqc8A1nj/M= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240315094017-070ba48ac446 h1:k1JNFGC8ShaHIC9zI4D34KgaS9NGDJRmT+JrptTPF1E= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240315094017-070ba48ac446/go.mod h1:ERQuZVe79PI6vcC3DlKBukDCLja/L7YMu29B74Iwj4U= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240315094017-070ba48ac446 h1:7ji0IZnTN0SdjQYRHN76oVxF4s/360fh6iOnCk/O/CM= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240315094017-070ba48ac446/go.mod h1:axB0oCjMy+cemo5290/CutIjoxlfA6KVYKD1w0uue10= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca h1:CJj6g1gJbl7HUilYeJxtuNBJgP6r9XnuUsUV8+howis= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:vleX++La+djaLEQuxFtFLApJHIbUYyCYveaezG0sJyI= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca h1:touJsUXdOVFoUDKlDwAaLaElHpgra/6SHgJtqPQDS8o= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:RETAvNJ5aIEjqqgCrjo3P3XWjwzcFEKgujuCKCzlJOA= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca h1:rhEaGIBkrb/8W9xZaCAwUURWWN+IJ9Ql6fgzNXJfMCc= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:hLakAZMTWzD2fTWCOxLZxR0/XkTl4qZI4gimQbB5r7U= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca h1:/fvOgEKyVm6eFu+o6FeaD/aeGh+O/So/Pe9NgtM99bs= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:RmL8xS33C8fvWXiqIVWAj7LCqh8cOqDm3BTdYrNvS2o= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca h1:cq2lQXsrfbMfyiNYdMDrAv4vk1Vt6ZiCqWyuvHjI87M= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:YCRWcgHQy73ELpclt2QyV5bVOJgvp7KIlQudo9VO9NI= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca h1:ePVe3pQrwmPoP5FDFEuEZ+BCjIntoa6GrtV2kglOMko= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca/go.mod h1:Jz7vpzIdU76Ehos1M2gpADPooP6vKVu0GJ8WBObCS0Q= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:U849p7TYPDOn10NOFUq2N4sQ/wmoFATuO+0I+QdYeoQ= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:QwsgXhxP1oarPmZ2PN/q64kJOGkH6ivRldlxiy5hmO8= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:l0SY5owduZwbAofIjNPmyJtbQ2dgFFmJ9ytvzeELRDI= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:Y9teTmp3d4+JP0N2kx+tlg+Rjucn+nMPcTTsm6dPEtc= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:VJKb6GzR49RrpWlIK5KikFJblsOF9Y8HEQCMGvD3uIU= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac h1:r/WEOTzMIh8iJqAbRL6MNOPTSHXf2+s0ArJM27OGiRI= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64 h1:W6WRIWKbgmr7E/NSzoYz1AUN3CdFbpckcDXnC3E9hKI= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:vleX++La+djaLEQuxFtFLApJHIbUYyCYveaezG0sJyI= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64 h1:jTZCYIahq3GcD0dzr/cPh3/nXVQxfABHihQNQ3tJH3A= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:RETAvNJ5aIEjqqgCrjo3P3XWjwzcFEKgujuCKCzlJOA= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64 h1:iIJNC7NqeycUmkeIfgQP2BjDd/6UAnYio9FK1nV76Rg= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:hLakAZMTWzD2fTWCOxLZxR0/XkTl4qZI4gimQbB5r7U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64 h1:gsTbYDesVuk2Zr73exuNbJR72v/h8iEnsrOkm/GQSCY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:RmL8xS33C8fvWXiqIVWAj7LCqh8cOqDm3BTdYrNvS2o= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64 h1:gBykC7kjVszhhXBzWAMUVVmkH2q6//OVMnACc6oOttY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:YCRWcgHQy73ELpclt2QyV5bVOJgvp7KIlQudo9VO9NI= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64 h1:4MStL19I1yUlihxoq5iEcWS+Zt/wY3z8yKcNHyvRoYY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64/go.mod h1:Jz7vpzIdU76Ehos1M2gpADPooP6vKVu0GJ8WBObCS0Q= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460 h1:PftK9Q7BUD+wj8fNvxtJ+RhxYkcTtd8LcAo1Gk1H1HM= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= @@ -354,8 +354,8 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -391,10 +391,10 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= -go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.etcd.io/etcd/client/v2 v2.305.12 h1:0m4ovXYo1CHaA/Mp3X/Fak5sRNIWf01wk/X1/G3sGKI= -go.etcd.io/etcd/client/v2 v2.305.12/go.mod h1:aQ/yhsxMu+Oht1FOupSr60oBvcS9cKXHrzBpDsPTf9E= +go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= +go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= +go.etcd.io/etcd/client/v2 v2.305.13 h1:RWfV1SX5jTU0lbCvpVQe3iPQeAHETWdOTb6pxhd77C8= +go.etcd.io/etcd/client/v2 v2.305.13/go.mod h1:iQnL7fepbiomdXMb3om1rHq96htNNGv2sJkEcZGDRRg= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -525,6 +525,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From 1d877fc67f544a6d1781da9f5276a0726da78c40 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Apr 2024 05:12:26 +0000 Subject: [PATCH 6/9] update etcd/vendor --- .../github.com/sirupsen/logrus/README.md | 8 +- .../github.com/sirupsen/logrus/writer.go | 34 +++++- etcd/vendor/go.etcd.io/bbolt/bucket.go | 30 +++-- .../go.etcd.io/etcd/api/v3/version/version.go | 2 +- .../pkg/v3/transport/keepalive_listener.go | 5 - .../transport/keepalive_listener_openbsd.go | 26 ++++ .../v3/transport/keepalive_listener_unix.go | 24 ++++ .../etcd/client/pkg/v3/types/urls.go | 21 ++-- .../go.etcd.io/etcd/client/v3/client.go | 19 ++- .../go.etcd.io/etcd/client/v3/config.go | 9 ++ .../etcd/server/v3/embed/config_tracing.go | 2 +- .../go.etcd.io/etcd/server/v3/embed/etcd.go | 4 +- .../v3/etcdserver/api/etcdhttp/health.go | 2 +- .../server/v3/etcdserver/api/v3rpc/watch.go | 20 +-- .../etcd/server/v3/etcdserver/server.go | 44 ++++++- .../etcd/server/v3/etcdserver/v3_server.go | 11 ++ .../go.etcd.io/etcd/server/v3/lease/lessor.go | 10 +- .../etcd/server/v3/mvcc/kvstore_compaction.go | 2 +- .../etcd/server/v3/mvcc/watchable_store.go | 5 + etcd/vendor/modules.txt | 114 +++++++++--------- 20 files changed, 276 insertions(+), 116 deletions(-) create mode 100644 etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go create mode 100644 etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go diff --git a/etcd/vendor/github.com/sirupsen/logrus/README.md b/etcd/vendor/github.com/sirupsen/logrus/README.md index b042c896f2..d1d4a85fd7 100644 --- a/etcd/vendor/github.com/sirupsen/logrus/README.md +++ b/etcd/vendor/github.com/sirupsen/logrus/README.md @@ -9,7 +9,7 @@ the last thing you want from your Logging library (again...). This does not mean Logrus is dead. Logrus will continue to be maintained for security, (backwards compatible) bug fixes, and performance (where we are -limited by the interface). +limited by the interface). I believe Logrus' biggest contribution is to have played a part in today's widespread use of structured logging in Golang. There doesn't seem to be a @@ -43,7 +43,7 @@ plain text): With `log.SetFormatter(&log.JSONFormatter{})`, for easy parsing by logstash or Splunk: -```json +```text {"animal":"walrus","level":"info","msg":"A group of walrus emerges from the ocean","size":10,"time":"2014-03-10 19:57:38.562264131 -0400 EDT"} @@ -99,7 +99,7 @@ time="2015-03-26T01:27:38-04:00" level=fatal method=github.com/sirupsen/arcticcr ``` Note that this does add measurable overhead - the cost will depend on the version of Go, but is between 20 and 40% in recent tests with 1.6 and 1.7. You can validate this in your -environment via benchmarks: +environment via benchmarks: ``` go test -bench=.*CallerTracing ``` @@ -317,6 +317,8 @@ log.SetLevel(log.InfoLevel) It may be useful to set `log.Level = logrus.DebugLevel` in a debug or verbose environment if your application has that. +Note: If you want different log levels for global (`log.SetLevel(...)`) and syslog logging, please check the [syslog hook README](hooks/syslog/README.md#different-log-levels-for-local-and-remote-logging). + #### Entries Besides the fields added with `WithField` or `WithFields` some fields are diff --git a/etcd/vendor/github.com/sirupsen/logrus/writer.go b/etcd/vendor/github.com/sirupsen/logrus/writer.go index 72e8e3a1b6..074fd4b8bd 100644 --- a/etcd/vendor/github.com/sirupsen/logrus/writer.go +++ b/etcd/vendor/github.com/sirupsen/logrus/writer.go @@ -4,6 +4,7 @@ import ( "bufio" "io" "runtime" + "strings" ) // Writer at INFO level. See WriterLevel for details. @@ -20,15 +21,18 @@ func (logger *Logger) WriterLevel(level Level) *io.PipeWriter { return NewEntry(logger).WriterLevel(level) } +// Writer returns an io.Writer that writes to the logger at the info log level func (entry *Entry) Writer() *io.PipeWriter { return entry.WriterLevel(InfoLevel) } +// WriterLevel returns an io.Writer that writes to the logger at the given log level func (entry *Entry) WriterLevel(level Level) *io.PipeWriter { reader, writer := io.Pipe() var printFunc func(args ...interface{}) + // Determine which log function to use based on the specified log level switch level { case TraceLevel: printFunc = entry.Trace @@ -48,23 +52,51 @@ func (entry *Entry) WriterLevel(level Level) *io.PipeWriter { printFunc = entry.Print } + // Start a new goroutine to scan the input and write it to the logger using the specified print function. + // It splits the input into chunks of up to 64KB to avoid buffer overflows. go entry.writerScanner(reader, printFunc) + + // Set a finalizer function to close the writer when it is garbage collected runtime.SetFinalizer(writer, writerFinalizer) return writer } +// writerScanner scans the input from the reader and writes it to the logger func (entry *Entry) writerScanner(reader *io.PipeReader, printFunc func(args ...interface{})) { scanner := bufio.NewScanner(reader) + + // Set the buffer size to the maximum token size to avoid buffer overflows + scanner.Buffer(make([]byte, bufio.MaxScanTokenSize), bufio.MaxScanTokenSize) + + // Define a split function to split the input into chunks of up to 64KB + chunkSize := bufio.MaxScanTokenSize // 64KB + splitFunc := func(data []byte, atEOF bool) (int, []byte, error) { + if len(data) >= chunkSize { + return chunkSize, data[:chunkSize], nil + } + + return bufio.ScanLines(data, atEOF) + } + + // Use the custom split function to split the input + scanner.Split(splitFunc) + + // Scan the input and write it to the logger using the specified print function for scanner.Scan() { - printFunc(scanner.Text()) + printFunc(strings.TrimRight(scanner.Text(), "\r\n")) } + + // If there was an error while scanning the input, log an error if err := scanner.Err(); err != nil { entry.Errorf("Error while reading from Writer: %s", err) } + + // Close the reader when we are done reader.Close() } +// WriterFinalizer is a finalizer function that closes then given writer when it is garbage collected func writerFinalizer(writer *io.PipeWriter) { writer.Close() } diff --git a/etcd/vendor/go.etcd.io/bbolt/bucket.go b/etcd/vendor/go.etcd.io/bbolt/bucket.go index 054467af30..f3533d3446 100644 --- a/etcd/vendor/go.etcd.io/bbolt/bucket.go +++ b/etcd/vendor/go.etcd.io/bbolt/bucket.go @@ -162,12 +162,17 @@ func (b *Bucket) CreateBucket(key []byte) (*Bucket, error) { return nil, ErrBucketNameRequired } + // Insert into node. + // Tip: Use a new variable `newKey` instead of reusing the existing `key` to prevent + // it from being marked as leaking, and accordingly cannot be allocated on stack. + newKey := cloneBytes(key) + // Move cursor to correct position. c := b.Cursor() - k, _, flags := c.seek(key) + k, _, flags := c.seek(newKey) // Return an error if there is an existing key. - if bytes.Equal(key, k) { + if bytes.Equal(newKey, k) { if (flags & bucketLeafFlag) != 0 { return nil, ErrBucketExists } @@ -182,16 +187,14 @@ func (b *Bucket) CreateBucket(key []byte) (*Bucket, error) { } var value = bucket.write() - // Insert into node. - key = cloneBytes(key) - c.node().put(key, key, value, 0, bucketLeafFlag) + c.node().put(newKey, newKey, value, 0, bucketLeafFlag) // Since subbuckets are not allowed on inline buckets, we need to // dereference the inline page, if it exists. This will cause the bucket // to be treated as a regular, non-inline bucket for the rest of the tx. b.page = nil - return b.Bucket(key), nil + return b.Bucket(newKey), nil } // CreateBucketIfNotExists creates a new bucket if it doesn't already exist and returns a reference to it. @@ -288,18 +291,23 @@ func (b *Bucket) Put(key []byte, value []byte) error { return ErrValueTooLarge } + // Insert into node. + // Tip: Use a new variable `newKey` instead of reusing the existing `key` to prevent + // it from being marked as leaking, and accordingly cannot be allocated on stack. + newKey := cloneBytes(key) + // Move cursor to correct position. c := b.Cursor() - k, _, flags := c.seek(key) + k, _, flags := c.seek(newKey) // Return an error if there is an existing key with a bucket value. - if bytes.Equal(key, k) && (flags&bucketLeafFlag) != 0 { + if bytes.Equal(newKey, k) && (flags&bucketLeafFlag) != 0 { return ErrIncompatibleValue } - // Insert into node. - key = cloneBytes(key) - c.node().put(key, key, value, 0, 0) + // gofail: var beforeBucketPut struct{} + + c.node().put(newKey, newKey, value, 0, 0) return nil } diff --git a/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go b/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go index 4858a08bfe..d20b3a0202 100644 --- a/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go +++ b/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "3.0.0" - Version = "3.5.12" + Version = "3.5.13" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go index 2241d8823e..d00a93dc19 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go +++ b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener.go @@ -87,11 +87,6 @@ func (l *keepAliveConn) SetKeepAlive(doKeepAlive bool) error { return l.TCPConn.SetKeepAlive(doKeepAlive) } -// SetKeepAlivePeriod sets keepalive period -func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { - return l.TCPConn.SetKeepAlivePeriod(d) -} - // A tlsKeepaliveListener implements a network listener (net.Listener) for TLS connections. type tlsKeepaliveListener struct { net.Listener diff --git a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go new file mode 100644 index 0000000000..024c6c2363 --- /dev/null +++ b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_openbsd.go @@ -0,0 +1,26 @@ +// Copyright 2023 The etcd Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//go:build openbsd + +package transport + +import "time" + +// SetKeepAlivePeriod sets keepalive period +func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { + // OpenBSD has no user-settable per-socket TCP keepalive options. + // Refer to https://github.com/etcd-io/etcd/issues/15811. + return nil +} diff --git a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go new file mode 100644 index 0000000000..08061f7267 --- /dev/null +++ b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/transport/keepalive_listener_unix.go @@ -0,0 +1,24 @@ +// Copyright 2023 The etcd Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//go:build !openbsd + +package transport + +import "time" + +// SetKeepAlivePeriod sets keepalive period +func (l *keepAliveConn) SetKeepAlivePeriod(d time.Duration) error { + return l.TCPConn.SetKeepAlivePeriod(d) +} diff --git a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go index 9e5d03ff64..49a38967e6 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go +++ b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/types/urls.go @@ -36,20 +36,25 @@ func NewURLs(strs []string) (URLs, error) { if err != nil { return nil, err } - if u.Scheme != "http" && u.Scheme != "https" && u.Scheme != "unix" && u.Scheme != "unixs" { + + switch u.Scheme { + case "http", "https": + if _, _, err := net.SplitHostPort(u.Host); err != nil { + return nil, fmt.Errorf(`URL address does not have the form "host:port": %s`, in) + } + + if u.Path != "" { + return nil, fmt.Errorf("URL must not contain a path: %s", in) + } + case "unix", "unixs": + break + default: return nil, fmt.Errorf("URL scheme must be http, https, unix, or unixs: %s", in) } - if _, _, err := net.SplitHostPort(u.Host); err != nil { - return nil, fmt.Errorf(`URL address does not have the form "host:port": %s`, in) - } - if u.Path != "" { - return nil, fmt.Errorf("URL must not contain a path: %s", in) - } all[i] = *u } us := URLs(all) us.Sort() - return us, nil } diff --git a/etcd/vendor/go.etcd.io/etcd/client/v3/client.go b/etcd/vendor/go.etcd.io/etcd/client/v3/client.go index efa44e8902..8a2225b227 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/v3/client.go +++ b/etcd/vendor/go.etcd.io/etcd/client/v3/client.go @@ -231,15 +231,30 @@ func (c *Client) dialSetupOpts(creds grpccredentials.TransportCredentials, dopts opts = append(opts, grpc.WithInsecure()) } + unaryMaxRetries := defaultUnaryMaxRetries + if c.cfg.MaxUnaryRetries > 0 { + unaryMaxRetries = c.cfg.MaxUnaryRetries + } + + backoffWaitBetween := defaultBackoffWaitBetween + if c.cfg.BackoffWaitBetween > 0 { + backoffWaitBetween = c.cfg.BackoffWaitBetween + } + + backoffJitterFraction := defaultBackoffJitterFraction + if c.cfg.BackoffJitterFraction > 0 { + backoffJitterFraction = c.cfg.BackoffJitterFraction + } + // Interceptor retry and backoff. // TODO: Replace all of clientv3/retry.go with RetryPolicy: // https://github.com/grpc/grpc-proto/blob/cdd9ed5c3d3f87aef62f373b93361cf7bddc620d/grpc/service_config/service_config.proto#L130 - rrBackoff := withBackoff(c.roundRobinQuorumBackoff(defaultBackoffWaitBetween, defaultBackoffJitterFraction)) + rrBackoff := withBackoff(c.roundRobinQuorumBackoff(backoffWaitBetween, backoffJitterFraction)) opts = append(opts, // Disable stream retry by default since go-grpc-middleware/retry does not support client streams. // Streams that are safe to retry are enabled individually. grpc.WithStreamInterceptor(c.streamClientInterceptor(withMax(0), rrBackoff)), - grpc.WithUnaryInterceptor(c.unaryClientInterceptor(withMax(defaultUnaryMaxRetries), rrBackoff)), + grpc.WithUnaryInterceptor(c.unaryClientInterceptor(withMax(unaryMaxRetries), rrBackoff)), ) return opts, nil diff --git a/etcd/vendor/go.etcd.io/etcd/client/v3/config.go b/etcd/vendor/go.etcd.io/etcd/client/v3/config.go index 335a288732..6f5b41978d 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/v3/config.go +++ b/etcd/vendor/go.etcd.io/etcd/client/v3/config.go @@ -88,5 +88,14 @@ type Config struct { // PermitWithoutStream when set will allow client to send keepalive pings to server without any active streams(RPCs). PermitWithoutStream bool `json:"permit-without-stream"` + // MaxUnaryRetries is the maximum number of retries for unary RPCs. + MaxUnaryRetries uint `json:"max-unary-retries"` + + // BackoffWaitBetween is the wait time before retrying an RPC. + BackoffWaitBetween time.Duration `json:"backoff-wait-between"` + + // BackoffJitterFraction is the jitter fraction to randomize backoff wait time. + BackoffJitterFraction float64 `json:"backoff-jitter-fraction"` + // TODO: support custom balancer picker } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config_tracing.go b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config_tracing.go index 880479e515..382bc00e76 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config_tracing.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config_tracing.go @@ -73,7 +73,7 @@ func newTracingExporter(ctx context.Context, cfg *Config) (*tracingExporter, err } } - traceProvider := tracesdk.NewTracerProvider( + traceProvider := tracesdk.NewTracerProvider( tracesdk.WithBatcher(exporter), tracesdk.WithResource(res), tracesdk.WithSampler( diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go index d514b1bfec..7176d56ab6 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go @@ -624,10 +624,10 @@ func configureClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err erro for _, u := range append(cfg.ListenClientUrls, cfg.ListenClientHttpUrls...) { if u.Scheme == "http" || u.Scheme == "unix" { if !cfg.ClientTLSInfo.Empty() { - cfg.logger.Warn("scheme is HTTP while key and cert files are present; ignoring key and cert files", zap.String("client-url", u.String())) + cfg.logger.Warn("scheme is http or unix while key and cert files are present; ignoring key and cert files", zap.String("client-url", u.String())) } if cfg.ClientTLSInfo.ClientCertAuth { - cfg.logger.Warn("scheme is HTTP while --client-cert-auth is enabled; ignoring client cert auth for this URL", zap.String("client-url", u.String())) + cfg.logger.Warn("scheme is http or unix while --client-cert-auth is enabled; ignoring client cert auth for this URL", zap.String("client-url", u.String())) } } if (u.Scheme == "https" || u.Scheme == "unixs") && cfg.ClientTLSInfo.Empty() { diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/health.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/health.go index 0a93342912..15655e580c 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/health.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/etcdhttp/health.go @@ -60,7 +60,7 @@ type serverHealthV2V3 interface { Leader() types.ID } -// HandleHealth registers metrics and health handlers for v2. +// HandleHealthForV2 registers metrics and health handlers for v2. func HandleHealthForV2(lg *zap.Logger, mux *http.ServeMux, srv etcdserver.ServerV2) { mux.Handle(PathHealth, NewHealthHandler(lg, func(ctx context.Context, excludedAlarms StringSet, serializable bool) Health { if h := checkAlarms(lg, srv, excludedAlarms); h.Health != "true" { diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/watch.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/watch.go index cd834aa3e8..ddbcd231bf 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/watch.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/watch.go @@ -144,10 +144,6 @@ type serverWatchStream struct { // records fragmented watch IDs fragment map[mvcc.WatchID]bool - // indicates whether we have an outstanding global progress - // notification to send - deferredProgress bool - // closec indicates the stream is closed. closec chan struct{} @@ -177,8 +173,6 @@ func (ws *watchServer) Watch(stream pb.Watch_WatchServer) (err error) { prevKV: make(map[mvcc.WatchID]bool), fragment: make(map[mvcc.WatchID]bool), - deferredProgress: false, - closec: make(chan struct{}), } @@ -366,14 +360,7 @@ func (sws *serverWatchStream) recvLoop() error { case *pb.WatchRequest_ProgressRequest: if uv.ProgressRequest != nil { sws.mu.Lock() - // Ignore if deferred progress notification is already in progress - if !sws.deferredProgress { - // Request progress for all watchers, - // force generation of a response - if !sws.watchStream.RequestProgressAll() { - sws.deferredProgress = true - } - } + sws.watchStream.RequestProgressAll() sws.mu.Unlock() } default: @@ -481,11 +468,6 @@ func (sws *serverWatchStream) sendLoop() { // elide next progress update if sent a key update sws.progress[wresp.WatchID] = false } - if sws.deferredProgress { - if sws.watchStream.RequestProgressAll() { - sws.deferredProgress = false - } - } sws.mu.Unlock() case c, ok := <-sws.ctrlStream: diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go index 0095b6ec5c..aca92dd8e4 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go @@ -669,8 +669,15 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) { if srv.Cfg.EnableLeaseCheckpoint { // setting checkpointer enables lease checkpoint feature. - srv.lessor.SetCheckpointer(func(ctx context.Context, cp *pb.LeaseCheckpointRequest) { + srv.lessor.SetCheckpointer(func(ctx context.Context, cp *pb.LeaseCheckpointRequest) error { + if !srv.ensureLeadership() { + srv.lg.Warn("Ignore the checkpoint request because current member isn't a leader", + zap.Uint64("local-member-id", uint64(srv.ID()))) + return lease.ErrNotPrimary + } + srv.raftRequestOnce(ctx, pb.InternalRaftRequest{LeaseCheckpoint: cp}) + return nil }) } @@ -1154,7 +1161,19 @@ func (s *EtcdServer) run() { func (s *EtcdServer) revokeExpiredLeases(leases []*lease.Lease) { s.GoAttach(func() { + // We shouldn't revoke any leases if current member isn't a leader, + // because the operation should only be performed by the leader. When + // the leader gets blocked on the raft loop, such as writing WAL entries, + // it can't process any events or messages from raft. It may think it + // is still the leader even the leader has already changed. + // Refer to https://github.com/etcd-io/etcd/issues/15247 lg := s.Logger() + if !s.ensureLeadership() { + lg.Warn("Ignore the lease revoking request because current member isn't a leader", + zap.Uint64("local-member-id", uint64(s.ID()))) + return + } + // Increases throughput of expired leases deletion process through parallelization c := make(chan struct{}, maxPendingRevokes) for _, curLease := range leases { @@ -1187,6 +1206,29 @@ func (s *EtcdServer) revokeExpiredLeases(leases []*lease.Lease) { }) } +// ensureLeadership checks whether current member is still the leader. +func (s *EtcdServer) ensureLeadership() bool { + lg := s.Logger() + + ctx, cancel := context.WithTimeout(s.ctx, s.Cfg.ReqTimeout()) + defer cancel() + if err := s.linearizableReadNotify(ctx); err != nil { + lg.Warn("Failed to check current member's leadership", + zap.Error(err)) + return false + } + + newLeaderId := s.raftStatus().Lead + if newLeaderId != uint64(s.ID()) { + lg.Warn("Current member isn't a leader", + zap.Uint64("local-member-id", uint64(s.ID())), + zap.Uint64("new-lead", newLeaderId)) + return false + } + + return true +} + // Cleanup removes allocated objects by EtcdServer.NewServer in // situation that EtcdServer::Start was not called (that takes care of cleanup). func (s *EtcdServer) Cleanup() { diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go index 9f69b86b9b..b6e7a80679 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go @@ -297,6 +297,17 @@ func (s *EtcdServer) LeaseRevoke(ctx context.Context, r *pb.LeaseRevokeRequest) func (s *EtcdServer) LeaseRenew(ctx context.Context, id lease.LeaseID) (int64, error) { if s.isLeader() { + // If s.isLeader() returns true, but we fail to ensure the current + // member's leadership, there are a couple of possibilities: + // 1. current member gets stuck on writing WAL entries; + // 2. current member is in network isolation status; + // 3. current member isn't a leader anymore (possibly due to #1 above). + // In such case, we just return error to client, so that the client can + // switch to another member to continue the lease keep-alive operation. + if !s.ensureLeadership() { + return -1, lease.ErrNotPrimary + } + if err := s.waitAppliedIndex(); err != nil { return 0, err } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go b/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go index ff9cb2ca5e..abeeb09bf4 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go @@ -77,7 +77,7 @@ type RangeDeleter func() TxnDelete // Checkpointer permits checkpointing of lease remaining TTLs to the consensus log. Defined here to // avoid circular dependency with mvcc. -type Checkpointer func(ctx context.Context, lc *pb.LeaseCheckpointRequest) +type Checkpointer func(ctx context.Context, lc *pb.LeaseCheckpointRequest) error type LeaseID int64 @@ -423,7 +423,9 @@ func (le *lessor) Renew(id LeaseID) (int64, error) { // By applying a RAFT entry only when the remainingTTL is already set, we limit the number // of RAFT entries written per lease to a max of 2 per checkpoint interval. if clearRemainingTTL { - le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: []*pb.LeaseCheckpoint{{ID: int64(l.ID), Remaining_TTL: 0}}}) + if err := le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: []*pb.LeaseCheckpoint{{ID: int64(l.ID), Remaining_TTL: 0}}}); err != nil { + return -1, err + } } le.mu.Lock() @@ -659,7 +661,9 @@ func (le *lessor) checkpointScheduledLeases() { le.mu.Unlock() if len(cps) != 0 { - le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: cps}) + if err := le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: cps}); err != nil { + return + } } if len(cps) < maxLeaseCheckpointBatchSize { return diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go index 393f9d5661..c7d343d5c3 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go @@ -19,8 +19,8 @@ import ( "fmt" "time" - "go.etcd.io/etcd/server/v3/mvcc/buckets" humanize "github.com/dustin/go-humanize" + "go.etcd.io/etcd/server/v3/mvcc/buckets" "go.uber.org/zap" ) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/watchable_store.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/watchable_store.go index 85429e850a..cdac20ad5e 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/watchable_store.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/watchable_store.go @@ -366,6 +366,11 @@ func (s *watchableStore) syncWatchers() int { var victims watcherBatch wb := newWatcherBatch(wg, evs) for w := range wg.watchers { + if w.minRev < compactionRev { + // Skip the watcher that failed to send compacted watch response due to w.ch is full. + // Next retry of syncWatchers would try to resend the compacted watch response to w.ch + continue + } w.minRev = curRev + 1 eb, ok := wb[w] diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index c4993b2875..453d9a4b24 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -229,7 +229,7 @@ github.com/prometheus/procfs/internal/util # github.com/russross/blackfriday/v2 v2.1.0 ## explicit github.com/russross/blackfriday/v2 -# github.com/sirupsen/logrus v1.9.0 +# github.com/sirupsen/logrus v1.9.3 ## explicit; go 1.13 github.com/sirupsen/logrus # github.com/soheilhy/cmux v0.1.5 @@ -250,11 +250,11 @@ github.com/xiang90/probing # github.com/xlab/treeprint v1.1.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/bbolt v1.3.8 +# go.etcd.io/bbolt v1.3.9 ## explicit; go 1.17 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.12 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446 -## explicit; go 1.20 +# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac +## explicit; go 1.21 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb go.etcd.io/etcd/api/v3/etcdserverpb/gw @@ -262,8 +262,8 @@ 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.12 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 -## explicit; go 1.20 +# go.etcd.io/etcd/client/pkg/v3 v3.5.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac +## explicit; go 1.21 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil go.etcd.io/etcd/client/pkg/v3/pathutil @@ -272,18 +272,18 @@ go.etcd.io/etcd/client/pkg/v3/systemd 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/v2 v2.305.12 -## explicit; go 1.20 +# go.etcd.io/etcd/client/v2 v2.305.13 +## explicit; go 1.21 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.12 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446 -## explicit; go 1.20 +# go.etcd.io/etcd/client/v3 v3.5.13 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac +## explicit; go 1.21 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.12 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 -## explicit; go 1.20 +# go.etcd.io/etcd/pkg/v3 v3.5.13 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac +## explicit; go 1.21 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention go.etcd.io/etcd/pkg/v3/cpuutil @@ -299,15 +299,15 @@ 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.12 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240315094017-070ba48ac446 -## explicit; go 1.20 +# go.etcd.io/etcd/raft/v3 v3.5.13 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac +## explicit; go 1.21 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.7 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240315094017-070ba48ac446 -## explicit; go 1.20 +# go.etcd.io/etcd/server/v3 v3.5.7 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac +## explicit; go 1.21 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config go.etcd.io/etcd/server/v3/datadir @@ -595,7 +595,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/api v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -652,7 +652,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/apimachinery v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -703,12 +703,12 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/client-go v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -854,7 +854,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/component-base v0.27.7 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -891,7 +891,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64 ## explicit; go 1.20 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1013,38 +1013,38 @@ 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.20230317131656-c62d9de5a460 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240315094017-070ba48ac446 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240315094017-070ba48ac446 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240315094017-070ba48ac446 -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240315094017-070ba48ac446 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240315094017-070ba48ac446 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240410105739-613e4d8fcdca -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240410105739-613e4d8fcdca +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240417093127-b0c0321e61ac +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240416115957-7bee54d0aa64 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240416115957-7bee54d0aa64 From 04a55ccb96e527cc1caa6af2589aac0c20e96dc0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Apr 2024 05:12:26 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 0ef1a8fa37..dbd2882d8a 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # 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-v4.0-art-dev@sha256:0d76a7251eec03171800facd2fb4df11956406b946da1a42a91af74ed003a628" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:200c734b189920b13de8c2cbfe7bbb29d97831416358e93a576a074ade5dd9b5" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From f452ad665235823c5ce25eeb835ef734cea05029 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Apr 2024 05:12:27 +0000 Subject: [PATCH 8/9] update manifests --- .../webhook_deployment.yaml | 1 + assets/release/release-aarch64.json | 6 ++--- assets/release/release-x86_64.json | 22 +++++++++---------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/assets/components/csi-snapshot-controller/webhook_deployment.yaml b/assets/components/csi-snapshot-controller/webhook_deployment.yaml index 729cd3807b..620168af4a 100644 --- a/assets/components/csi-snapshot-controller/webhook_deployment.yaml +++ b/assets/components/csi-snapshot-controller/webhook_deployment.yaml @@ -20,6 +20,7 @@ spec: labels: app: csi-snapshot-webhook spec: + serviceAccount: csi-snapshot-webhook containers: - name: webhook image: '{{ .ReleaseImage.csi_snapshot_validation_webhook }}' diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index d00fc56b8c..6c2511c820 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,14 +1,14 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2024-04-17-052059" + "base": "4.14.0-0.nightly-arm64-2024-04-23-172135" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32a26552b82a82feda3c3cb2d42ee0379f63033cd40e4cff5f96affb5cdc08fa", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b01fd9cef6eccb374215209a332bc51d67b0c0e29308a5346fef21335dbe4ab7", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81c24be1939e365a0675d897a2ae787cd4bd07c41a13faa4d62b8ad31fe6c200", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cca9a843b71f3cba5ba2510c92250cb260b3250d4e0384b4be6c4925aea49b60", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b3403fe13628b6b0d48f9c1935dbe808bd1c0d0c0db54b629184182480e963e", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54f8d49d9a1ceb468fec37994abf4cae22bb1c4e6f97c4d8d4d81480faa421e3", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:046fd6fef67cf447cee6b4b2ec54174b4809be2dfd6b0838f1cb4d63b13f95d4", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a834fd64e5de2b478e205e0e7492794958592691550fe9f54c832366775224dc", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de64573b1b39a5b9742f9ab495dffef2adb169a6bb63312fb121f57ba4333044", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 5ea0151eac..5d6f83c0a9 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.14.0-0.nightly-2024-04-16-033023" + "base": "4.14.0-0.nightly-2024-04-23-014733" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fd1d1d19b7a25a7c7b6c624c1073cd09245dfa5c9b8965e7b1d0ec98c08c6a4", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b51ade173e06e83d256f5f4467855f2763140f39fe0ef1bc93540436cc540e81", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e96712c2acbe62ae1aaf432dec4a6f172683317e893ad84e6c02da32fddf4396", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f2bce3de40f54c2b9523372873588ef91d99d76eca5912b3bc93752f1bab39b", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac202e407ad75c65b390a39c2e222cee16c21ef3f9e7eb63ed7f1ac51306a444", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd3344e16f521c14c6180f0f8279f6fd586f6fbbb1a0f06eaa9343c7d197f43d", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58bfbc71b48c9557a9113b8e9c8a580b6e36e5669078bc68767b29072942f9d6", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd19615f32a1411f842cdd4c5617addc504634ced1687640281116cfbbe6c701", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7813f3493b7f1710d3db65700e08ec9a66f5e89925cf29c8c2a2b5340b12604f", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d76a7251eec03171800facd2fb4df11956406b946da1a42a91af74ed003a628", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:026d821001256836d4628f3d8c11135c24de5ee04496a9a549861fb1691e2086", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1c6d70138c388dbc85c3ea328f5478466cfc206f1427180a68ee98fb2804b64", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:200c734b189920b13de8c2cbfe7bbb29d97831416358e93a576a074ade5dd9b5", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b99da1fe9c941c6280d546f8df8df78fd5419f5f443c7546e0e9efbca3045b8b", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:829a8e4d34404abbd22fddb6ebfa0f74daa55f2697fb147da77b83fc8b473d8c", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:7ee0257998b7f804fcde9c095b4dc240c510eb316d7223e8485f701b5c9f2fbf", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:b453a5c76ba4e975a978e31a51531b1d6233723b0d944622caf7844dedf9ad5a", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af152be0aa0f60d8fdad06532ee507bbd6d47a356acc6ae4bccc010211d3d6aa", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f249326e4eee1de75e666b9b403c06d280c29fc9006d8f8bf9471c60ac3219ea", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4572f2a10ce165646f518b5747a97070d5a9c1f68b321a54e01c916aa225defc" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b27ae0cc0ffcc7f81f43cfac1a3dec6fe9ba12e2d0abcd67a6b89ca7732fe6eb", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49957bc586056e78676eaf28fd759ce43b5f434e9b4a049338300f948a49ef8a", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d850964c1833cc88e9309caaf171d3a29a9c15b2c9adb3dd90d334616419631" } } From af5b697ea9133c58b91083b660001fe6fc4325f3 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 24 Apr 2024 05:12:29 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 308e6b6226..944621a6f2 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=27 KUBE_GIT_VERSION=v1.27.12 -KUBE_GIT_COMMIT=613e4d8fcdca10207adfa2e18533d9cf29e91df4 +KUBE_GIT_COMMIT=7bee54d0aa64d001faf2a3c8c72849e4be692ec1 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b608063fae..20ffa97a88 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2024-04-17-052059 +OCP_VERSION := 4.14.0-0.nightly-arm64-2024-04-23-172135 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index de3047ae9b..551fa8e616 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2024-04-16-033023 +OCP_VERSION := 4.14.0-0.nightly-2024-04-23-014733