diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index eeb60983a4..2886304e74 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2026-02-04-231239 +OCP_VERSION := 4.19.0-0.nightly-arm64-2026-02-11-230650 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index abda2c81f5..8c436d0d93 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2026-02-03-204953 +OCP_VERSION := 4.19.0-0.nightly-2026-02-11-013452 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 317c1e5ae8..4c2fb48975 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/assets/components/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:00a45d3cddfc03babbe703fd7b71d43b9587f9b15c2a1da4495dad1f119304fe + digest: sha256:48621ef6f52720ee8898d43e1cc3f9172107f7f5e5a47ba71486d556c09b66f5 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9f2c6d38ea0be06664a9c058831dede2eb833e300febb2c5d89f951eb91d6524 + digest: sha256:02df0468d57b1a660c66e4b34bd1d4a747482e69e173c8d5a61506527af48eaa diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index e65102bafe..cbc7f71754 100644 --- a/assets/components/multus/kustomization.x86_64.yaml +++ b/assets/components/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a78738d7d5e34d7f6f651057037a9d68a7d601b552b5f4cba92fdd21c19b7129 + digest: sha256:1d2304e9b7c6a0dbc794bb3bd131feb3a94b92dacc58f2bf6c2e6f4f59e2b3cd - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3af512b347a772c76c010847d66b710fd17479bd4e377a9aff10b9c44638cef7 + digest: sha256:ecc336225237443ee3411cb0d7cd06f0b4f985e79e25a33d3791128ed3e29304 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index cd869bb361..a4e8c49927 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2026-02-04-231239" + "base": "4.19.0-0.nightly-arm64-2026-02-11-230650" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00a45d3cddfc03babbe703fd7b71d43b9587f9b15c2a1da4495dad1f119304fe", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f2c6d38ea0be06664a9c058831dede2eb833e300febb2c5d89f951eb91d6524" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48621ef6f52720ee8898d43e1cc3f9172107f7f5e5a47ba71486d556c09b66f5", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02df0468d57b1a660c66e4b34bd1d4a747482e69e173c8d5a61506527af48eaa" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index c41ceeca49..5568d1b498 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-2026-02-03-204953" + "base": "4.19.0-0.nightly-2026-02-11-013452" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a78738d7d5e34d7f6f651057037a9d68a7d601b552b5f4cba92fdd21c19b7129", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3af512b347a772c76c010847d66b710fd17479bd4e377a9aff10b9c44638cef7" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d2304e9b7c6a0dbc794bb3bd131feb3a94b92dacc58f2bf6c2e6f4f59e2b3cd", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecc336225237443ee3411cb0d7cd06f0b4f985e79e25a33d3791128ed3e29304" } } diff --git a/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml b/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml index d779334936..90b542b8ef 100644 --- a/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml +++ b/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml @@ -13,9 +13,10 @@ metadata: namespace: kserve data: explainers: "{}" - oauthProxy: |- + oauthProxy: |- { - "image" : "$(oauth-proxy)", + "oauthProxyImage" : "$(oauth-proxy)", + "kubeRbacProxyImage" : "$(kube-rbac-proxy)", "memoryRequest": "64Mi", "memoryLimit": "128Mi", "cpuRequest": "100m", diff --git a/assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml b/assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml index cef82dd511..96af103d57 100644 --- a/assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml +++ b/assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml @@ -152,6 +152,13 @@ vars: apiVersion: v1 kind: ConfigMap name: kserve-parameters +- fieldref: + fieldpath: data.kube-rbac-proxy + name: kube-rbac-proxy + objref: + apiVersion: v1 + kind: ConfigMap + name: kserve-parameters - fieldref: fieldpath: data.kserve-llm-d-inference-scheduler name: kserve-llm-d-inference-scheduler diff --git a/assets/optional/ai-model-serving/kserve/overlays/odh/params.env b/assets/optional/ai-model-serving/kserve/overlays/odh/params.env index fffc4e5724..cfe95b7b15 100644 --- a/assets/optional/ai-model-serving/kserve/overlays/odh/params.env +++ b/assets/optional/ai-model-serving/kserve/overlays/odh/params.env @@ -6,3 +6,5 @@ kserve-llm-d=ghcr.io/llm-d/llm-d-dev:sha-b3f0b0d kserve-llm-d-inference-scheduler=quay.io/opendatahub/llm-d-inference-scheduler:odh-v2.33 kserve-llm-d-routing-sidecar=quay.io/opendatahub/llm-d-routing-sidecar:odh-v2.33 oauth-proxy=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08 +kube-rbac-proxy=registry.redhat.io/rhoai/odh-kube-auth-proxy-rhel9@sha256:1f4b2b9bb5061faf17299c2ae2405ab408e2b7ce349d9831eb6045990e6da005 + diff --git a/assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml b/assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml index 887ea13f15..8301667aa4 100644 --- a/assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml +++ b/assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml @@ -5,9 +5,10 @@ metadata: namespace: kserve data: explainers: "{}" - oauthProxy: |- + oauthProxy: |- { - "image" : "$(oauth-proxy)", + "oauthProxyImage" : "$(oauth-proxy)", + "kubeRbacProxyImage" : "$(kube-rbac-proxy)", "memoryRequest": "64Mi", "memoryLimit": "128Mi", "cpuRequest": "100m", diff --git a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json index 5fa5c8628f..467eebcc78 100644 --- a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json +++ b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "2.25.1" + "base": "2.25.2" }, "images": { "ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest", @@ -21,6 +21,7 @@ "kserve-llm-d": "ghcr.io/llm-d/llm-d-dev:sha-b3f0b0d", "kserve-llm-d-inference-scheduler": "quay.io/opendatahub/llm-d-inference-scheduler:odh-v2.33", "kserve-llm-d-routing-sidecar": "quay.io/opendatahub/llm-d-routing-sidecar:odh-v2.33", - "oauth-proxy": "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08" + "oauth-proxy": "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08", + "kube-rbac-proxy": "registry.redhat.io/rhoai/odh-kube-auth-proxy-rhel9@sha256:1f4b2b9bb5061faf17299c2ae2405ab408e2b7ce349d9831eb6045990e6da005" } } diff --git a/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml b/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml index ac69d08634..3026a19998 100644 --- a/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml +++ b/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml @@ -5,7 +5,7 @@ metadata: annotations: openshift.io/display-name: vLLM Intel Gaudi Accelerator ServingRuntime for KServe opendatahub.io/recommended-accelerators: '["habana.ai/gaudi"]' - opendatahub.io/runtime-version: 'v0.8.5' + opendatahub.io/runtime-version: 'v0.13.0' labels: opendatahub.io/dashboard: 'true' spec: diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 42a8e28a72..9cd8ef2e51 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fe470612cc6b3f8256bbb541fe63a07ba2d56debe7c64fd2bac0677306e32728 + digest: sha256:f192e22de6685aac306831334ab81bd05737725485bc0aecf76fdbafb66c708c - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:39cc08a6eacfe9ee26cdf01429dd85ea31f9dce25c37fcd9f8ce1cee28ac2d66 + digest: sha256:730b7f4b27a324a4a88a6a96c27260191c71c51f15b3bfcd4b69afbbe36477b1 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b1b30ebae2976cacb35bc73fc6f4bc49fe383232119443c32571d931ff62d01c + digest: sha256:4ff5f9a5593a18aefb8789442f6f41b713c84864c294f7db304bed562e72519d patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39cc08a6eacfe9ee26cdf01429dd85ea31f9dce25c37fcd9f8ce1cee28ac2d66 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:730b7f4b27a324a4a88a6a96c27260191c71c51f15b3bfcd4b69afbbe36477b1 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe470612cc6b3f8256bbb541fe63a07ba2d56debe7c64fd2bac0677306e32728 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f192e22de6685aac306831334ab81bd05737725485bc0aecf76fdbafb66c708c target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 8efe32f24f..3cf67f23a5 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1f7808b1b2750636d6fa1971d766f73078b9ab6d6fb246ac9a50382ee132dac6 + digest: sha256:42bd3cdad103e61e1bfec3e63ee1dc0f3e14c97fae05164b7c1f463e2c9d4ca8 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:24f7dd170ae6a20a8b38baf0e3875ff3d7545e1d74f060d7554f1ba2b80143ea + digest: sha256:9687b8575f64f9537d60466cda5392fad8e84fd172e879727600150b83bec318 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b1f6dfbe7713b1d369b6a33c0e21a5751a11f8e96a4d8d39c2eb4cee48f0e6dd + digest: sha256:585e2ceace039c3c53445f2341a4e4ac4d05bd8f537dd9b21227090d5e33deb1 patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24f7dd170ae6a20a8b38baf0e3875ff3d7545e1d74f060d7554f1ba2b80143ea + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9687b8575f64f9537d60466cda5392fad8e84fd172e879727600150b83bec318 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f7808b1b2750636d6fa1971d766f73078b9ab6d6fb246ac9a50382ee132dac6 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42bd3cdad103e61e1bfec3e63ee1dc0f3e14c97fae05164b7c1f463e2c9d4ca8 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 67e2dad448..661ecb6450 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2026-02-04-231239" + "base": "4.19.0-0.nightly-arm64-2026-02-11-230650" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe470612cc6b3f8256bbb541fe63a07ba2d56debe7c64fd2bac0677306e32728", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39cc08a6eacfe9ee26cdf01429dd85ea31f9dce25c37fcd9f8ce1cee28ac2d66", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1b30ebae2976cacb35bc73fc6f4bc49fe383232119443c32571d931ff62d01c" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f192e22de6685aac306831334ab81bd05737725485bc0aecf76fdbafb66c708c", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:730b7f4b27a324a4a88a6a96c27260191c71c51f15b3bfcd4b69afbbe36477b1", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ff5f9a5593a18aefb8789442f6f41b713c84864c294f7db304bed562e72519d" } } 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 321c2e52e8..68364c8f34 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.19.0-0.nightly-2026-02-03-204953" + "base": "4.19.0-0.nightly-2026-02-11-013452" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f7808b1b2750636d6fa1971d766f73078b9ab6d6fb246ac9a50382ee132dac6", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24f7dd170ae6a20a8b38baf0e3875ff3d7545e1d74f060d7554f1ba2b80143ea", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1f6dfbe7713b1d369b6a33c0e21a5751a11f8e96a4d8d39c2eb4cee48f0e6dd" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42bd3cdad103e61e1bfec3e63ee1dc0f3e14c97fae05164b7c1f463e2c9d4ca8", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9687b8575f64f9537d60466cda5392fad8e84fd172e879727600150b83bec318", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:585e2ceace039c3c53445f2341a4e4ac4d05bd8f537dd9b21227090d5e33deb1" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index b899b0736b..7439f44967 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2026-02-04-231239" + "base": "4.19.0-0.nightly-arm64-2026-02-11-230650" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ceb15171f18b5a3724fde46d899dc6d99c151b5b5135aaff539a275f36f9233a", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cb4aee7ba553712e6d00e9768aec94993fd36d8f7868e1dcf74e1ce89668088", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd104ce6a3de0886a832fe7686f8a1c742c723ff06b932ef00324ceb4041404c", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1b30ebae2976cacb35bc73fc6f4bc49fe383232119443c32571d931ff62d01c", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:559e2edff70b7e88ef6756c3af21c9165a7b2633dd5a03667525749dabd968d7", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a054d8952ae9fdd9d764022c75fb3d9c008559eaeec399b6b7c913b1229593ff", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e20681dff6a372e7b9a2aa6b5d25f8de192bd42a244198f14dca7c580013d1ed", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d54ee56b07dc2d3042c315fa531dbefcd5096de983fe23a4f0b10339a8d2950", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58282e25c3b3ca2ebc513a1222734c080b34ff398849c39df3a0f56a225843b8", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5635b43801498013ff53523857cf156183c9bef321305fb9e7068a13355d8d45", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ff5f9a5593a18aefb8789442f6f41b713c84864c294f7db304bed562e72519d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2810a52aadaec785ed1d4e3cb7e4768134ccc925d91565c734b58c177369662", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34356e182179e7aa7fb0aaae7c6891b6fb4c1ac4e6a8581f98f1eabb6a837f2f", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a407ebb00d57f9ac08d7187fb35e74ea1b9c3aecb6c8e09b01420a9c51eafb59", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:03771d66c0ed8a422c012ffaf6f390d8c3191e02330ef9b9dee00af518928d6e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d36a6a43ad040e853f6c1c992c4de5cda04e8ecd81ab720e3021707e430721b1" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bf2bd788f584d4d89a0bbb1fe9ce75ad9560997dd7564aca3038cec3786b06c" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 0923582bed..2d98af6655 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.19.0-0.nightly-2026-02-03-204953" + "base": "4.19.0-0.nightly-2026-02-11-013452" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72fc97409dd6199151a22298cdcd32949f4e544f9bcac8cb60daef178783c9c2", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cc2c601318b7f96dda645ecd0717df75f748118ccfacd569887f752a4132177", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:779f9765838f48d763fcc962a3af01be57e202cba8601c78ef7f4a0dbf550902", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1f6dfbe7713b1d369b6a33c0e21a5751a11f8e96a4d8d39c2eb4cee48f0e6dd", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7c6ce88dc667a2eed46b9b874dc6f1f9422e707b6401a18712e1dab7b03a7d6", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f8886f92e3b8e0d7607eefee6159ef70bfc83e4d0efbb99615376280f75a725", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b919d46e8d4be3de3ff85c88f83aca9c84742b7559c882474aa9b9a584d67dfe", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e04d7613f8610b5f8ef42555c33a498f0345c52949380cf9ca0bc0f684cb3416", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6a7eeb859f68cea73e993dd604cd899746e07f19ea7bd41f5a128544ba32aa0", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e463ef2e3b8c85fc37324d72799ab371b5bd321b2fb4f8069b7b0f92f89b195", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:585e2ceace039c3c53445f2341a4e4ac4d05bd8f537dd9b21227090d5e33deb1", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e5b72696e84c2899a73838f332cb9d0093d6531ddb437bc880a3fb223b90261", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bf0d79f37e234623b918147a3750ef99d057dec7bf49d9ead97a7323b67d2f3", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70399cf9baccccff31e2ae5ddff651b6695a88a9110586c1c11b5f0cf601136d", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:c5f0ad26372afdd4d3e6a37fdb5cdf0c91304c0e994ec885e2db89e851081504", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:201e6b8c9995a6150444c2de02f45802802060c42e933a60c7477edfc585a2fc" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7610f9cd4a9fd8406e94ba51f6ff8b28ab7a60bc04d8690e936fea84787b9da0" } } diff --git a/etcd/go.mod b/etcd/go.mod index 13095c35c3..3305834ba7 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -105,12 +105,12 @@ require ( github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect github.com/xlab/treeprint v1.2.0 // indirect go.etcd.io/bbolt v1.3.12 // indirect - go.etcd.io/etcd/api/v3 v3.5.24 - go.etcd.io/etcd/client/pkg/v3 v3.5.24 // indirect - go.etcd.io/etcd/client/v2 v2.305.24 // indirect - go.etcd.io/etcd/client/v3 v3.5.24 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.24 // indirect - go.etcd.io/etcd/raft/v3 v3.5.24 // indirect + go.etcd.io/etcd/api/v3 v3.5.26 + go.etcd.io/etcd/client/pkg/v3 v3.5.26 // indirect + go.etcd.io/etcd/client/v2 v2.305.26 // indirect + go.etcd.io/etcd/client/v3 v3.5.26 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.26 // indirect + go.etcd.io/etcd/raft/v3 v3.5.26 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/otel v1.34.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect @@ -145,13 +145,13 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c // from etcd go.etcd.io/etcd/client/v2 => github.com/openshift/etcd/client/v2 v2.305.1-0.20251107205749-0737eac4bbe3 - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20251107205749-0737eac4bbe3 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20251107205749-0737eac4bbe3 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20260208160752-3ebce536634c // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20260208160752-3ebce536634c // from etcd ) replace ( diff --git a/etcd/go.sum b/etcd/go.sum index 69b0cb05eb..ebc1102675 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -160,20 +160,20 @@ github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f h1:HH+BqfxONWB2kknhC github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw= github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c h1:gJvhduWIrpzoUTwrJjjeul+hGETKkhRhEZosBg/X3Hg= github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3 h1:EqgEIet1F7En+5mTzfQMgKoMKqm6aiLF3QFhc8Zdzww= -github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3/go.mod h1:GLkCGOkaa8la/ir4vVoi/uBbLMU9kbBno9xR1S9xORY= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 h1:b8haupP88qxhsZMQhglNHKfWZ9xtucS0XdViBUqQ3zE= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3/go.mod h1:chZ4/10h8jKsOiEHoDgWcY4IJ4LPARsO9Bmt+e//4x4= +github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c h1:KSN3is2eLjyRosIL1vyikGLfczPPPGq/uZebPl8vL6k= +github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c/go.mod h1:GLkCGOkaa8la/ir4vVoi/uBbLMU9kbBno9xR1S9xORY= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c h1:OguXjDmpe9x0D+8u8dhLlPUZrOE64sFMiBV6de5JkiA= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c/go.mod h1:chZ4/10h8jKsOiEHoDgWcY4IJ4LPARsO9Bmt+e//4x4= github.com/openshift/etcd/client/v2 v2.305.1-0.20251107205749-0737eac4bbe3 h1:dPe9fcsAh58khDmaruG/pnUgM2IUU3c6QlPgcsgbl0A= github.com/openshift/etcd/client/v2 v2.305.1-0.20251107205749-0737eac4bbe3/go.mod h1:T94VXv4uDpNZeO2HLhrkTlGubaTsJPZvii2aJEhhvu0= -github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3 h1:7rZcwgUVQIRJmUfJb3IPIz+xEIczHJ/tJiNMJZuyowg= -github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3/go.mod h1:AirlAxrdS/MnY1Tlsr7h2ouyCLQtPn/DvHHwzLUbLRA= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 h1:YD3V0MJXEBg82cIeNFK9ennswpoC9Wt2qs5MuRw6epE= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3/go.mod h1:DHkfi5ssyZX2OtbKVs4V4c6Y6qefNqSjR4KaHvPZnfY= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20251107205749-0737eac4bbe3 h1:wJOD4zWXPTrcbGQSBtOEoGISNCe3h4RS/Oi+AIjipA0= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20251107205749-0737eac4bbe3/go.mod h1:wW3d27eWjpPKKQoU3bJmjpUJQ3dr8LTqJn6+NSgTXhE= -github.com/openshift/etcd/server/v3 v3.5.1-0.20251107205749-0737eac4bbe3 h1:2iMsIlWWZPMaKj0KRDcoFoYqwcoRbm2YIwKjQhghbEA= -github.com/openshift/etcd/server/v3 v3.5.1-0.20251107205749-0737eac4bbe3/go.mod h1:j6eRK73tyGSVjw4ZIxhK162MwLZPxhFgYKtsq894ItE= +github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c h1:tRYFDW6UcyBbeuB+b2NQR7AMp9tVuBR4gyVOmxy0ZKQ= +github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c/go.mod h1:GYi0NfhcNX92Q2iCh/Zkqs7IGMNaApDMoKshjj0edDU= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c h1:9SH/INmnVi63Rn5nkdU2BTA/hf2AxELC959PUjGC4JE= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c/go.mod h1:zUZMCunPeSptQ17vohG17siSeOLBHuavDy8orAuT3dQ= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20260208160752-3ebce536634c h1:5g3jyQO/bLbEU8bxT0tmu994H/xYBQfGZZgMhen/p+Y= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20260208160752-3ebce536634c/go.mod h1:y/5bbuGoiuX8acdpt0YIebkJnjMK8nbh+qSaYEetTpw= +github.com/openshift/etcd/server/v3 v3.5.1-0.20260208160752-3ebce536634c h1:pKbuuK23IC+AWCMbe1UFOsS3g4HHGpp6YfvKDFsQT5M= +github.com/openshift/etcd/server/v3 v3.5.1-0.20260208160752-3ebce536634c/go.mod h1:dOqCSBSCD2FVLr9/ze5JlM9tHPUn2Yk3Hayi6CnOtYQ= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= 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 aa2235ba0d..d37d92f850 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.24" + Version = "3.5.26" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/auth/jwt.go b/etcd/vendor/go.etcd.io/etcd/server/v3/auth/jwt.go index a797794494..65df66b317 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/auth/jwt.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/auth/jwt.go @@ -114,12 +114,12 @@ func (t *tokenJWT) assign(ctx context.Context, username string, revision uint64) return "", err } - t.lg.Debug( - "created/assigned a new JWT token", - zap.String("user-name", username), - zap.Uint64("revision", revision), - zap.String("token", token), - ) + if ce := t.lg.Check(zap.DebugLevel, "created/assigned a new JWT token"); ce != nil { + tokenFingerprint := redactToken(token) + ce.Write(zap.String("user-name", username), + zap.Uint64("revision", revision), + zap.String("token-fingerprint", tokenFingerprint)) + } return token, err } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/auth/simple_token.go b/etcd/vendor/go.etcd.io/etcd/server/v3/auth/simple_token.go index a657d9daef..7f6fbcac51 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/auth/simple_token.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/auth/simple_token.go @@ -130,10 +130,11 @@ func (t *tokenSimple) assignSimpleTokenToUser(username, token string) { _, ok := t.simpleTokens[token] if ok { + tokenFingerprint := redactToken(token) t.lg.Panic( "failed to assign already-used simple token to a user", zap.String("user-name", username), - zap.String("token", token), + zap.String("token-fingerprint", tokenFingerprint), ) } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/auth/store.go b/etcd/vendor/go.etcd.io/etcd/server/v3/auth/store.go index 67c5694cde..1230df059d 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/auth/store.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/auth/store.go @@ -17,8 +17,10 @@ package auth import ( "bytes" "context" + "crypto/sha256" "encoding/base64" "encoding/binary" + "encoding/hex" "errors" "sort" "strings" @@ -314,11 +316,10 @@ func (as *authStore) Authenticate(ctx context.Context, username, password string return nil, err } - as.lg.Debug( - "authenticated a user", - zap.String("user-name", username), - zap.String("token", token), - ) + if ce := as.lg.Check(zap.DebugLevel, "authenticated a user"); ce != nil { + tokenFingerprint := redactToken(token) + ce.Write(zap.String("user-name", username), zap.String("token-fingerprint", tokenFingerprint)) + } return &pb.AuthenticateResponse{Token: token}, nil } @@ -1180,7 +1181,8 @@ func (as *authStore) AuthInfoFromCtx(ctx context.Context) (*AuthInfo, error) { token := ts[0] authInfo, uok := as.authInfoFromToken(ctx, token) if !uok { - as.lg.Warn("invalid auth token", zap.String("token", token)) + tokenFingerprint := redactToken(token) + as.lg.Warn("invalid auth token", zap.String("token-fingerprint", tokenFingerprint)) return nil, ErrInvalidAuthToken } @@ -1334,3 +1336,8 @@ func (as *authStore) setupMetricsReporter() { } reportCurrentAuthRevMu.Unlock() } + +func redactToken(token string) string { + sum := sha256.Sum256([]byte(token)) + return hex.EncodeToString(sum[:])[:12] +} diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/membership/cluster.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/membership/cluster.go index 49e15d14cc..448fbb2cc7 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/membership/cluster.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/membership/cluster.go @@ -499,6 +499,15 @@ func (c *RaftCluster) UpdateAttributes(id types.ID, attr Attributes, shouldApply } if c.be != nil && shouldApplyV3 { unsafeSaveMemberToBackend(c.lg, c.be, m) + + // Ideally, each member only updates its own attributes + // once before serving requests. Since this happens only + // on startup and at a low frequency, it should be safe + // to clean up zombie members in this request. + if id == c.localID && c.v2store != nil { + c.lg.Info("checking and cleaning up zombie members after attribute update") + CleanupZombieMembersIfNeeded(c.lg, c.be, c.v2store) + } } return } @@ -564,6 +573,15 @@ func (c *RaftCluster) UpdateRaftAttributes(id types.ID, raftAttr RaftAttributes, ) } +func (c *RaftCluster) CleanupZombieMembersIfNeeded(shouldApplyV3 ShouldApplyV3) { + c.Lock() + defer c.Unlock() + + if c.v2store != nil && c.be != nil && shouldApplyV3 { + CleanupZombieMembersIfNeeded(c.lg, c.be, c.v2store) + } +} + func (c *RaftCluster) Version() *semver.Version { c.Lock() defer c.Unlock() @@ -767,6 +785,21 @@ func SyncLearnerPromotionIfNeeded(lg *zap.Logger, be backend.Backend, st v2store return nil } +func CleanupZombieMembersIfNeeded(lg *zap.Logger, be backend.Backend, st v2store.Store) { + v2Members, _ := membersFromStore(lg, st) + v3Members, _ := membersFromBackend(lg, be) + + for id, v3Member := range v3Members { + _, ok := v2Members[id] + if !ok { + lg.Warn("Removing zombie member from v3store", zap.String("member", fmt.Sprintf("%+v", *v3Member))) + if err := unsafeDeleteMemberFromBackend(be, id); err != nil { + lg.Warn("failed to delete zombie member from backend", zap.String("member-id", id.String()), zap.Error(err)) + } + } + } +} + func clusterVersionFromStore(lg *zap.Logger, st v2store.Store) *semver.Version { e, err := st.Get(path.Join(storePrefix, "version"), false, false) if err != nil { diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/raft.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/raft.go index 17743a59cd..cc7d1e35e0 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/raft.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/raft.go @@ -678,6 +678,9 @@ func getIDs(lg *zap.Logger, snap *raftpb.Snapshot, ents []raftpb.Entry) []uint64 for _, id := range snap.Metadata.ConfState.Voters { ids[id] = true } + for _, id := range snap.Metadata.ConfState.Learners { + ids[id] = true + } } for _, e := range ents { if e.Type != raftpb.EntryConfChange { 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 aae98cf762..7306dad100 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 @@ -1370,6 +1370,8 @@ func (s *EtcdServer) applySnapshot(ep *etcdProgress, apply *apply) { lg.Info("restored v2 store") + lg.Info("checking and cleaning up zombie members during snapshot restore") + membership.CleanupZombieMembersIfNeeded(lg, newbe, s.v2store) if err = membership.SyncLearnerPromotionIfNeeded(lg, newbe, s.v2store); err != nil { lg.Error("Failed to sync learner promotion for v3store", zap.Error(err)) } @@ -2275,6 +2277,12 @@ func (s *EtcdServer) apply( s.setAppliedIndex(e.Index) s.setTerm(e.Term) shouldStop = shouldStop || removedSelf + + if shouldApplyV3 { + s.lg.Info("checking and cleaning up zombie members if needed after confState changed") + s.cluster.CleanupZombieMembersIfNeeded(shouldApplyV3) + } + s.w.Trigger(cc.ID, &confChangeResponse{s.cluster.Members(), err}) default: diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 5bb1c17236..d55abc92f9 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -278,7 +278,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.12 ## explicit; go 1.23 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.24 => github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/api/v3 v3.5.26 => github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c ## explicit; go 1.23.0 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -287,7 +287,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.24 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/client/pkg/v3 v3.5.26 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c ## explicit; go 1.23.0 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -297,17 +297,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.24 => github.com/openshift/etcd/client/v2 v2.305.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/client/v2 v2.305.26 => github.com/openshift/etcd/client/v2 v2.305.1-0.20251107205749-0737eac4bbe3 ## explicit; go 1.23.0 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.24 => github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/client/v3 v3.5.26 => github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c ## explicit; go 1.23.0 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.24 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/pkg/v3 v3.5.26 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c ## explicit; go 1.23.0 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -324,14 +324,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.24 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/raft/v3 v3.5.26 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20260208160752-3ebce536634c ## explicit; go 1.23.0 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.16 => github.com/openshift/etcd/server/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/server/v3 v3.5.16 => github.com/openshift/etcd/server/v3 v3.5.1-0.20260208160752-3ebce536634c ## explicit; go 1.23.0 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -1082,13 +1082,13 @@ sigs.k8s.io/yaml/goyaml.v2 # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c # go.etcd.io/etcd/client/v2 => github.com/openshift/etcd/client/v2 v2.305.1-0.20251107205749-0737eac4bbe3 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20251107205749-0737eac4bbe3 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20260208160752-3ebce536634c +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20260208160752-3ebce536634c # k8s.io/api => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/api # k8s.io/apiextensions-apiserver => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver # k8s.io/apimachinery => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery diff --git a/go.mod b/go.mod index ffff69f122..2875911e63 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/spf13/pflag v1.0.6 github.com/stretchr/testify v1.10.0 github.com/vishvananda/netlink v1.3.1-0.20250206174618-62fb240731fa - go.etcd.io/etcd/client/pkg/v3 v3.5.24 + go.etcd.io/etcd/client/pkg/v3 v3.5.26 go.etcd.io/etcd/client/v3 v3.5.16 golang.org/x/sys v0.31.0 gopkg.in/yaml.v3 v3.0.1 @@ -197,7 +197,7 @@ require ( github.com/robfig/cron v1.2.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/vishvananda/netns v0.0.4 // indirect - go.etcd.io/etcd/api/v3 v3.5.24 // indirect + go.etcd.io/etcd/api/v3 v3.5.26 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/mod v0.22.0 // indirect @@ -258,7 +258,7 @@ replace ( ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c // from etcd ) diff --git a/go.sum b/go.sum index c87b81f7fe..7fb5cbc0d8 100644 --- a/go.sum +++ b/go.sum @@ -253,12 +253,12 @@ github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a h1:duO3JMrUOqV github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a/go.mod h1:Qw3ThpzVZ0bfTILpBNYg4LGyjtNxfyCiGh/uDLOOTP8= github.com/openshift/cluster-policy-controller v0.0.0-20250310152427-748524784686 h1:nGyo9X9HcK6qs6jmFKFZgzkTl0b1adD0VumMCjDXzBA= github.com/openshift/cluster-policy-controller v0.0.0-20250310152427-748524784686/go.mod h1:O5k9FNYPPYp5xt+1batZMRgfXihz26l9pGKKUfLoHJA= -github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3 h1:EqgEIet1F7En+5mTzfQMgKoMKqm6aiLF3QFhc8Zdzww= -github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3/go.mod h1:GLkCGOkaa8la/ir4vVoi/uBbLMU9kbBno9xR1S9xORY= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 h1:b8haupP88qxhsZMQhglNHKfWZ9xtucS0XdViBUqQ3zE= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3/go.mod h1:chZ4/10h8jKsOiEHoDgWcY4IJ4LPARsO9Bmt+e//4x4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3 h1:7rZcwgUVQIRJmUfJb3IPIz+xEIczHJ/tJiNMJZuyowg= -github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3/go.mod h1:AirlAxrdS/MnY1Tlsr7h2ouyCLQtPn/DvHHwzLUbLRA= +github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c h1:KSN3is2eLjyRosIL1vyikGLfczPPPGq/uZebPl8vL6k= +github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c/go.mod h1:GLkCGOkaa8la/ir4vVoi/uBbLMU9kbBno9xR1S9xORY= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c h1:OguXjDmpe9x0D+8u8dhLlPUZrOE64sFMiBV6de5JkiA= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c/go.mod h1:chZ4/10h8jKsOiEHoDgWcY4IJ4LPARsO9Bmt+e//4x4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c h1:tRYFDW6UcyBbeuB+b2NQR7AMp9tVuBR4gyVOmxy0ZKQ= +github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c/go.mod h1:GYi0NfhcNX92Q2iCh/Zkqs7IGMNaApDMoKshjj0edDU= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805115014-fdef30c84b3d h1:IWDq8F80qkyfhXE3itWqLbcBr2Y32fPQ9XoH5zwRh0w= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805115014-fdef30c84b3d/go.mod h1:X3tzGhATM+qhiiIRdoBW/rDhXylEM0IltBRRDUG8AWk= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 3a2ea818c8..92e209bede 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -24,6 +24,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:4f8886f92e3b8e0d7607eefee6159ef70bfc83e4d0efbb99615376280f75a725" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bf0d79f37e234623b918147a3750ef99d057dec7bf49d9ead97a7323b67d2f3" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index c654a6ffd3..765d584e06 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -24,6 +24,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:a054d8952ae9fdd9d764022c75fb3d9c008559eaeec399b6b7c913b1229593ff" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34356e182179e7aa7fb0aaae7c6891b6fb4c1ac4e6a8581f98f1eabb6a837f2f" 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 6d44192897..d1e8e494ba 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,31 @@ -- ovn-kubernetes image-arm64 16e5e201025c67a8cc2253851ebbbe3dfa7d7910 to 194e289903051ba951e479c227ad3d44f9fc321a +- cluster-kube-apiserver-operator embedded-component 8ce34d695b2ee3a93e748cd039db7c238ffc9f12 to 4bbd3be9dfda4a08dca98648209151de2a869f25 + - 8047018 2025-11-05T16:34:26+00:00 Add priority field to prevent early shutdown + +- cluster-kube-scheduler-operator embedded-component 8740a60de76690a17d5081db078eb93dfdb7a066 to b5671f10f0b03ac19e584e08b08267f67dd2d709 + - ca3fba9 2026-01-30T12:59:18-05:00 Update ks_pod_scenario_3.yaml + - b35f237 2026-01-30T12:59:18-05:00 Update ks_pod_scenario_2.yaml + - bb1599c 2026-01-30T12:59:17-05:00 Update ks_pod_scenario_1.yaml + - 95d235b 2026-01-30T12:59:17-05:00 Add priority field to prevent early shutdown + +- etcd embedded-component 0737eac4bbe3903f725064c06a88af761418e5fd to 3ebce536634cb76794f1b9668072a094c132c16a + - da481c1f 2026-02-06T10:54:08-05:00 UPSTREAM: : Revert "dependency: Bump golang.org/x/crypto from 0.38.0 to 0.45.0" + - 847c0464 2026-02-06T10:45:22-05:00 UPSTREAM: : manually resolve conflicts + - 65251b30 2025-12-18T03:27:13+08:00 version: bump up to 3.5.26 + - 751f1628 2025-12-15T22:36:25-06:00 dependency: Bump golang.org/x/crypto from 0.38.0 to 0.45.0 + - 47f9b5aa 2025-12-10T09:37:59-05:00 server: cleanup zombie membership information + - 5ff84215 2025-12-10T09:36:18-05:00 tests: setup two testcases to reproduce 20967 issue + - a8ffc2e2 2025-12-06T21:32:18+08:00 Bump go to 1.24.11 + - 80e15b8f 2025-11-18T13:11:14+00:00 Fix a typo of 'etcdctl snapshot restore/status' commands + - 8bdb0edc 2025-11-17T17:56:45+00:00 Print token fingerprint instead of the original tokens in log messages + - e2eff772 2025-11-12T00:00:11-05:00 version: bump up to 3.5.25 + - 26c67519 2025-11-06T21:57:49-08:00 Bump from go1.24.9 to go1.24.10 + - 547d6f42 2025-11-06T19:37:43+00:00 Fix the '--force-new-cluster' can't clean up learners issue + - 2cdacbc4 2025-11-06T19:35:12+00:00 Add an e2e test cases to reproduce the '--force-new-cluster' can't remove learners issue + - 67ddeb51 2025-11-04T09:30:54-05:00 etcdutl: add --wal-dir for check-v2store + +- machine-config-operator embedded-component b405535023b88949e231be90778e5cf63e438c40 to 25321abfd952d282486d28fe27c4ab6052469ebf + - 1b30b594 2026-01-28T16:02:00-06:00 Fix MCN conditions not updating during OCL sync + +- ovn-kubernetes image-amd64 16e5e201025c67a8cc2253851ebbbe3dfa7d7910 to 194e289903051ba951e479c227ad3d44f9fc321a - 1ce92737 2026-01-21T14:02:20+01:00 fix(localnet, ipamless): Prevent LSP deletion on sync diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 2b33b5d32e..962723ab4e 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -2,17 +2,17 @@ https://github.com/openshift/api embedded-component 482f1b56dcc4d97ab9d3f7c22f10 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component cf99de974354133f853928cff9e19ad19c5347d9 https://github.com/openshift/cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172 https://github.com/openshift/cluster-ingress-operator embedded-component 7ce99b2c11f456e0e6e3cfa80ebf7682466eb0ea -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 8ce34d695b2ee3a93e748cd039db7c238ffc9f12 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4bbd3be9dfda4a08dca98648209151de2a869f25 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 7c4e44698b6004e52c59e03dd0c89611fbbfa999 -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 8740a60de76690a17d5081db078eb93dfdb7a066 +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component b5671f10f0b03ac19e584e08b08267f67dd2d709 https://github.com/openshift/cluster-network-operator embedded-component f5aaab800060be6b8c299d2a1feaaaa40298d71a https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0ab30996207ada63ef2e2fd4f47aac03b0872c9a https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01 https://github.com/openshift/csi-external-snapshotter embedded-component 580c6960cd665dfdc3d77538bb7744b8754aca26 -https://github.com/openshift/etcd embedded-component 0737eac4bbe3903f725064c06a88af761418e5fd +https://github.com/openshift/etcd embedded-component 3ebce536634cb76794f1b9668072a094c132c16a https://github.com/openshift/kubernetes embedded-component 9d45edc58ca6d5240fc84d3d50eb7490aa683c16 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component fdef30c84b3d45ede364500984221c3f492b1415 -https://github.com/openshift/machine-config-operator embedded-component b405535023b88949e231be90778e5cf63e438c40 +https://github.com/openshift/machine-config-operator embedded-component 25321abfd952d282486d28fe27c4ab6052469ebf https://github.com/openshift/openshift-controller-manager embedded-component 5b3063ff149f290bebca0783fc508dfbf07689a5 https://github.com/openshift/operator-framework-olm embedded-component 8332256a5954ab312b33e91fd1befa847f551a0b https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33 @@ -22,7 +22,7 @@ https://github.com/openshift/coredns image-amd64 4f64931403bf747b78bccb40ad877b0 https://github.com/openshift/csi-external-snapshotter image-amd64 580c6960cd665dfdc3d77538bb7744b8754aca26 https://github.com/openshift/router image-amd64 5fe8cc069b2f44b3393545ac92c3201e8a87d82b https://github.com/openshift/kube-rbac-proxy image-amd64 591277560f328601273f88f2881e09ccccd90a97 -https://github.com/openshift/ovn-kubernetes image-amd64 16e5e201025c67a8cc2253851ebbbe3dfa7d7910 +https://github.com/openshift/ovn-kubernetes image-amd64 194e289903051ba951e479c227ad3d44f9fc321a https://github.com/openshift/kubernetes image-amd64 9d45edc58ca6d5240fc84d3d50eb7490aa683c16 https://github.com/openshift/service-ca-operator image-amd64 4dfa6916f984d0fd7188380edc88b250738f07f7 https://github.com/openshift/oc image-arm64 24755b6e82745a4dfa5a6db4b467564c237f244c diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 572c4e5a87..6fbea03a8f 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2026-02-03-204953" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2026-02-04-231239" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2026-02-11-013452" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2026-02-11-230650" 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 aa2235ba0d..d37d92f850 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.24" + Version = "3.5.26" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/vendor/modules.txt b/vendor/modules.txt index 9139ad05b3..1f65d48cf2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -795,7 +795,7 @@ github.com/x448/float16 # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.24 => github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/api/v3 v3.5.26 => github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c ## explicit; go 1.23.0 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -803,7 +803,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.24 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/client/pkg/v3 v3.5.26 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c ## explicit; go 1.23.0 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -811,7 +811,7 @@ go.etcd.io/etcd/client/pkg/v3/systemd go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types -# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c ## explicit; go 1.23.0 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -3193,6 +3193,6 @@ sigs.k8s.io/yaml/goyaml.v2 # k8s.io/sample-apiserver => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver # k8s.io/sample-cli-plugin => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin # k8s.io/sample-controller => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20251107205749-0737eac4bbe3 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251107205749-0737eac4bbe3 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20251107205749-0737eac4bbe3 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20260208160752-3ebce536634c +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20260208160752-3ebce536634c +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20260208160752-3ebce536634c