From 70ed6fdbea9eb37bd1d7558e90c20cfe888955e8 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Thu, 15 Aug 2024 08:49:50 -0700
Subject: [PATCH] Merge pull request #126670 from
 liggitt/automated-cherry-pick-of-#126665-upstream-release-1.31

Automated cherry pick of #126665: Restore honoring --version build ID overrides

Kubernetes-commit: 4d8e197743a6f764cdbb802e5f6d339d293a2e2e