From 7d2fb7f4cfb6b3227569f0e5aeb4f8ba59434137 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Mar 2025 04:21:59 +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 2085c34eb8..c0faaf007e 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.19.0-0.nightly-2025-03-14-061055" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-17-210236" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-03-19-160541" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-19-200021" From 63f3cc868755638ca1fb9c1e3e562942859d53f1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Mar 2025 04:22:00 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 63 +++++++++++++++++++++++++++++++ scripts/auto-rebase/commits.txt | 18 ++++----- 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..b510e658dc 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,63 @@ +- cluster-ingress-operator embedded-component 7dc12cf28557f8c80460435649cfc393761e0285 to 924279a66d42d633d658113846d68e8d3805ec26 + - dd0fc42 2025-03-12T13:44:10-04:00 Manage OSSM operator subscription manually to ensure a compatible version is installed + +- cluster-kube-apiserver-operator embedded-component c13665bdedd2ee30d28ff83c187ea739d9b8094d to e41854880dcb1a9df3322c1494c93e9a9ac0babe + - b84db30 2025-03-14T08:27:10+01:00 Bump library-go + +- cluster-network-operator embedded-component b2f717758e01faa85ece045aaa63f65dbbce7d17 to 510b7508ad7a66d1742c5d9f83a4143fa860029c + - f7bf9bc 2025-03-14T09:03:49-04:00 Update managed Azure HCP cloud network config + - ea6db11 2025-03-11T11:43:10-04:00 Correct namespace ref and cert dir + +- etcd embedded-component bd0cae2096abb1d2087e858bbce3f9c06b215f8d to 80d288f7ccb6c11128e2d697e7d26805c487150b + - 0ad5ea55 2025-03-13T13:12:03-04:00 DOWNSTREAM: : OCPBUGS-50510: make hardware related timeout delay configurable + +- kubernetes embedded-component d6f2dd28529e5ecc8cdffaf443253f74382c2b60 to 2ed17b46fa89c438d5983268bdc352ba8bd9b4bb + - d0c1b6d2c 2025-03-17T06:25:00-04:00 UPSTREAM: : translate all existing rules to use filtering and the environemntSelector in the specs + - 40e44d8ef 2025-03-07T18:08:33+01:00 UPSTREAM: : Add volume group snapshot test driver + +- machine-config-operator embedded-component adafd58169f40eec1110a9fd47473457ca8e5f9d to fe8353e4ea7e72dfd69105069b870a37a87478ec + - ec772e1d 2025-03-17T14:42:33-05:00 removing uncessary bind mount option rw + - 1fa5eaa9 2025-03-17T10:51:48+01:00 Add crio dependency for ipsec.service + - 24175667 2025-03-17T10:51:48+01:00 Add ipsec connect wait service + - 8bec9078 2025-03-13T16:39:27-04:00 ensure that client configs are not mutable + - feb8d94a 2025-03-13T16:11:59-04:00 Fixing typos for MachineConfigNode + - f6c5964a 2025-03-13T10:49:46-04:00 Add scc label to arbitor crio-metrics-proxy + - 9773ac9c 2025-03-07T17:10:27-05:00 daemon: ensure ostree-finalize-staged is started before rebooting + - df2762b1 2025-03-07T10:54:52-05:00 add custom MCP support for MCN feature + - 3f3df1bc 2025-03-06T12:01:03+05:30 Set `Upgradeable=False` when cluster is on cgroup `v1` + - 76712800 2024-12-09T10:12:46-08:00 Give bonding slaves time to implicitly activate. + - a6773f61 2024-12-09T10:01:32-08:00 Revert "Race in configure-ovs.sh affects bonding interface configuration." + - 50817d16 2024-09-23T14:31:24-07:00 Race in configure-ovs.sh affects bonding interface configuration. + +- operator-framework-olm embedded-component 6dd1017cdc814695820aeeb95be6cc28d6c411b5 to e7c4a6900a8b47fef5bf8f5587b0088ba4a057c8 + - 7fede92c 2025-03-15T00:06:46+00:00 Upgrade controller-gen from v0.17.0 to v0.17.2 (#411) + - c9a8c3ee 2025-03-15T00:05:56+00:00 upgraded google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 => v0.0.0-20250303144028-a0af3efb3deb (#410) + - 6da537e6 2025-03-15T00:05:43+00:00 Upgrade YQ version used from v4.28.1 to v4.45.1 (#412) + - 8201db95 2025-03-15T00:05:32+00:00 upgraded golang.org/x/oauth2 v0.23.0 => v0.27.0 (#408) + - c88fbfb1 2025-03-15T00:05:20+00:00 Bump sigs.k8s.io/controller-runtime from 0.20.1 to 0.20.2 (#405) + - c4ea5699 2025-03-15T00:05:08+00:00 Bump github.com/spf13/cobra from 1.8.1 to 1.9.1 (#406) + - c785eb84 2025-03-15T00:04:56+00:00 Bump k8s libs to v0.32.2 (#404) + - c20c4425 2025-03-15T00:04:44+00:00 OCPBUGS#30001: Fix catalogsource typo for API docs (#402) + - aedc2ed7 2025-03-15T00:04:32+00:00 Bump sigs.k8s.io/controller-runtime from 0.20.0 to 0.20.1 (#400) + - 8aa5195f 2025-03-15T00:04:20+00:00 Bump sigs.k8s.io/controller-runtime from 0.19.4 to 0.20.0 (#396) + - 0cd7ddcc 2025-03-15T00:04:08+00:00 Bump k8s.io/apiextensions-apiserver from 0.32.0 to 0.32.1 (#394) + - 48463de1 2025-03-15T00:03:52+00:00 :seedling: Bump sigs.k8s.io/controller-runtime (#3533) + - 576ad78d 2025-03-15T00:03:35+00:00 :seedling: Bump github.com/operator-framework/api from 0.29.0 to 0.30.0 (#3534) + - 2daa1b4d 2025-03-14T00:06:42+00:00 :seedling: Bump github.com/containers/image/v5 from 5.34.1 to 5.34.2 (#3536) + - d13886a1 2025-03-14T00:05:31+00:00 :seedling: Bump github.com/prometheus/client_golang (#3535) + - 2c8292d8 2025-03-14T00:05:16+00:00 :seedling: Bump golang.org/x/net from 0.35.0 to 0.37.0 (#3537) + - 755cd694 2025-03-14T00:04:59+00:00 :seedling: Bump github.com/containers/image/v5 from 5.34.0 to 5.34.1 (#3527) + - 671718fb 2025-03-14T00:04:44+00:00 Update OWNERS - remove stevekuznetsov (#3531) + - 39ae922a 2025-03-14T00:04:23+00:00 upgraded golang.org/x/oauth2 v0.25.0 => v0.28.0 (#3528) + - 75188674 2025-03-14T00:04:07+00:00 Revert "fix: update PSA versions to match Kubernetes API version (#3524)" (#3530) + - e192c069 2025-03-14T00:03:50+00:00 fix: update PSA versions to match Kubernetes API version (#3524) + - e5f3b5d3 2025-03-06T09:59:29-05:00 Update DOWNSTREAM owners files + - b6b4883d 2025-03-06T10:46:39+00:00 Ensure that PSA label is latest instead of pinning versions + +- kubernetes image-amd64 d6f2dd28529e5ecc8cdffaf443253f74382c2b60 to 2ed17b46fa89c438d5983268bdc352ba8bd9b4bb + - d0c1b6d2c 2025-03-17T06:25:00-04:00 UPSTREAM: : translate all existing rules to use filtering and the environemntSelector in the specs + - 40e44d8ef 2025-03-07T18:08:33+01:00 UPSTREAM: : Add volume group snapshot test driver + +- kubernetes image-arm64 f4a27c46e464f735615c60fc0b067471e7073e13 to 2ed17b46fa89c438d5983268bdc352ba8bd9b4bb + - d0c1b6d2c 2025-03-17T06:25:00-04:00 UPSTREAM: : translate all existing rules to use filtering and the environemntSelector in the specs + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 245fd918f5..3f4d54ad7a 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,20 +1,20 @@ https://github.com/openshift/api embedded-component 8a7efbfb531684ef0ff566a882096df03e0f499c https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component b1a1105065835fcd881529299bc431921f4aa156 https://github.com/openshift/cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172 -https://github.com/openshift/cluster-ingress-operator embedded-component 7dc12cf28557f8c80460435649cfc393761e0285 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component c13665bdedd2ee30d28ff83c187ea739d9b8094d +https://github.com/openshift/cluster-ingress-operator embedded-component 924279a66d42d633d658113846d68e8d3805ec26 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e41854880dcb1a9df3322c1494c93e9a9ac0babe https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 75f30cdb07d58ce71c0a247207a5d91799a48cc0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 4210c04aec1c7fde8f4c294421e090ebf9248285 -https://github.com/openshift/cluster-network-operator embedded-component b2f717758e01faa85ece045aaa63f65dbbce7d17 +https://github.com/openshift/cluster-network-operator embedded-component 510b7508ad7a66d1742c5d9f83a4143fa860029c https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0ab30996207ada63ef2e2fd4f47aac03b0872c9a https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01 https://github.com/openshift/csi-external-snapshotter embedded-component 1fc6ee158070b34f84a94489b33accb333714727 -https://github.com/openshift/etcd embedded-component bd0cae2096abb1d2087e858bbce3f9c06b215f8d -https://github.com/openshift/kubernetes embedded-component d6f2dd28529e5ecc8cdffaf443253f74382c2b60 +https://github.com/openshift/etcd embedded-component 80d288f7ccb6c11128e2d697e7d26805c487150b +https://github.com/openshift/kubernetes embedded-component 2ed17b46fa89c438d5983268bdc352ba8bd9b4bb https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 4c521b09f4dc55ac69234419e083f3815646f4a9 -https://github.com/openshift/machine-config-operator embedded-component adafd58169f40eec1110a9fd47473457ca8e5f9d +https://github.com/openshift/machine-config-operator embedded-component fe8353e4ea7e72dfd69105069b870a37a87478ec https://github.com/openshift/openshift-controller-manager embedded-component ed3eae5db73699e2b6ad0b513589e06b4bf6f5aa -https://github.com/openshift/operator-framework-olm embedded-component 6dd1017cdc814695820aeeb95be6cc28d6c411b5 +https://github.com/openshift/operator-framework-olm embedded-component e7c4a6900a8b47fef5bf8f5587b0088ba4a057c8 https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33 https://github.com/openshift/service-ca-operator embedded-component fdd9502ff3446725b4f1fbf6902547dba9266061 https://github.com/openshift/oc image-amd64 fe18ae25a123e896fd218210073141f7f5811465 @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 1fc6ee158070b3 https://github.com/openshift/router image-amd64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-amd64 591277560f328601273f88f2881e09ccccd90a97 https://github.com/openshift/ovn-kubernetes image-amd64 66faee9937abbd9abc8e72e160c6fb2f4e606e9b -https://github.com/openshift/kubernetes image-amd64 d6f2dd28529e5ecc8cdffaf443253f74382c2b60 +https://github.com/openshift/kubernetes image-amd64 2ed17b46fa89c438d5983268bdc352ba8bd9b4bb https://github.com/openshift/service-ca-operator image-amd64 fdd9502ff3446725b4f1fbf6902547dba9266061 https://github.com/openshift/oc image-arm64 fe18ae25a123e896fd218210073141f7f5811465 https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a @@ -31,5 +31,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 1fc6ee158070b3 https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-arm64 591277560f328601273f88f2881e09ccccd90a97 https://github.com/openshift/ovn-kubernetes image-arm64 66faee9937abbd9abc8e72e160c6fb2f4e606e9b -https://github.com/openshift/kubernetes image-arm64 f4a27c46e464f735615c60fc0b067471e7073e13 +https://github.com/openshift/kubernetes image-arm64 2ed17b46fa89c438d5983268bdc352ba8bd9b4bb https://github.com/openshift/service-ca-operator image-arm64 fdd9502ff3446725b4f1fbf6902547dba9266061 From a11557c2ae52e64c624343bd9021a3ead3014984 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Mar 2025 04:22:34 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 74 +++++++++++++++++------------------ go.sum | 120 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/go.mod b/go.mod index a8276b26bf..993d4d0939 100644 --- a/go.mod +++ b/go.mod @@ -46,6 +46,8 @@ require ( github.com/fsnotify/fsnotify v1.8.0 github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 + github.com/prometheus/client_model v0.6.1 + github.com/prometheus/common v0.62.0 github.com/prometheus/prometheus v0.302.1 gopkg.in/yaml.v2 v2.4.0 k8s.io/utils v0.0.0-20241210054802-24370beab758 @@ -150,8 +152,6 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/prometheus/client_golang v1.21.0-rc.0 // indirect - github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/robfig/cron v1.2.0 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect @@ -216,47 +216,47 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250313160435-d6f2dd28529e // release kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250313160435-d6f2dd28529e // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250317191712-2ed17b46fa89 // release kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes diff --git a/go.sum b/go.sum index ed49268a1f..349eaa356d 100644 --- a/go.sum +++ b/go.sum @@ -255,68 +255,68 @@ github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a h1:duO3JMrUOqV github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a/go.mod h1:Qw3ThpzVZ0bfTILpBNYg4LGyjtNxfyCiGh/uDLOOTP8= github.com/openshift/cluster-policy-controller v0.0.0-20250310152427-748524784686 h1:nGyo9X9HcK6qs6jmFKFZgzkTl0b1adD0VumMCjDXzBA= github.com/openshift/cluster-policy-controller v0.0.0-20250310152427-748524784686/go.mod h1:O5k9FNYPPYp5xt+1batZMRgfXihz26l9pGKKUfLoHJA= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab h1:PSOUwnB+3F+TIMkKu+2ZciDo9Mp806nJBW3t7q3abSM= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab h1:4SYPsYBi7s8AFkMTGmkU9MgbSEU7ql5HNnjjAsinpGQ= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab h1:M0AVMFYjduus+snAwORF1sxWfzZlDchpSB9YW1rz7uM= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU= -github.com/openshift/kubernetes v0.0.0-20250313160435-d6f2dd28529e h1:S2Nv1+3OSQ9px+QMI7bhd/KvpHCmPUe+aVjF0vvGpSw= -github.com/openshift/kubernetes v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:ETEEqbxaz6PnlwjSXtesdzwfm8mt/7jsGcr6wQz6K0Q= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:xny/uj7u0TWsGvQLEVN+WnheDi+/DIDpvhH5TJzYLkw= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:u90Ktpuiiu55OQNLa9ze5AXNjzMx36L9FUlV/qN+NGk= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:2jb7nf8eFobn1SV2L5d3Z0A9n11mhPLf+7wlsojfeik= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU= +github.com/openshift/kubernetes v0.0.0-20250317191712-2ed17b46fa89 h1:OVCj5Jjhfs+DxvvO3SIonB3eGM2ZEG8Pc4OSD/PJhWw= +github.com/openshift/kubernetes v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:ETEEqbxaz6PnlwjSXtesdzwfm8mt/7jsGcr6wQz6K0Q= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc h1:CWT77Ik9sZKya4ZMBtRLB3b/05Yq5M5BI2RqddZD02c= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc/go.mod h1:mVJrzaBTOQrLN5fh90Lr9bxlnln151d6lk4G+DEmLeI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e h1:pOXNV4bUx/G8P5DNbnJU0kqFJcfdp19mjLu15P7047Y= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250313160435-d6f2dd28529e h1:QN6fCKS31g1JmDDyOlOBuIvlncxTfLnzNDrdYb2L0R4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e h1:blg2w5OmiGi48HYycccMgNnza7W822E8Ard19MWgxBI= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e h1:I7Vtznz3FBS/XYz1kh++Xd0YgQ+Iad6ZQRaNiRqt2rU= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e h1:6f5iWIT9iUslYFcMr+9Bu+N5xeXbLdNfyn8Jwc9wP9E= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e h1:aO7LY8iqN8mckFa1Z6svnif0d+FO4DNLz32Yd4ojIq0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250313160435-d6f2dd28529e h1:4fuj/3H4jAkeEXzEJ5Lr2+Dg/SS6lvX9ZX48bXpVmgA= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250313160435-d6f2dd28529e h1:h7P307XH+XdfkjhIyBI/OwIHo5LdwcVix7Ucl4AU69g= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e h1:g/2lE+mNUbL8tR8CMzPNud+zz+4I8FCOOPPqk6ffVVI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250313160435-d6f2dd28529e h1:jyTvcOgVAYCYbTHOX+WHb20g5Gtcyw5my/sbpdP7x6s= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250313160435-d6f2dd28529e h1:g4Tv+P7Bp/XDnUoh+EXDll9etKGM1u1F1HkJvUcpV6k= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250313160435-d6f2dd28529e h1:gb7EGrzdy9pv+YqGLWVmFUC4S87OuMK69AhMV9Absvs= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250313160435-d6f2dd28529e h1:oql9afc/ipkvO4w0aKUW8Pe6I1SeqhpbALLzrQBf/Ew= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250313160435-d6f2dd28529e h1:GtWzSbJS3EWpyje4krndKM8rqc4YcEfKR5rZx94X0d0= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250313160435-d6f2dd28529e h1:+d8l2bqzLJptw2gJC7rgtkI9tNWaPFEf3NOW9OhAfnM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250313160435-d6f2dd28529e h1:+FbCBbgaE4lc5nnLQ7pDA460xZStLTf8cQjkklcNDLg= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250313160435-d6f2dd28529e h1:DCvEcEehhKC+JuigWVhvknP57MkyLSgydoE2FQyGPYQ= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250313160435-d6f2dd28529e h1:0MjWSdHssDjtV+kzuuJuNSN8I/wx+iO6BiLcisDbZHY= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250313160435-d6f2dd28529e h1:8ILxAM1+RYJDESqPeYzCechGHEq2rRkb8xEelrIzFiY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250313160435-d6f2dd28529e h1:qkmSlOnrd957go/vQn7oiGS3g0Y6ry/Q3H38Bjkc5sM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250313160435-d6f2dd28529e h1:VCzBUPw4VkqyV32HfYSha0WKGurmeY2F1pPzgGHJYPI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250313160435-d6f2dd28529e h1:71tW5lBNNC9lSkh6DTbHFdXxmZWTA7sj8TtyIvvGeT4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250313160435-d6f2dd28529e h1:DO3w0+yGqH9WEKeayiW6Mhf5sAw7hAm/5APWx/wus8U= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250313160435-d6f2dd28529e h1:phR0Hjnp6lAmo6sM2S4D38QOb8/rvi4qYKdhYekMjx0= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250313160435-d6f2dd28529e h1:0VX/0EpekfmagXtkv8NYAZokCBvJeDfdv1Urll/bUZs= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250313160435-d6f2dd28529e h1:t6OZV2Fu5AD6ff3KVkJb3M1rpi1B38NBuVS+v6RKgvE= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89 h1:JN9zENSD7zsE5ZAKMeTWRNdcGK1Q0oByekmztboxh2g= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250317191712-2ed17b46fa89 h1:QuC7L/C2AG7IVnWhsSBgafBDkmFlfyyxlxk9MqnCf3I= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89 h1:3/M24iD9f0CvKP2nARxF4C7gDzpSRIUo60NW0QSn6AY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89 h1:/3QSXRoT1brvrFMFU2SvkaJGiSIJmIIepbc8mtBWask= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89 h1:EVyV3OQIdFLoOmPoDqcY3n9j7FKS5szL8e0t0khsGsk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89 h1:WjGF1+XMvl0zQweqUkzVOsHF8m+O9UMCY9Zs6gC8Nlg= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250317191712-2ed17b46fa89 h1:ba1O8DF5kH355VhZ2Bu6Gn+gqeYCtTewPa0MOks5gho= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250317191712-2ed17b46fa89 h1:u/Lfkgb4z/JuT6TppxFV9tURh84dSOPlG7ZPEtSpOJ4= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89 h1:nRxc1auEj6Sn1hLMy4zsR3j52YOjHuIKb3m7K9F/Y4c= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250317191712-2ed17b46fa89 h1:iWEHpmSLkmGr75VXgP2TsBQPtycWKihQO+kLR/TlFl0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250317191712-2ed17b46fa89 h1:FpKHrxJhAXLj+gZpHGSDj15QQPs5aE3flEDioU68GFE= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250317191712-2ed17b46fa89 h1:a0kJQOemuQm+Q/k7JOXYfIvpMSEiOdACImqVdysbxQg= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250317191712-2ed17b46fa89 h1:eCX/GwEwZbVrW/s3aphxJNUqaBTT0z7J31iYksl5Svo= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250317191712-2ed17b46fa89 h1:QCCJuhZGg7nniU6KWZBMxvg18dY4Ei/UagoL6Pade+Q= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250317191712-2ed17b46fa89 h1:1L9NIyf++XUDey5OB9XMkZtgRhDVYJeYFbj3mRxsX6o= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250317191712-2ed17b46fa89 h1:WjaiNIg1RwsJUTACOI8X5ZRb/q6TMD0dUV69Pdyn9+8= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250317191712-2ed17b46fa89 h1:jjkHCuwpXJy/orreDIlm6j6bBioWerr6TDGyvXm/akY= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250317191712-2ed17b46fa89 h1:Wt+NR4+3eQA8uTxORUiv/i2l8iAZfZEyYVT19UvjZd8= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250317191712-2ed17b46fa89 h1:5dZV+ql8Rc82rshbRNMGaq/wPKSKWta5kokAQkm+Kho= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250317191712-2ed17b46fa89 h1:REQRZ/l4OfJwSeRT4LiGQpvEX2XN1RnyDWkWgCzXi4E= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250317191712-2ed17b46fa89 h1:8bq5CLcqxcH4M0XXlTJgyY8T6w7pkVRx8caSZA8Yu8U= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89 h1:CyaxdmGE/67YHgOYNSsZ3J2qv7SfoYgMkpcL2lDWsoY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250317191712-2ed17b46fa89 h1:XCV1V3X8XKkNQUTSHhUKk1sCoaAsSZBpoadUxMvKUDM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250317191712-2ed17b46fa89 h1:HlHB0MH+ZO4NpwoKNgb2l6aKyGcRXjj2/E8D8JaF/Oo= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250317191712-2ed17b46fa89 h1:O0iPfRWfjZZNldOvCkllDmv2n0H3NN2s9h39I5zSvKY= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250317191712-2ed17b46fa89 h1:pOpqDhjxDLU/F691ks+mfq4M0u3a83Ej8YZhQf4rZxI= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= From 1a839ceca61f628c584d6a398d46b7b4828ffd05 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Mar 2025 04:23:01 +0000 Subject: [PATCH 4/9] update microshift/vendor --- vendor/modules.txt | 130 ++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index 60d47b9f93..f1c81ddd1b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -805,7 +805,7 @@ github.com/x448/float16 # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.19 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# go.etcd.io/etcd/api/v3 v3.5.19 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 ## explicit; go 1.23.0 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -813,7 +813,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.19 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# go.etcd.io/etcd/client/pkg/v3 v3.5.19 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 ## explicit; go 1.23.0 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -821,7 +821,7 @@ 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.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 ## explicit; go 1.23.0 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -1167,7 +1167,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1228,7 +1228,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1275,7 +1275,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.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1347,7 +1347,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.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1528,13 +1528,13 @@ 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/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1898,7 +1898,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1917,14 +1917,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-20250313160435-d6f2dd28529e +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 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.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -1961,7 +1961,7 @@ k8s.io/component-base/version/verflag k8s.io/component-base/zpages/features k8s.io/component-base/zpages/flagz k8s.io/component-base/zpages/statusz -# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -1975,7 +1975,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.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/controller-manager v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -1992,35 +1992,35 @@ 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-20250313160435-d6f2dd28529e +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 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-20250313160435-d6f2dd28529e +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/dynamic-resource-allocation/api k8s.io/dynamic-resource-allocation/cel k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/endpointslice k8s.io/endpointslice/metrics k8s.io/endpointslice/topologycache k8s.io/endpointslice/trafficdist k8s.io/endpointslice/util -# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/externaljwt/apis/v1alpha1 # k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 @@ -2041,13 +2041,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 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.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/kube-aggregator v0.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2080,7 +2080,7 @@ k8s.io/kube-aggregator/pkg/controllers/status/remote 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-20250313160435-d6f2dd28529e +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f @@ -2113,11 +2113,11 @@ 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-20250313160435-d6f2dd28529e +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2152,7 +2152,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2174,7 +2174,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.32.2 => github.com/openshift/kubernetes v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/kubernetes v1.32.2 => github.com/openshift/kubernetes v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2995,7 +2995,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse k8s.io/kubernetes/third_party/forked/libcontainer/apparmor k8s.io/kubernetes/third_party/forked/libcontainer/utils -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3010,10 +3010,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-20250313160435-d6f2dd28529e +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3160,39 +3160,39 @@ sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250313160435-d6f2dd28529e -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250317191712-2ed17b46fa89 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250317191712-2ed17b46fa89 From 00e6916ccfbaa88c6d358448227a2d5fd9c98ee1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Mar 2025 04:23:01 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 76 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 52 ++++++++++++++++++------------------ 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 9b9268b040..b8971cce8e 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -144,45 +144,45 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250311155124-bd0cae2096ab // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250313160435-d6f2dd28529e // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250313160435-d6f2dd28529e // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250317191712-2ed17b46fa89 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 98213b51fa..f11329f438 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -162,32 +162,32 @@ github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f h1:HH+BqfxONWB2kknhC github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw= github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 h1:Pw/OKhN0r8HZcR4No8qh0QygTvuYsDeZhHsK6T9LC+I= github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab h1:PSOUwnB+3F+TIMkKu+2ZciDo9Mp806nJBW3t7q3abSM= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab h1:4SYPsYBi7s8AFkMTGmkU9MgbSEU7ql5HNnjjAsinpGQ= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab h1:M0AVMFYjduus+snAwORF1sxWfzZlDchpSB9YW1rz7uM= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab h1:cu/UQZn1ehibh/a1d7Y5rhXK8O5PMcBJCWDyjIMATjI= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab/go.mod h1:0sMAKVLJTpP4Og4oN8O2as9ph1f3copxUPfvi+RZ3zE= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20250311155124-bd0cae2096ab h1:S/46BA7FxOOVXdNGcId9Z/WJ2ZJvMUcjG45g2oYxSfU= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20250311155124-bd0cae2096ab/go.mod h1:WKCdvqs9USiM72tau3LZEyybDWKbyaQV0k135O3C4xw= -github.com/openshift/etcd/server/v3 v3.5.1-0.20250311155124-bd0cae2096ab h1:KbuRxFxSoSJZ8WuaGii0jqh81yrvxUbSjafPX3E5G4I= -github.com/openshift/etcd/server/v3 v3.5.1-0.20250311155124-bd0cae2096ab/go.mod h1:sEMCH1EdYxuWsFu2PzH31jEsmeCQqTUZ7E1uSo9gpg0= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e h1:pOXNV4bUx/G8P5DNbnJU0kqFJcfdp19mjLu15P7047Y= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e h1:blg2w5OmiGi48HYycccMgNnza7W822E8Ard19MWgxBI= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e h1:I7Vtznz3FBS/XYz1kh++Xd0YgQ+Iad6ZQRaNiRqt2rU= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e h1:6f5iWIT9iUslYFcMr+9Bu+N5xeXbLdNfyn8Jwc9wP9E= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e h1:aO7LY8iqN8mckFa1Z6svnif0d+FO4DNLz32Yd4ojIq0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e h1:g/2lE+mNUbL8tR8CMzPNud+zz+4I8FCOOPPqk6ffVVI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250313160435-d6f2dd28529e h1:71tW5lBNNC9lSkh6DTbHFdXxmZWTA7sj8TtyIvvGeT4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250313160435-d6f2dd28529e/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:xny/uj7u0TWsGvQLEVN+WnheDi+/DIDpvhH5TJzYLkw= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:u90Ktpuiiu55OQNLa9ze5AXNjzMx36L9FUlV/qN+NGk= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:2jb7nf8eFobn1SV2L5d3Z0A9n11mhPLf+7wlsojfeik= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:Z/1Tk1+E2AkHNJf/8MEJ3oWPQssL3Lr9h8X3OcbkBEo= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:0sMAKVLJTpP4Og4oN8O2as9ph1f3copxUPfvi+RZ3zE= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:QQSZ5k6ne3fntjTJZADmwz2ZWHuVGKjRneB/l9vbr1w= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:WKCdvqs9USiM72tau3LZEyybDWKbyaQV0k135O3C4xw= +github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:RIwaMAMxe8Hnn+7MOVNmOGCTY5CKJ1NOSZURyn2O2mY= +github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:sEMCH1EdYxuWsFu2PzH31jEsmeCQqTUZ7E1uSo9gpg0= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89 h1:JN9zENSD7zsE5ZAKMeTWRNdcGK1Q0oByekmztboxh2g= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89 h1:3/M24iD9f0CvKP2nARxF4C7gDzpSRIUo60NW0QSn6AY= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89 h1:/3QSXRoT1brvrFMFU2SvkaJGiSIJmIIepbc8mtBWask= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89 h1:EVyV3OQIdFLoOmPoDqcY3n9j7FKS5szL8e0t0khsGsk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89 h1:WjGF1+XMvl0zQweqUkzVOsHF8m+O9UMCY9Zs6gC8Nlg= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89 h1:nRxc1auEj6Sn1hLMy4zsR3j52YOjHuIKb3m7K9F/Y4c= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89 h1:CyaxdmGE/67YHgOYNSsZ3J2qv7SfoYgMkpcL2lDWsoY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= From 9c42466fefcaefa15c851aab9521bc2da0b6e9b1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Mar 2025 04:23:07 +0000 Subject: [PATCH 6/9] update etcd/vendor --- .../openshift/microshift/pkg/util/net.go | 14 +++ .../etcd/server/v3/config/config.go | 33 +++++- .../go.etcd.io/etcd/server/v3/wal/wal.go | 19 +++- etcd/vendor/modules.txt | 102 +++++++++--------- 4 files changed, 115 insertions(+), 53 deletions(-) diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go b/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go index 1518226a2a..2cd9a8e8cc 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go @@ -362,3 +362,17 @@ func findDefaultRouteForFamily(family int) (routeStruct, error) { } return routeStruct{}, fmt.Errorf("no default gateway found") } + +// HasDefaultRoute returns whether the host has a default route for IPv4 or IPv6. +func HasDefaultRoute() (bool, error) { + routes, err := netlink.RouteList(nil, netlink.FAMILY_ALL) + if err != nil { + return false, fmt.Errorf("failed to get route list: %v", err) + } + for _, route := range routes { + if route.Dst == nil || route.Dst.IP.Equal(tcpnet.IPv4zero) || route.Dst.IP.Equal(tcpnet.IPv6zero) { + return true, nil + } + } + return false, nil +} diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/config/config.go b/etcd/vendor/go.etcd.io/etcd/server/v3/config/config.go index ca964b7169..1203f7a0df 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/config/config.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/config/config.go @@ -17,8 +17,10 @@ package config import ( "context" "fmt" + "os" "path/filepath" "sort" + "strconv" "strings" "time" @@ -201,6 +203,11 @@ type ServerConfig struct { // V2Deprecation defines a phase of v2store deprecation process. V2Deprecation V2DeprecationEnum `json:"v2-deprecation"` + + // openshiftHardwareDelaySeconds sets the duration, in seconds, to extend the standard etcd + // request timeout by based on hardware speed. OpenShift currently has a notion of differentiating + // between standard and slower hardware: https://github.com/openshift/cluster-etcd-operator/blob/5bbe49442101475febb89bba3be808aa121f5c0c/pkg/hwspeedhelpers/hwhelper.go#L21-L33 + openshiftHardwareDelaySeconds int } // VerifyBootstrap sanity-checks the initial config for bootstrap case @@ -315,7 +322,31 @@ func (c *ServerConfig) ShouldDiscover() bool { return c.DiscoveryURL != "" } func (c *ServerConfig) ReqTimeout() time.Duration { // 5s for queue waiting, computation and disk IO delay // + 2 * election timeout for possible leader election - return 5*time.Second + 2*time.Duration(c.ElectionTicks*int(c.TickMs))*time.Millisecond + // return 5*time.Second + 2*time.Duration(c.ElectionTicks*int(c.TickMs))*time.Millisecond + + // OCP PATCH: use an environment variable to configure the non election-related timeout + // value used. If it isn't configured, default to 25 seconds. + // Default of 25 seconds gets us to a total of 27s on "standard hardware" and 30s on "slow hardware" + // due to the configurations of election timeouts in https://github.com/openshift/cluster-etcd-operator/blob/5bbe49442101475febb89bba3be808aa121f5c0c/pkg/hwspeedhelpers/hwhelper.go#L21-L33 + // This gets us closer to the kube-apiserver's upper bound request timeout of 34 seconds while leaving some time + // for other things to have on the kube-apiserver side of things. + // See: https://issues.redhat.com/browse/OCPBUGS-50510 + // TODO(everettraven): pursue an upstream fix for this so we don't have to carry this patch for forever + if c.openshiftHardwareDelaySeconds == 0 { + hardwareDelayTimeout := 25 + if hardwareDelayOverrideEnv := os.Getenv("OPENSHIFT_ETCD_HARDWARE_DELAY_TIMEOUT"); hardwareDelayOverrideEnv != "" { + hardwareDelayOverride, err := strconv.Atoi(hardwareDelayOverrideEnv) + if err != nil { + c.Logger.Sugar().Infof("OPENSHIFT_ETCD_HARDWARE_DELAY_TIMEOUT specified but could not be parsed. falling back to default of %s seconds. parse error: %v", hardwareDelayTimeout, err) + } else { + hardwareDelayTimeout = hardwareDelayOverride + } + } + + c.openshiftHardwareDelaySeconds = hardwareDelayTimeout + } + + return time.Duration(c.openshiftHardwareDelaySeconds)*time.Second + 2*time.Duration(c.ElectionTicks*int(c.TickMs))*time.Millisecond } func (c *ServerConfig) ElectionTimeout() time.Duration { diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/wal/wal.go b/etcd/vendor/go.etcd.io/etcd/server/v3/wal/wal.go index db90078770..69011025fa 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/wal/wal.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/wal/wal.go @@ -22,6 +22,7 @@ import ( "io" "os" "path/filepath" + "strconv" "strings" "sync" "time" @@ -92,6 +93,8 @@ type WAL struct { locks []*fileutil.LockedFile // the locked files the WAL holds (the name is increasing) fp *filePipeline + + openshiftWarnFsyncDuration *time.Duration } // Create creates a WAL ready for appending records. The given metadata is @@ -797,11 +800,25 @@ func (w *WAL) sync() error { return nil } + if w.openshiftWarnFsyncDuration == nil { + defaultWarnFsyncDuration := warnSyncDuration + w.openshiftWarnFsyncDuration = &defaultWarnFsyncDuration + if warnFsyncDurationOverride := os.Getenv("OPENSHIFT_WARN_FSYNC_DURATION"); warnFsyncDurationOverride != "" { + override, err := strconv.Atoi(warnFsyncDurationOverride) + if err != nil { + w.lg.Sugar().Infof("OPENSHIFT_WARN_FSYNC_DURATION specified but could not be parsed. falling back to default of %v. parse error: %v", warnSyncDuration, err) + } else { + openshiftWarnFsyncDuration := time.Duration(override) * time.Second + w.openshiftWarnFsyncDuration = &openshiftWarnFsyncDuration + } + } + } + start := time.Now() err := fileutil.Fdatasync(w.tail().File) took := time.Since(start) - if took > warnSyncDuration { + if took > *w.openshiftWarnFsyncDuration { w.lg.Warn( "slow fdatasync", zap.Duration("took", took), diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 9a9a09661d..6632652c45 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -282,7 +282,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.11 ## explicit; go 1.22 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.19 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# go.etcd.io/etcd/api/v3 v3.5.19 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 ## explicit; go 1.23.0 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -291,7 +291,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.19 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# go.etcd.io/etcd/client/pkg/v3 v3.5.19 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 ## explicit; go 1.23.0 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -304,14 +304,14 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.19 ## explicit; go 1.23.0 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.19 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# go.etcd.io/etcd/client/v3 v3.5.19 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 ## explicit; go 1.23.0 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.19 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# go.etcd.io/etcd/pkg/v3 v3.5.19 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 ## explicit; go 1.23.0 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -328,14 +328,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.19 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# go.etcd.io/etcd/raft/v3 v3.5.19 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6 ## explicit; go 1.23.0 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.16 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250311155124-bd0cae2096ab +# go.etcd.io/etcd/server/v3 v3.5.16 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6 ## explicit; go 1.23.0 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -631,7 +631,7 @@ gopkg.in/natefinch/lumberjack.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -692,7 +692,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -754,18 +754,18 @@ 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.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 k8s.io/apiserver/pkg/authentication/user -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -924,7 +924,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -961,7 +961,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-20250313160435-d6f2dd28529e +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89 ## explicit; go 1.23.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1078,41 +1078,41 @@ sigs.k8s.io/yaml/goyaml.v3 # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250311155124-bd0cae2096ab -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250311155124-bd0cae2096ab -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250311155124-bd0cae2096ab -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250311155124-bd0cae2096ab -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250311155124-bd0cae2096ab -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250313160435-d6f2dd28529e -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250313160435-d6f2dd28529e +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250317191712-2ed17b46fa89 +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250317191712-2ed17b46fa89 From d0ec1a7b0f2d20246f715a03b009e35743b1270d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Mar 2025 04:23:08 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index d1f9d63537..241448a0ae 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-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:c45696e4d2ede60885d3c960e9c24dcc45b39e031b65aa933ea6a069be78bda8" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8f30bbc56fe0685614442abba53b41fc2d9cabb286f796db3b7941e9a40629b" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index b653ca16b3..bc3cb48f44 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.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:eb4c268f35110e2d323eea64022ff0d0697c1a54a4a649c4966144ceeec86362" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a8e25fe8ff56df318f7589c4747a35580ac0c80fcf18e8625d93bfacbc0d5f0" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From c376750a3f85f73045513af2ff7b95984e76822e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Mar 2025 04:23:09 +0000 Subject: [PATCH 8/9] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../0000_50_olm_00-catalogsources.crd.yaml | 2 +- .../0000_50_olm_00-namespace.yaml | 4 ++-- .../operator-lifecycle-manager/kustomization.x86_64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-x86_64.json | 6 +++--- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index a7fe64fcd1..6faa75ab1c 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-03-17-210236" + "base": "4.19.0-0.nightly-arm64-2025-03-19-200021" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea1e801f53c7cb86011519dab3f10c5d52f9f92090d4afaa943c1d658db753d6", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 42b5581c49..194723e14d 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-2025-03-14-061055" + "base": "4.19.0-0.nightly-2025-03-19-160541" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51f2c63ee30f30ba87f6d3a6a345b3d2121c9d86f77f1550fa3f52387a4e1a05", diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml index 92e3820362..e12a282f3f 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml @@ -1031,7 +1031,7 @@ spec: specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`. - More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/' + More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/ type: string enum: - legacy diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-namespace.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-namespace.yaml index deebf3d345..8fb1beb884 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-namespace.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-namespace.yaml @@ -4,7 +4,7 @@ metadata: name: openshift-operator-lifecycle-manager labels: pod-security.kubernetes.io/enforce: restricted - pod-security.kubernetes.io/enforce-version: "v1.24" + pod-security.kubernetes.io/enforce-version: latest openshift.io/scc: "" openshift.io/cluster-monitoring: "true" annotations: @@ -21,7 +21,7 @@ metadata: name: openshift-operators labels: pod-security.kubernetes.io/enforce: privileged - pod-security.kubernetes.io/enforce-version: "v1.24" + pod-security.kubernetes.io/enforce-version: latest openshift.io/scc: "" annotations: openshift.io/node-selector: "" diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index b0a378e3b4..c5ed1d0d0b 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:90df7383d1f2f028744bd66dc366ba9378558530dae3afd9eddaf155e62abc89 + digest: sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:09e6d565a37036fed6cb9d151528067d89f0e99c0c2fe8b64a7528e504604e76 + digest: sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09e6d565a37036fed6cb9d151528067d89f0e99c0c2fe8b64a7528e504604e76 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90df7383d1f2f028744bd66dc366ba9378558530dae3afd9eddaf155e62abc89 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index b5e089ebe4..424ee560ac 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-03-17-210236" + "base": "4.19.0-0.nightly-arm64-2025-03-19-200021" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea4a6155d39da15f5053c2e475e895caadac7f940a29d5d66a94dace35d12806", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 7e61d90d76..42ad267c3d 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.19.0-0.nightly-2025-03-14-061055" + "base": "4.19.0-0.nightly-2025-03-19-160541" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90df7383d1f2f028744bd66dc366ba9378558530dae3afd9eddaf155e62abc89", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09e6d565a37036fed6cb9d151528067d89f0e99c0c2fe8b64a7528e504604e76", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 56d2e3725b..0a16c80d09 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-03-17-210236" + "base": "4.19.0-0.nightly-arm64-2025-03-19-200021" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b02f3e129c9405662d7a303082f6cc401dd5be3227a4582895d5dd7a37085a17", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75f1ed729aca82c2d32b00451a98fa68d1d4910fad968e310a50647eec8aa15b", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf218c10be35ac48a7b4dc7f7fae559cdda361e96de69a18f871ed58e28e60a7", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2aa87c7c7bef5e693ee0af9b8dbdabd38d00d5f7c6fdb7c4a3f9969a28fa73d", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb4c268f35110e2d323eea64022ff0d0697c1a54a4a649c4966144ceeec86362", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a8e25fe8ff56df318f7589c4747a35580ac0c80fcf18e8625d93bfacbc0d5f0", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a6158a564cc28fbed19620ae77b8fa4f0f5cae96bd475143f5293658e8cee9a", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a77322350b3a5888b1ad6665ef94a3b477beeedb628ae722b7852ff581b834d" diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 7d083bb423..ab238241a4 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-2025-03-14-061055" + "base": "4.19.0-0.nightly-2025-03-19-160541" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17638aea252a1fc15ba23f730fd4b361fe438bc24379e791893d845f7c255315", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd8e4e830b2c617da30666d5767803668de904c13c09e22ea9e1d1f747461a29", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5598bb4202a4832e6702a662921bee1ecbc61b47d5a4d686cad64ebe46966d60", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c45696e4d2ede60885d3c960e9c24dcc45b39e031b65aa933ea6a069be78bda8", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8f30bbc56fe0685614442abba53b41fc2d9cabb286f796db3b7941e9a40629b", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b218d15219fabf2a83c934fa4a6bf3ce41ebbf229355216faf3d69e31512216c", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a403e7e23287b4dc77ce28895e31018ac1cde5e4040c6caddcfeea1c208e51d0" From 7649ce24634a825052edef390abb874531ab8e48 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Mar 2025 04:23:10 +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 ece5dc82e0..4947397256 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=32 KUBE_GIT_VERSION=v1.32.2 -KUBE_GIT_COMMIT=d6f2dd28529e5ecc8cdffaf443253f74382c2b60 +KUBE_GIT_COMMIT=2ed17b46fa89c438d5983268bdc352ba8bd9b4bb KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index bc7ce72aa3..a637f9b9f0 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-17-210236 +OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-19-200021 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index cf72f219ac..2ba7f33e6a 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2025-03-14-061055 +OCP_VERSION := 4.19.0-0.nightly-2025-03-19-160541