diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index bdee1f248f..962306d9f7 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=28 KUBE_GIT_VERSION=v1.28.7 -KUBE_GIT_COMMIT=6e2789bbd5893851c8bc4423e0090cd71b64f436 +KUBE_GIT_COMMIT=f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 0bd88cf56c..54457201aa 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-03-12-005936 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-03-20-183729 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index aa9cc3538a..077c3dbf6f 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-03-12-010512 +OCP_VERSION := 4.15.0-0.nightly-2024-03-20-032212 diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index df3af036c2..fd9a47826f 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.15.0-0.nightly-arm64-2024-03-12-005936" + "base": "4.15.0-0.nightly-arm64-2024-03-20-183729" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46f322afa57bde46e731cd5f7b8335a497e66d447a9388355c3fb7e30ae6fea5", 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 b03581fd92..86c30347d9 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-2024-03-12-010512" + "base": "4.15.0-0.nightly-2024-03-20-032212" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83a4fd2adf166b2b3a1700de6fcb9ba32a6dba7ed7655057e68ae65501e488eb", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index e874f42e7f..cccb51442d 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-03-12-005936" + "base": "4.15.0-0.nightly-arm64-2024-03-20-183729" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56b21fd2b9cac6c3b6af0770f6fc443c7469ded2d4721f75d0ede64375ea55ba", @@ -9,7 +9,7 @@ "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8167776e4ac9b9a1169006a215d3d05ad757d26418dd93b4ce45fcde577e3ca", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3eaefc3d0fb79b8b259cb8f886c499d21fb795fbf17de0baed30a6a86a469799", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d152617edada2d9b9ee5e5f38ac32b44c25fd49932678d6d4c3c18d63242485f", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b5c349f4989b6e7ae086746ead9129c48af054facce65d287fccb4daafd644e", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:943e9032d73a6582c2e83f2caf5070342de0baea5dd46b25543da6fb08c21c9b", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index c2aa3ef568..6660230297 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-2024-03-12-010512" + "base": "4.15.0-0.nightly-2024-03-20-032212" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b241e835fdc4038d1f65b0db53b164fa2f25574ab06e794aa19808d2f61de298", @@ -9,7 +9,7 @@ "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b80e10f210ad89505ef974a5060b6f25f89a40907b5cd0eafb9695ca3b78e9fc", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2f1c8b4baba2b369d08bc7bf14e463c3dbf3d848fd143e1f572f142f6835ef1", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e69ccab31cccae506a7ed7518026b0481ca039d748cb1b240556a3d1acfcdb35", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bbe0ca7201e2716788c995d2bb89a2ed4b9bd6fbabf549f3452b1f0f638d6d3", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b38c14341015df2db595538f4933ed94fd9f6c283dfc9c5dae7540d9d9ae59ed", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", diff --git a/etcd/go.mod b/etcd/go.mod index f9fb33f6d9..5eac380788 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -95,12 +95,12 @@ require ( github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect github.com/xlab/treeprint v1.2.0 // indirect go.etcd.io/bbolt v1.3.8 // indirect - go.etcd.io/etcd/api/v3 v3.5.11 - go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect - go.etcd.io/etcd/client/v2 v2.305.11 // indirect - go.etcd.io/etcd/client/v3 v3.5.11 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.11 // indirect - go.etcd.io/etcd/raft/v3 v3.5.11 // indirect + go.etcd.io/etcd/api/v3 v3.5.12 + go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect + go.etcd.io/etcd/client/v2 v2.305.12 // indirect + go.etcd.io/etcd/client/v3 v3.5.12 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect + go.etcd.io/etcd/raft/v3 v3.5.12 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/otel v1.20.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect @@ -112,7 +112,7 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.19.0 // indirect - golang.org/x/crypto v0.16.0 // indirect + golang.org/x/crypto v0.17.0 // indirect golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.11.0 // indirect golang.org/x/sys v0.15.0 // indirect @@ -139,41 +139,41 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240109145625-5acb4f3078ad // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240109145625-5acb4f3078ad // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index ed78db4202..a28784f362 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -176,30 +176,30 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/openshift/build-machinery-go v0.0.0-20230824093055-6a18da01283c h1:H5k87xq6hGgR1YCF/8hLv3j5jWd64Eh3ZhqF9WUJ15Q= github.com/openshift/build-machinery-go v0.0.0-20230824093055-6a18da01283c/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad h1:JvFvgWxVcbv5IiTFyu6ghs1s30RdSD4E0kWwGuew4eU= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad h1:QSaS9CvVpXtZnDqOT/1/1X9awypBHREsgM3YSitWR38= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad h1:+xaoVrpLz/2gjYExAkE4YzZFvKzdKJ/TytEd5Ml2lx8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad/go.mod h1:a6xQUEqFJ8vztO1agJh/KQKOMfFI8og52ZconzcDJwE= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad h1:6ooPy1ap7+vC4nhnPm4BtshTcu+98lR/UpnQ+nostVs= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad/go.mod h1:bLfwo6YEgpOAMBZJsZg5AiSS+mxNTRJi15Dvp9kKW68= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240109145625-5acb4f3078ad h1:979aGDFSRbhZUHKqqfjXhYKujt7fwW4CP7qEPy9L8VQ= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240109145625-5acb4f3078ad/go.mod h1:Tp7kZJVtWJWLiMCPrgkimiOB5ZYi8YM93onQihpG724= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240109145625-5acb4f3078ad h1:ew0yUV57P2Hj1Bz/W1ywoRfk27pV/GEY9qcFgnnPzSg= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240109145625-5acb4f3078ad/go.mod h1:CS0+TwcuRlhg1I5CpA3YlisOcoqJB1h1GMRgje75uDs= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589 h1:LcWBPl2XELY6YDY8R3Ls9GY3maNZKbxI2KG80rNEBbU= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589/go.mod h1:DRP8A222b/XLpbDvUet0Yds8/YMkQWJFT0P9MF3NNhM= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589 h1:yEQW7AnYB4q1/LcOLjoldNgVHIHaaAaLzxqL6ynXbI4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589/go.mod h1:Ib6CiElBkTHWNIAeJj9Jh7uo/JVOR0heaoQU1s80xB8= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589 h1:9w7PvrlSpM4GHKEAsTLGa01+SZZHnoLfpK2k2uEvj2g= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589/go.mod h1:1gqDGI2YTgUWuNTftSne1JHhAbfAV/2m8t9IKU1hDgs= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589 h1:RU0zK1AzJwKMRlGhMva+YK7P/UsZFLE1aDmZMcmQESM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589/go.mod h1:ue4IcVGWr6Dh8jVBxvQug2m2XluUQOImfq5yBLgNeVg= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589 h1:hFUIj02qmOmbPqoS6JgUNCpdNGDbF9y8l5diYJeEeMs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589/go.mod h1:YNueCR9ifApFso0NKdTGcALRLOa+qk+xqAOCodutCKk= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240307164320-6e2789bbd589 h1:1E2wOLS/RpkH9kxeL6K7n71tfZZnlujI2gvZ4Mk7y/M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240307164320-6e2789bbd589/go.mod h1:8gjHlvJ46xXZFj5TaFQ3CNLaVEFlnrTKVDHVRyVebrE= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:zdd9Jt2yalNhYR8knTolghXg4F9Dunjs7229KIl4zyU= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:2c68ooDs1tI78FHtzWXidIEE8ymnkJctYEheSYVSvZQ= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:A/hePFQbZeTcaSAtSu8ifOIX/KdDT9W4aifIP/FpTs0= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:6uKoN8ZL/Pi16FqgXK2so2XWhpYtc8lUhNMRxY8zKmQ= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:UVwg/QIMoJncyeb/YxvJBJCE/NEwtHWashqc8A1nj/M= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:lkgJ/uV707D9jJcHRIvDqdXRRhUsgccngCvOsnxjs/w= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:ERQuZVe79PI6vcC3DlKBukDCLja/L7YMu29B74Iwj4U= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:m5FVLkrX5W2DGXYT0OhEri9SCAbT89Mi2hk5VKFh5kc= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:axB0oCjMy+cemo5290/CutIjoxlfA6KVYKD1w0uue10= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a h1:8/EgY4YViLKURX2vVfC5dDBg0FFjO6SZFoX4ijd2Wmg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:DRP8A222b/XLpbDvUet0Yds8/YMkQWJFT0P9MF3NNhM= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a h1:CwrPZgtmwGeLHF32jJOwmG0cFjqD5Dr2QOzQJYlGp9c= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:Ib6CiElBkTHWNIAeJj9Jh7uo/JVOR0heaoQU1s80xB8= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a h1:+6eq3LVIzIURqvQzN0FAU3w0Vqgfm1qQEbSsGlsA6Qo= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:1gqDGI2YTgUWuNTftSne1JHhAbfAV/2m8t9IKU1hDgs= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a h1:H0CpTiK5h7JuAE2AvDHuBYmbnMgqvejPbWBBjQnHvJY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:ue4IcVGWr6Dh8jVBxvQug2m2XluUQOImfq5yBLgNeVg= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a h1:HM1qhj78fV7z/zBfKRV73oGQarIIrlkKrFTWDsqnfYs= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:YNueCR9ifApFso0NKdTGcALRLOa+qk+xqAOCodutCKk= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a h1:999/miHK2sSK6R5KjnEx/jmP8W7oX/pKbTHzobsu4iM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:8gjHlvJ46xXZFj5TaFQ3CNLaVEFlnrTKVDHVRyVebrE= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e h1:WgaylNSIB4uff7ieewaqIiEG3mP6jSMER8LCkoOEkys= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= @@ -256,8 +256,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.etcd.io/etcd/client/v2 v2.305.11 h1:ZqdKLNJnWpE3bUaaj3XZ5xWyCi+7Vspgk9E0hlIBguE= -go.etcd.io/etcd/client/v2 v2.305.11/go.mod h1:vX2j5tMynwOateY6BfVmLol3gYOIkbhqjs/BqRsdIOw= +go.etcd.io/etcd/client/v2 v2.305.12 h1:0m4ovXYo1CHaA/Mp3X/Fak5sRNIWf01wk/X1/G3sGKI= +go.etcd.io/etcd/client/v2 v2.305.12/go.mod h1:aQ/yhsxMu+Oht1FOupSr60oBvcS9cKXHrzBpDsPTf9E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= @@ -292,8 +292,8 @@ go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= diff --git a/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go b/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go index 52be9f964f..4858a08bfe 100644 --- a/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go +++ b/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "3.0.0" - Version = "3.5.11" + Version = "3.5.12" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/fileutil/purge.go b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/fileutil/purge.go index f4492009d6..b314e068fe 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/fileutil/purge.go +++ b/etcd/vendor/go.etcd.io/etcd/client/pkg/v3/fileutil/purge.go @@ -25,18 +25,24 @@ import ( ) func PurgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}) <-chan error { - return purgeFile(lg, dirname, suffix, max, interval, stop, nil, nil) + return purgeFile(lg, dirname, suffix, max, interval, stop, nil, nil, true) } func PurgeFileWithDoneNotify(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}) (<-chan struct{}, <-chan error) { doneC := make(chan struct{}) - errC := purgeFile(lg, dirname, suffix, max, interval, stop, nil, doneC) + errC := purgeFile(lg, dirname, suffix, max, interval, stop, nil, doneC, true) + return doneC, errC +} + +func PurgeFileWithoutFlock(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}) (<-chan struct{}, <-chan error) { + doneC := make(chan struct{}) + errC := purgeFile(lg, dirname, suffix, max, interval, stop, nil, doneC, false) return doneC, errC } // purgeFile is the internal implementation for PurgeFile which can post purged files to purgec if non-nil. // if donec is non-nil, the function closes it to notify its exit. -func purgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}, purgec chan<- string, donec chan<- struct{}) <-chan error { +func purgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}, purgec chan<- string, donec chan<- struct{}, flock bool) <-chan error { if lg == nil { lg = zap.NewNop() } @@ -67,20 +73,25 @@ func purgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval fnames = newfnames for len(newfnames) > int(max) { f := filepath.Join(dirname, newfnames[0]) - l, err := TryLockFile(f, os.O_WRONLY, PrivateFileMode) - if err != nil { - lg.Warn("failed to lock file", zap.String("path", f), zap.Error(err)) - break + var l *LockedFile + if flock { + l, err = TryLockFile(f, os.O_WRONLY, PrivateFileMode) + if err != nil { + lg.Warn("failed to lock file", zap.String("path", f), zap.Error(err)) + break + } } if err = os.Remove(f); err != nil { lg.Error("failed to remove file", zap.String("path", f), zap.Error(err)) errC <- err return } - if err = l.Close(); err != nil { - lg.Error("failed to unlock/close", zap.String("path", l.Name()), zap.Error(err)) - errC <- err - return + if flock { + if err = l.Close(); err != nil { + lg.Error("failed to unlock/close", zap.String("path", l.Name()), zap.Error(err)) + errC <- err + return + } } lg.Info("purged", zap.String("path", f)) newfnames = newfnames[1:] diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go index 99900326c4..d514b1bfec 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go @@ -535,6 +535,7 @@ func configurePeerListeners(cfg *Config) (peers []*peerListener, err error) { transport.WithTimeout(rafthttp.ConnReadTimeout, rafthttp.ConnWriteTimeout), ) if err != nil { + cfg.logger.Error("creating peer listener failed", zap.Error(err)) return nil, err } // once serve, overwrite with 'http.Server.Shutdown' diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go index e81f195fc6..0095b6ec5c 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go @@ -35,6 +35,7 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/prometheus/client_golang/prometheus" "go.etcd.io/etcd/server/v3/config" + "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" pb "go.etcd.io/etcd/api/v3/etcdserverpb" @@ -392,7 +393,7 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) { } defer func() { - if err != nil { + if be != nil && err != nil { be.Close() } }() @@ -488,13 +489,14 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) { } // Find a snapshot to start/restart a raft node - walSnaps, err := wal.ValidSnapshotEntries(cfg.Logger, cfg.WALDir()) + var walSnaps []walpb.Snapshot + walSnaps, err = wal.ValidSnapshotEntries(cfg.Logger, cfg.WALDir()) if err != nil { return nil, err } // snapshot files can be orphaned if etcd crashes after writing them but before writing the corresponding // wal log entries - snapshot, err := ss.LoadNewestAvailable(walSnaps) + snapshot, err = ss.LoadNewestAvailable(walSnaps) if err != nil && err != snap.ErrNoSnapshot { return nil, err } @@ -882,8 +884,8 @@ func (s *EtcdServer) purgeFile() { var dberrc, serrc, werrc <-chan error var dbdonec, sdonec, wdonec <-chan struct{} if s.Cfg.MaxSnapFiles > 0 { - dbdonec, dberrc = fileutil.PurgeFileWithDoneNotify(lg, s.Cfg.SnapDir(), "snap.db", s.Cfg.MaxSnapFiles, purgeFileInterval, s.stopping) - sdonec, serrc = fileutil.PurgeFileWithDoneNotify(lg, s.Cfg.SnapDir(), "snap", s.Cfg.MaxSnapFiles, purgeFileInterval, s.stopping) + dbdonec, dberrc = fileutil.PurgeFileWithoutFlock(lg, s.Cfg.SnapDir(), "snap.db", s.Cfg.MaxSnapFiles, purgeFileInterval, s.stopping) + sdonec, serrc = fileutil.PurgeFileWithoutFlock(lg, s.Cfg.SnapDir(), "snap", s.Cfg.MaxSnapFiles, purgeFileInterval, s.stopping) } if s.Cfg.MaxWALFiles > 0 { wdonec, werrc = fileutil.PurgeFileWithDoneNotify(lg, s.Cfg.WALDir(), "wal", s.Cfg.MaxWALFiles, purgeFileInterval, s.stopping) @@ -2161,6 +2163,7 @@ func (s *EtcdServer) apply( zap.Stringer("type", e.Type)) switch e.Type { case raftpb.EntryNormal: + // gofail: var beforeApplyOneEntryNormal struct{} s.applyEntryNormal(&e) s.setAppliedIndex(e.Index) s.setTerm(e.Term) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/backend/batch_tx.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/backend/batch_tx.go index 9c025d79e1..2d5d3eaf4a 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/backend/batch_tx.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/backend/batch_tx.go @@ -289,7 +289,8 @@ func (t *batchTx) commit(stop bool) { type batchTxBuffered struct { batchTx - buf txWriteBuffer + buf txWriteBuffer + pendingDeleteOperations int } func newBatchTxBuffered(backend *backend) *batchTxBuffered { @@ -307,9 +308,30 @@ func newBatchTxBuffered(backend *backend) *batchTxBuffered { func (t *batchTxBuffered) Unlock() { if t.pending != 0 { t.backend.readTx.Lock() // blocks txReadBuffer for writing. + // gofail: var beforeWritebackBuf struct{} t.buf.writeback(&t.backend.readTx.buf) t.backend.readTx.Unlock() - if t.pending >= t.backend.batchLimit { + // We commit the transaction when the number of pending operations + // reaches the configured limit(batchLimit) to prevent it from + // becoming excessively large. + // + // But we also need to commit the transaction immediately if there + // is any pending deleting operation, otherwise etcd might run into + // a situation that it haven't finished committing the data into backend + // storage (note: etcd periodically commits the bbolt transactions + // instead of on each request) when it applies next request. Accordingly, + // etcd may still read the stale data from bbolt when processing next + // request. So it breaks the linearizability. + // + // Note we don't need to commit the transaction for put requests if + // it doesn't exceed the batch limit, because there is a buffer on top + // of the bbolt. Each time when etcd reads data from backend storage, + // it will read data from both bbolt and the buffer. But there is no + // such a buffer for delete requests. + // + // Please also refer to + // https://github.com/etcd-io/etcd/pull/17119#issuecomment-1857547158 + if t.pending >= t.backend.batchLimit || t.pendingDeleteOperations > 0 { t.commit(false) } } @@ -352,6 +374,7 @@ func (t *batchTxBuffered) unsafeCommit(stop bool) { } t.batchTx.commit(stop) + t.pendingDeleteOperations = 0 if !stop { t.backend.readTx.tx = t.backend.begin(false) @@ -367,3 +390,13 @@ func (t *batchTxBuffered) UnsafeSeqPut(bucket Bucket, key []byte, value []byte) t.batchTx.UnsafeSeqPut(bucket, key, value) t.buf.putSeq(bucket, key, value) } + +func (t *batchTxBuffered) UnsafeDelete(bucketType Bucket, key []byte) { + t.batchTx.UnsafeDelete(bucketType, key) + t.pendingDeleteOperations++ +} + +func (t *batchTxBuffered) UnsafeDeleteBucket(bucket Bucket) { + t.batchTx.UnsafeDeleteBucket(bucket) + t.pendingDeleteOperations++ +} diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go index a1028e122f..393f9d5661 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go @@ -20,6 +20,7 @@ import ( "time" "go.etcd.io/etcd/server/v3/mvcc/buckets" + humanize "github.com/dustin/go-humanize" "go.uber.org/zap" ) @@ -63,11 +64,16 @@ func (s *store) scheduleCompaction(compactMainRev, prevCompactRev int64) (KeyVal tx.UnsafePut(buckets.Meta, finishedCompactKeyName, rbytes) tx.Unlock() hash := h.Hash() + size, sizeInUse := s.b.Size(), s.b.SizeInUse() s.lg.Info( "finished scheduled compaction", zap.Int64("compact-revision", compactMainRev), zap.Duration("took", time.Since(totalStart)), zap.Uint32("hash", hash.Hash), + zap.Int64("current-db-size-bytes", size), + zap.String("current-db-size", humanize.Bytes(uint64(size))), + zap.Int64("current-db-size-in-use-bytes", sizeInUse), + zap.String("current-db-size-in-use", humanize.Bytes(uint64(sizeInUse))), ) return hash, nil } diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 1480979924..e112a32b1b 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -253,7 +253,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.8 ## explicit; go 1.17 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.11 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# go.etcd.io/etcd/api/v3 v3.5.12 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b ## explicit; go 1.20 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -262,7 +262,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.11 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# go.etcd.io/etcd/client/pkg/v3 v3.5.12 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b ## explicit; go 1.20 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -272,17 +272,17 @@ go.etcd.io/etcd/client/pkg/v3/systemd go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types -# go.etcd.io/etcd/client/v2 v2.305.11 +# go.etcd.io/etcd/client/v2 v2.305.12 ## explicit; go 1.20 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.11 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# go.etcd.io/etcd/client/v3 v3.5.12 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b ## explicit; go 1.20 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.11 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# go.etcd.io/etcd/pkg/v3 v3.5.12 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b ## explicit; go 1.20 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -299,14 +299,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.11 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# go.etcd.io/etcd/raft/v3 v3.5.12 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240314173502-8aecb841e30b ## explicit; go 1.20 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.9 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# go.etcd.io/etcd/server/v3 v3.5.9 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240314173502-8aecb841e30b ## explicit; go 1.20 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -424,7 +424,7 @@ go.uber.org/zap/internal/color go.uber.org/zap/internal/exit go.uber.org/zap/zapcore go.uber.org/zap/zapgrpc -# golang.org/x/crypto v0.16.0 +# golang.org/x/crypto v0.17.0 ## explicit; go 1.18 golang.org/x/crypto/bcrypt golang.org/x/crypto/blowfish @@ -596,7 +596,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -653,7 +653,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -706,13 +706,13 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/client-go v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -858,7 +858,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -895,7 +895,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-20240307164320-6e2789bbd589 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1017,39 +1017,39 @@ sigs.k8s.io/yaml # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240109145625-5acb4f3078ad -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240109145625-5acb4f3078ad -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240307164320-6e2789bbd589 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240314173502-8aecb841e30b +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240314173502-8aecb841e30b +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240315201002-f1b5f6c8166a diff --git a/go.mod b/go.mod index c3bce26ce7..53e3716c1b 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 github.com/vishvananda/netlink v1.1.0 - go.etcd.io/etcd/client/pkg/v3 v3.5.11 + go.etcd.io/etcd/client/pkg/v3 v3.5.12 go.etcd.io/etcd/client/v3 v3.5.9 golang.org/x/sys v0.15.0 gopkg.in/yaml.v3 v3.0.1 @@ -172,7 +172,7 @@ require ( github.com/vishvananda/netns v0.0.4 // indirect github.com/vmware/govmomi v0.30.6 // indirect github.com/xlab/treeprint v1.2.0 // indirect - go.etcd.io/etcd/api/v3 v3.5.11 // indirect + go.etcd.io/etcd/api/v3 v3.5.12 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.35.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect @@ -237,44 +237,44 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240307164320-6e2789bbd589 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240307164320-6e2789bbd589 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240307164320-6e2789bbd589 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240307164320-6e2789bbd589 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240315201002-f1b5f6c8166a // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240315201002-f1b5f6c8166a // from kubernetes ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 // 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-20240307164320-6e2789bbd589 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240315201002-f1b5f6c8166a // staging kubernetes diff --git a/go.sum b/go.sum index 157e9cdc7f..fd182d2675 100644 --- a/go.sum +++ b/go.sum @@ -525,66 +525,66 @@ github.com/openshift/client-go v0.0.0-20231018150822-6e226e2825a6 h1:3wgEtuYbZ76 github.com/openshift/client-go v0.0.0-20231018150822-6e226e2825a6/go.mod h1:Fkn7VRruQ4KwNGeaUmi9QgqLk/d7U6cj+UiP8b+0hiQ= github.com/openshift/cluster-policy-controller v0.0.0-20231201224824-cc48f3152213 h1:oV0O1oVn+VrLfbPmptULih4O6kXP33hYF/cL4OWR61w= github.com/openshift/cluster-policy-controller v0.0.0-20231201224824-cc48f3152213/go.mod h1:u9xZD1sX2QlaItGQca+2cB10z0yL+BZ+KscZBj+NUZs= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad h1:JvFvgWxVcbv5IiTFyu6ghs1s30RdSD4E0kWwGuew4eU= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad h1:QSaS9CvVpXtZnDqOT/1/1X9awypBHREsgM3YSitWR38= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad h1:+xaoVrpLz/2gjYExAkE4YzZFvKzdKJ/TytEd5Ml2lx8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad/go.mod h1:a6xQUEqFJ8vztO1agJh/KQKOMfFI8og52ZconzcDJwE= -github.com/openshift/kubernetes v0.0.0-20240307164320-6e2789bbd589 h1:xlK63hiwcQB1SoeOrol1da+adOzBJns2rfMBdpJtsTU= -github.com/openshift/kubernetes v0.0.0-20240307164320-6e2789bbd589/go.mod h1:fAtjhCDUgFE4g2d64Zk6KBV4eWTYxj73SexwN9HPqYA= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:zdd9Jt2yalNhYR8knTolghXg4F9Dunjs7229KIl4zyU= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:2c68ooDs1tI78FHtzWXidIEE8ymnkJctYEheSYVSvZQ= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:A/hePFQbZeTcaSAtSu8ifOIX/KdDT9W4aifIP/FpTs0= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= +github.com/openshift/kubernetes v0.0.0-20240315201002-f1b5f6c8166a h1:502L84w/pK3QQSO4SwAR7G8XDOHTuC461YhMru4t0Yg= +github.com/openshift/kubernetes v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:fAtjhCDUgFE4g2d64Zk6KBV4eWTYxj73SexwN9HPqYA= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 h1:dFt4v5LeBJ4Ohf9oaZ5tce37PPGAeZ4sdbDIeW3R2qo= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8/go.mod h1:nc9vh1Bd8i4OnTM+uoZeFbRaJJ9uOs1AzaN69SdVnd8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589 h1:LcWBPl2XELY6YDY8R3Ls9GY3maNZKbxI2KG80rNEBbU= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589/go.mod h1:DRP8A222b/XLpbDvUet0Yds8/YMkQWJFT0P9MF3NNhM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240307164320-6e2789bbd589 h1:eAFRHTEqmQR0Avq5pAr27MMwncRxlg+YTx6McrMAm3Q= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240307164320-6e2789bbd589/go.mod h1:6HB5hvDqTJAiqM8scUsp4VdF8PkcLu7PvYMyeBI04Ek= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589 h1:yEQW7AnYB4q1/LcOLjoldNgVHIHaaAaLzxqL6ynXbI4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589/go.mod h1:Ib6CiElBkTHWNIAeJj9Jh7uo/JVOR0heaoQU1s80xB8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240307164320-6e2789bbd589 h1:AzpHt/x1eiug6ZaJoMUxNGaBDV4EUadod/lpkdXrhMA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240307164320-6e2789bbd589/go.mod h1:pWnFDEu4TQb66XyKTnWYFrRXbXjISdPS2oP25UrG3po= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589 h1:9w7PvrlSpM4GHKEAsTLGa01+SZZHnoLfpK2k2uEvj2g= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589/go.mod h1:1gqDGI2YTgUWuNTftSne1JHhAbfAV/2m8t9IKU1hDgs= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589 h1:RU0zK1AzJwKMRlGhMva+YK7P/UsZFLE1aDmZMcmQESM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589/go.mod h1:ue4IcVGWr6Dh8jVBxvQug2m2XluUQOImfq5yBLgNeVg= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240307164320-6e2789bbd589 h1:eytH4ckUwvzu4RplhQHbtQhdKbjCvOQc/sz/1NB9RWE= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240307164320-6e2789bbd589/go.mod h1:BSKYuGTedLPwhFYQbCzwgVL4g6ezh9jKv1G81BtI/0E= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240307164320-6e2789bbd589 h1:nATA5srhsqG6nAma80tqGpFybMVOQxCk66CKbn6HguI= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240307164320-6e2789bbd589/go.mod h1:GKy54pPNX+rFG7wkueBJiP3EDLDHFP2haGh+qK1p+0E= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589 h1:hFUIj02qmOmbPqoS6JgUNCpdNGDbF9y8l5diYJeEeMs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589/go.mod h1:YNueCR9ifApFso0NKdTGcALRLOa+qk+xqAOCodutCKk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240307164320-6e2789bbd589 h1:B1jUvzOHObnjt4JyuRZHA8bvz1vTaVaogENRHQmoguw= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240307164320-6e2789bbd589/go.mod h1:3kbAyIQ1sK1L4DaBkTZ8TNS9sGQOfr6D3kuX8u4z5vg= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240307164320-6e2789bbd589 h1:2xMHS/vl9rL0nuuxucKYbFx9QntCuWvPy044Y1gXpNM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240307164320-6e2789bbd589/go.mod h1:HmFAIZtigP9Yiz5v/a4JvlpbUUjs1AaCnZC7tt2ff1Y= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240307164320-6e2789bbd589 h1:LzDzQ86JL3+ZjqzeBuF2GzRRFDx0NxmnN1+Kh1np/bo= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240307164320-6e2789bbd589/go.mod h1:0+ySIyuiKp/Qj/HIRGNZCJaB4UPRUtmH+8NryP6LTVM= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240307164320-6e2789bbd589 h1:tSJbzSqrzZGIrw8dADB7Ao0nf/tVdq+kXAIB1LTXVLY= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240307164320-6e2789bbd589/go.mod h1:awut6J2Cg5yY0nPP/LGUvvaXmAxbK2y7bRG+4s8kyBg= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240307164320-6e2789bbd589 h1:WZiUQZQMJLNLlTIYHC7bMBT4in13FRm2gbIOqf0lYXg= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240307164320-6e2789bbd589/go.mod h1:V2icFJColTSvrtwXoIpjdq7QWcSqjVoINuh/O376T+Q= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240307164320-6e2789bbd589 h1:mfy0eZTtyX8eiq4XyEPWQF1aYBqHfO46TQNVye7O9P8= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240307164320-6e2789bbd589/go.mod h1:hFPvwBBPg0qlx+NjPK/0YhPPuE2594mnZe/IaSLeFzA= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240307164320-6e2789bbd589 h1:9mk90gweeYbU7zacriayyn7i8amZbCcAzSK+vv7hUnA= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240307164320-6e2789bbd589/go.mod h1:rPbtgm6akVLj+cY9k9iDKHhMirhdNGQB8xlEmdZWru8= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240307164320-6e2789bbd589 h1:vlPw9NRD7WUj1zMXtWx4ky/41DAI5Qin+DuDT0CIzG8= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240307164320-6e2789bbd589/go.mod h1:y6BE//KdZs1kATCh4Y5XlIxdMvEU1SyDUzofHvk7ZHQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240307164320-6e2789bbd589 h1:6vJ/hn/eqPLffLl+6g5mmjRnDCrEb3zzQH8mvqIFn1o= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240307164320-6e2789bbd589/go.mod h1:W1aieZe6y/sSKIvn7yPNwC10hHnutBqXGBXPDtqmvTI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240307164320-6e2789bbd589 h1:Zr+2RGB3cfurPbeL5KUApst5diUu2TOK2tO+pWhtgao= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240307164320-6e2789bbd589/go.mod h1:sAUo3vMtMitR8oekpiZ11VOvddzkXW3ePKWF4h6U6Wg= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240307164320-6e2789bbd589 h1:1E2wOLS/RpkH9kxeL6K7n71tfZZnlujI2gvZ4Mk7y/M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240307164320-6e2789bbd589/go.mod h1:8gjHlvJ46xXZFj5TaFQ3CNLaVEFlnrTKVDHVRyVebrE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240307164320-6e2789bbd589 h1:X2/QWBzNw9SrJKyuswi5ejJiQLIcALbXarlzWCztAo4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240307164320-6e2789bbd589/go.mod h1:IXu3OYCNkpyfmVN7aPQ1NGJWsNA8U16cunAzsTT+150= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240307164320-6e2789bbd589 h1:bPMrLRzpg1KxUKUfFAsn2vfqtHWaT2Hf+09RYoc4siw= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240307164320-6e2789bbd589/go.mod h1:vlEoTLKFmMaBhLYaaj/94t2VmopHDzyRpsaeeEffdYI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240307164320-6e2789bbd589 h1:2TPLnbvQDCBDHJfBSkRnzSiAwkavGwrz3N2FRkL6kSk= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240307164320-6e2789bbd589/go.mod h1:dOflDLnzoDrCX0jkjl2+UmAlzKAMMTD3i3CRtbwGh/w= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240307164320-6e2789bbd589 h1:PR5Xrvx+5wNU01hGL3Fb/QL2HuOolDqZpjEwe8EtArs= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240307164320-6e2789bbd589/go.mod h1:RM2SGu9Hi4rZtX4j7MH4fz75mOtl5d9pGyC4NahYrHo= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240307164320-6e2789bbd589 h1:kND7GAc0HJiM55Pk5hELVg+ZehgBoQ8XoSGtvs7V1f4= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240307164320-6e2789bbd589/go.mod h1:vjSH6LhOFJQeReLtARRLzoT2SJhFs0Q2GEa9nBnIfFA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a h1:8/EgY4YViLKURX2vVfC5dDBg0FFjO6SZFoX4ijd2Wmg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:DRP8A222b/XLpbDvUet0Yds8/YMkQWJFT0P9MF3NNhM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240315201002-f1b5f6c8166a h1:aQnUlUezQZBP9KWjb1e9sL/UL7N4jL2Y9tIPmI1wP+s= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:6HB5hvDqTJAiqM8scUsp4VdF8PkcLu7PvYMyeBI04Ek= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a h1:CwrPZgtmwGeLHF32jJOwmG0cFjqD5Dr2QOzQJYlGp9c= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:Ib6CiElBkTHWNIAeJj9Jh7uo/JVOR0heaoQU1s80xB8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240315201002-f1b5f6c8166a h1:Z8lhcKENFNqEN8mDgDT7gsSZ2MjI4KiIiM5gd19hQGQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:pWnFDEu4TQb66XyKTnWYFrRXbXjISdPS2oP25UrG3po= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a h1:+6eq3LVIzIURqvQzN0FAU3w0Vqgfm1qQEbSsGlsA6Qo= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:1gqDGI2YTgUWuNTftSne1JHhAbfAV/2m8t9IKU1hDgs= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a h1:H0CpTiK5h7JuAE2AvDHuBYmbnMgqvejPbWBBjQnHvJY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:ue4IcVGWr6Dh8jVBxvQug2m2XluUQOImfq5yBLgNeVg= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240315201002-f1b5f6c8166a h1:d8FIdFuhSadimp+RnBuZsxF2SfMwmNNSA8F+q5DFgkg= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:BSKYuGTedLPwhFYQbCzwgVL4g6ezh9jKv1G81BtI/0E= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240315201002-f1b5f6c8166a h1:oXOl5eb+AKU4XjoY3E7jRDqiY3ly/UoKtqlKf0Kr1Co= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:GKy54pPNX+rFG7wkueBJiP3EDLDHFP2haGh+qK1p+0E= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a h1:HM1qhj78fV7z/zBfKRV73oGQarIIrlkKrFTWDsqnfYs= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:YNueCR9ifApFso0NKdTGcALRLOa+qk+xqAOCodutCKk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240315201002-f1b5f6c8166a h1:f3ehA2RrIYBt2Hg+4XtdIO2TKXAgbZY4oK/UavHyF98= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:3kbAyIQ1sK1L4DaBkTZ8TNS9sGQOfr6D3kuX8u4z5vg= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240315201002-f1b5f6c8166a h1:goh9J6GAD4k0Ms45fxwxCLexo7I0RrFhLGA2au6nd8g= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:HmFAIZtigP9Yiz5v/a4JvlpbUUjs1AaCnZC7tt2ff1Y= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240315201002-f1b5f6c8166a h1:jbo1cir6D9JsjbLFEeHRuCUMqAkbr4zhg7k2XNAHHkc= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:0+ySIyuiKp/Qj/HIRGNZCJaB4UPRUtmH+8NryP6LTVM= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240315201002-f1b5f6c8166a h1:eQlaKsmO1NSRMB3NOmqsvsHEJ5jHp9qdx0oS3Y6NU0g= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:awut6J2Cg5yY0nPP/LGUvvaXmAxbK2y7bRG+4s8kyBg= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240315201002-f1b5f6c8166a h1:ukJdWVkj4nTLRAouTYGwgIRwkcHt9yg/XBa23stiJlE= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:V2icFJColTSvrtwXoIpjdq7QWcSqjVoINuh/O376T+Q= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240315201002-f1b5f6c8166a h1:sUJxWk8O72b1ANGf0clMjEavSzt5URSwXqzB91q3Whg= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:hFPvwBBPg0qlx+NjPK/0YhPPuE2594mnZe/IaSLeFzA= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240315201002-f1b5f6c8166a h1:kcwEoqptc9/VW1Ydq6doxNSi2Tp57vy7Ki5nRoaguqM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:rPbtgm6akVLj+cY9k9iDKHhMirhdNGQB8xlEmdZWru8= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240315201002-f1b5f6c8166a h1:hvaDS4sOZf6HYdciSnULTOCvHVH8WSMFbIfhXFrXLu4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:y6BE//KdZs1kATCh4Y5XlIxdMvEU1SyDUzofHvk7ZHQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240315201002-f1b5f6c8166a h1:m2wMCQprWPuoLYyxq7f0Atl8THFpUeK/dzA0qJFVR98= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:W1aieZe6y/sSKIvn7yPNwC10hHnutBqXGBXPDtqmvTI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240315201002-f1b5f6c8166a h1:Vh+TvV89ug/wDOc1WQrTfLTZm7J51sKUG9uLnGD+eO0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:sAUo3vMtMitR8oekpiZ11VOvddzkXW3ePKWF4h6U6Wg= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a h1:999/miHK2sSK6R5KjnEx/jmP8W7oX/pKbTHzobsu4iM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:8gjHlvJ46xXZFj5TaFQ3CNLaVEFlnrTKVDHVRyVebrE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240315201002-f1b5f6c8166a h1:HmDr3uVK1nIIWQ6UOzQvIGWffLo9yhOOugk9YhE6Pl4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:IXu3OYCNkpyfmVN7aPQ1NGJWsNA8U16cunAzsTT+150= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240315201002-f1b5f6c8166a h1:C5r4ED83Wy7CSjGtfN4g7qFGBZYQQaaWu1ggH8nnFyk= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:vlEoTLKFmMaBhLYaaj/94t2VmopHDzyRpsaeeEffdYI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240315201002-f1b5f6c8166a h1:MtO7Pp8NP1LWX/1weWKAB5ZrbdI/4cvkknEZed0L7iQ= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:dOflDLnzoDrCX0jkjl2+UmAlzKAMMTD3i3CRtbwGh/w= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240315201002-f1b5f6c8166a h1:2p0xPgulK0JTChvGDcO0zyTQmsZn/6pC5ZFqod7PpIQ= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:RM2SGu9Hi4rZtX4j7MH4fz75mOtl5d9pGyC4NahYrHo= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240315201002-f1b5f6c8166a h1:Njq0lGTbiKkF+nIgyT3uxs1LFFzg6fGNBljZTiq+ZQY= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240315201002-f1b5f6c8166a/go.mod h1:vjSH6LhOFJQeReLtARRLzoT2SJhFs0Q2GEa9nBnIfFA= github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7 h1:pJLcCSJzdiWCaJ4bAepgnvwMdP33LumbVJyWSW7+3ng= github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7/go.mod h1:jgxNp8aApJnZtECid9SUSr5Bu6DLo8Hfdv1DgFZaYA8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e h1:WgaylNSIB4uff7ieewaqIiEG3mP6jSMER8LCkoOEkys= diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 98dbdd1680..8ff18f39ca 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e69ccab31cccae506a7ed7518026b0481ca039d748cb1b240556a3d1acfcdb35" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bbe0ca7201e2716788c995d2bb89a2ed4b9bd6fbabf549f3452b1f0f638d6d3" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index 44643c53ce..dc18490ec3 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/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:d152617edada2d9b9ee5e5f38ac32b44c25fd49932678d6d4c3c18d63242485f" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b5c349f4989b6e7ae086746ead9129c48af054facce65d287fccb4daafd644e" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 23c067a10a..1c676bc640 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,6 +1,39 @@ -- machine-config-operator embedded-component b693d2ffbac7ddab712901662fabffe2fda81562 to 0a87601533db14d99ab94d921f809586e814e594 - - da7569ad 2024-02-29T17:01:52+01:00 OCPBUGS-22664: Mount /run/nodeip-configuration into coredns containers +- cluster-network-operator embedded-component 4ad3c08b7b9f35224bdad111fc7b0205e0732f93 to f41dbd3ab6c426157b4d58e103f4148913edc531 + - 4873da4 2024-03-08T08:34:54+00:00 Fix managed cluster detection on ARO -- operator-framework-olm embedded-component cb0c5f2728e412f595cceeb11104af206421daec to 59aa935ebbe6948921ea3292603cbdce898e0091 - - 6238f809 2024-03-10T20:16:01-05:00 bump grpc to 1.60.1, reconnect idle connections (#3147) +- etcd embedded-component 5acb4f3078adbea40d050365ac5294229e574c67 to 8aecb841e30bb4ce38de1d270ef5138301de828a + - 6026dab5 2024-01-31T14:35:30+01:00 Merge pull request #215 from openshift-bot/art-consistency-openshift-4.15-ose-etcd + - 7f9d4002 2024-01-31T14:34:51+01:00 DOWNSTREAM : resolve merge conflicts + - e7b3bb6c 2024-01-31T11:32:22+01:00 version: bump up to 3.5.12 + - 8599d48f 2024-01-30T12:02:49+01:00 Bump golang.org/x/crypto to v0.17+ to address CVE-2023-48795 + - 0f494e02 2024-01-25T13:32:03+00:00 test: fix TestHashKVWhenCompacting: ensure all goroutine finished + - 926d0227 2024-01-24T13:50:38+00:00 print error log when creating peer listener failed + - 2c3b6140 2024-01-22T19:10:20+05:30 mvcc: Printing etcd backend database related metrics inside scheduleCompaction function + - 02d55998 2024-01-18T14:38:08-08:00 dependency: update go version to 1.20.13 + - 2d531a30 2024-01-11T13:34:14-08:00 commit bbolt transaction if there is any pending deleting operations + - f219ab44 2024-01-11T13:29:54-08:00 add tests to test tx delete consistency. + - f3a27b37 2024-01-08T15:06:12+01:00 Don't flock snapshot files + - 5f571ba2 2024-01-08T14:55:42+13:00 Backport adding digest for etcd base image. + - 0ac8e50a 2024-01-05T14:46:42+05:30 Add a unit tests and missing flags in etcd help. + - f87048a9 2024-01-02T18:08:20+05:30 Add missing flag in etcd help. + - b075426e 2024-01-01T16:48:59+05:30 Backport testutils.ExecuteUntil to 3.5 branch + - bd587c08 2023-12-29T09:46:58+08:00 member replace e2e test + - d6d263ac 2023-12-20T11:41:54+01:00 Check if be is nil to avoid panic when be is overriden with nil by recoverSnapshotBackend on line 517 + - a2e9dc8c 2023-12-20T11:31:47+01:00 Don't redeclare err and snapshot variable, fixing validation of consistent index and closing database on defer + - cb65c1f0 2023-12-11T09:15:56-08:00 test: enable gofail in release e2e test. + - b8d5e79f 2023-12-07T09:51:39-08:00 [3.5] backport health check e2e tests. + - 795dcedd 2023-12-06T09:13:36-08:00 tests: Extract e2e cluster setup to separate package + +- kubernetes embedded-component 6e2789bbd5893851c8bc4423e0090cd71b64f436 to f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 + - 1d7800c24 2024-03-15T14:48:47+00:00 UPSTREAM: : Set up CEL IP/CIDR library from 4.14 onwards + +- machine-config-operator embedded-component 0a87601533db14d99ab94d921f809586e814e594 to 8437f354d88926efbf447472c640f27cc3764741 + - b2ced58e 2024-03-15T17:40:32+00:00 add preferredduringscheduling annotation to kube-rbac-proxy-crio + - 21700f7c 2024-02-19T16:08:19+00:00 Delete Dockerfile.proxy and openshift-proxy-pull-test.md + +- kubernetes image-amd64 6e2789bbd5893851c8bc4423e0090cd71b64f436 to f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 + - 1d7800c24 2024-03-15T14:48:47+00:00 UPSTREAM: : Set up CEL IP/CIDR library from 4.14 onwards + +- kubernetes image-arm64 6e2789bbd5893851c8bc4423e0090cd71b64f436 to f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 + - 1d7800c24 2024-03-15T14:48:47+00:00 UPSTREAM: : Set up CEL IP/CIDR library from 4.14 onwards diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 4c020f4087..58015c0b7b 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -4,14 +4,14 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 0106cb9 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 9fe0ab100bc6241030bf6ad1fc3f554ad0b0faf1 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 642fb08461913d9352b781693311727da42ffc0a https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e1a1e3a845fd27d2dc8cbd7eb40975505ff294ab -https://github.com/openshift/cluster-network-operator embedded-component 4ad3c08b7b9f35224bdad111fc7b0205e0732f93 +https://github.com/openshift/cluster-network-operator embedded-component f41dbd3ab6c426157b4d58e103f4148913edc531 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f189a00839491e166cd0220afe11d35cdb844754 https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f https://github.com/openshift/csi-external-snapshotter embedded-component 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 -https://github.com/openshift/etcd embedded-component 5acb4f3078adbea40d050365ac5294229e574c67 -https://github.com/openshift/kubernetes embedded-component 6e2789bbd5893851c8bc4423e0090cd71b64f436 +https://github.com/openshift/etcd embedded-component 8aecb841e30bb4ce38de1d270ef5138301de828a +https://github.com/openshift/kubernetes embedded-component f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb -https://github.com/openshift/machine-config-operator embedded-component 0a87601533db14d99ab94d921f809586e814e594 +https://github.com/openshift/machine-config-operator embedded-component 8437f354d88926efbf447472c640f27cc3764741 https://github.com/openshift/openshift-controller-manager embedded-component edbf7353e21a286cac85867ec13d6cf937dd9c33 https://github.com/openshift/operator-framework-olm embedded-component 59aa935ebbe6948921ea3292603cbdce898e0091 https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4 @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 50fa049ccaa48d https://github.com/openshift/router image-amd64 b7001137f832d02d4ed68cba27fe3001ff523fa6 https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 https://github.com/openshift/ovn-kubernetes image-amd64 42b1cc427538a736f8c056171b4de7e6c6a366fb -https://github.com/openshift/kubernetes image-amd64 6e2789bbd5893851c8bc4423e0090cd71b64f436 +https://github.com/openshift/kubernetes image-amd64 f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 https://github.com/openshift/service-ca-operator image-amd64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca https://github.com/openshift/oc image-arm64 d6175ebd387c07d8fd6354b476f6b1092f15ee1d https://github.com/openshift/coredns image-arm64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a @@ -34,5 +34,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 50fa049ccaa48d https://github.com/openshift/router image-arm64 b7001137f832d02d4ed68cba27fe3001ff523fa6 https://github.com/openshift/kube-rbac-proxy image-arm64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 https://github.com/openshift/ovn-kubernetes image-arm64 42b1cc427538a736f8c056171b4de7e6c6a366fb -https://github.com/openshift/kubernetes image-arm64 6e2789bbd5893851c8bc4423e0090cd71b64f436 +https://github.com/openshift/kubernetes image-arm64 f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 https://github.com/openshift/service-ca-operator image-arm64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 66a5820e53..6a1d494ee0 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.15.0-0.nightly-2024-03-12-010512" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-03-12-005936" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-03-20-032212" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-03-20-183729" diff --git a/vendor/go.etcd.io/etcd/api/v3/version/version.go b/vendor/go.etcd.io/etcd/api/v3/version/version.go index 52be9f964f..4858a08bfe 100644 --- a/vendor/go.etcd.io/etcd/api/v3/version/version.go +++ b/vendor/go.etcd.io/etcd/api/v3/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "3.0.0" - Version = "3.5.11" + Version = "3.5.12" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/vendor/go.etcd.io/etcd/client/pkg/v3/fileutil/purge.go b/vendor/go.etcd.io/etcd/client/pkg/v3/fileutil/purge.go index f4492009d6..b314e068fe 100644 --- a/vendor/go.etcd.io/etcd/client/pkg/v3/fileutil/purge.go +++ b/vendor/go.etcd.io/etcd/client/pkg/v3/fileutil/purge.go @@ -25,18 +25,24 @@ import ( ) func PurgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}) <-chan error { - return purgeFile(lg, dirname, suffix, max, interval, stop, nil, nil) + return purgeFile(lg, dirname, suffix, max, interval, stop, nil, nil, true) } func PurgeFileWithDoneNotify(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}) (<-chan struct{}, <-chan error) { doneC := make(chan struct{}) - errC := purgeFile(lg, dirname, suffix, max, interval, stop, nil, doneC) + errC := purgeFile(lg, dirname, suffix, max, interval, stop, nil, doneC, true) + return doneC, errC +} + +func PurgeFileWithoutFlock(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}) (<-chan struct{}, <-chan error) { + doneC := make(chan struct{}) + errC := purgeFile(lg, dirname, suffix, max, interval, stop, nil, doneC, false) return doneC, errC } // purgeFile is the internal implementation for PurgeFile which can post purged files to purgec if non-nil. // if donec is non-nil, the function closes it to notify its exit. -func purgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}, purgec chan<- string, donec chan<- struct{}) <-chan error { +func purgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval time.Duration, stop <-chan struct{}, purgec chan<- string, donec chan<- struct{}, flock bool) <-chan error { if lg == nil { lg = zap.NewNop() } @@ -67,20 +73,25 @@ func purgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval fnames = newfnames for len(newfnames) > int(max) { f := filepath.Join(dirname, newfnames[0]) - l, err := TryLockFile(f, os.O_WRONLY, PrivateFileMode) - if err != nil { - lg.Warn("failed to lock file", zap.String("path", f), zap.Error(err)) - break + var l *LockedFile + if flock { + l, err = TryLockFile(f, os.O_WRONLY, PrivateFileMode) + if err != nil { + lg.Warn("failed to lock file", zap.String("path", f), zap.Error(err)) + break + } } if err = os.Remove(f); err != nil { lg.Error("failed to remove file", zap.String("path", f), zap.Error(err)) errC <- err return } - if err = l.Close(); err != nil { - lg.Error("failed to unlock/close", zap.String("path", l.Name()), zap.Error(err)) - errC <- err - return + if flock { + if err = l.Close(); err != nil { + lg.Error("failed to unlock/close", zap.String("path", l.Name()), zap.Error(err)) + errC <- err + return + } } lg.Info("purged", zap.String("path", f)) newfnames = newfnames[1:] diff --git a/vendor/k8s.io/apiserver/pkg/cel/environment/base.go b/vendor/k8s.io/apiserver/pkg/cel/environment/base.go index 114e8919f5..7aa4e54468 100644 --- a/vendor/k8s.io/apiserver/pkg/cel/environment/base.go +++ b/vendor/k8s.io/apiserver/pkg/cel/environment/base.go @@ -83,7 +83,7 @@ var baseOpts = []VersionedOptions{ }, // TODO: switch to ext.Strings version 2 once format() is fixed to work with HomogeneousAggregateLiterals. { - IntroducedVersion: version.MajorMinor(1, 28), + IntroducedVersion: version.MajorMinor(1, 27), EnvOptions: []cel.EnvOption{ library.IP(), library.CIDR(), diff --git a/vendor/modules.txt b/vendor/modules.txt index fdd3d995f4..ae4c777d83 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -948,7 +948,7 @@ github.com/vmware/govmomi/vim25/xml # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.11 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# go.etcd.io/etcd/api/v3 v3.5.12 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b ## explicit; go 1.20 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -956,7 +956,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.11 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# go.etcd.io/etcd/client/pkg/v3 v3.5.12 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b ## explicit; go 1.20 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -964,7 +964,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.9 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# go.etcd.io/etcd/client/v3 v3.5.9 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b ## explicit; go 1.20 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -1361,7 +1361,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1418,7 +1418,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/apiextensions-apiserver v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1465,7 +1465,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1532,7 +1532,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/apiserver v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1697,13 +1697,13 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/client-go v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2040,7 +2040,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/cloud-provider v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2063,14 +2063,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-20240307164320-6e2789bbd589 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2104,7 +2104,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/component-helpers v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2117,7 +2117,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/controller-manager v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2134,19 +2134,19 @@ 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-20240307164320-6e2789bbd589 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/dynamic-resource-allocation/resourceclaim -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2168,13 +2168,13 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kms v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/kms v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/kube-aggregator v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2205,7 +2205,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 @@ -2238,12 +2238,12 @@ 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-20240307164320-6e2789bbd589 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2278,7 +2278,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/kubelet v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2299,7 +2299,7 @@ k8s.io/kubelet/pkg/apis/stats/v1alpha1 k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand -# k8s.io/kubernetes v1.28.3 => github.com/openshift/kubernetes v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/kubernetes v1.28.3 => github.com/openshift/kubernetes v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3104,7 +3104,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3146,7 +3146,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3161,10 +3161,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-20240307164320-6e2789bbd589 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240315201002-f1b5f6c8166a ## explicit; go 1.20 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3315,38 +3315,38 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240307164320-6e2789bbd589 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240307164320-6e2789bbd589 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240109145625-5acb4f3078ad -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240109145625-5acb4f3078ad -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240109145625-5acb4f3078ad +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240315201002-f1b5f6c8166a +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240315201002-f1b5f6c8166a +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240307164320-6e2789bbd589 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240315201002-f1b5f6c8166a