Skip to content

Commit 37b9388

Browse files
authored
Merge pull request kubernetes#131371 from BenTheElder/test-images-dedupe-go-version
test/images: read .go-version instead of duplicating
2 parents 25edc42 + b9a6a25 commit 37b9388

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build/dependencies.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,14 @@ dependencies:
115115
match: 'GOLANG_VERSION := \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
116116

117117
# Golang
118+
# TODO: this should really be eliminated and controlled by .go-version
118119
- name: "golang: upstream version"
119120
version: 1.24.2
120121
refPaths:
121122
- path: .go-version
122123
- path: build/build-image/cross/VERSION
123124
- path: staging/publishing/rules.yaml
124125
match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
125-
- path: test/images/Makefile
126-
match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
127126

128127
# Golang pre-releases are denoted as `1.y<pre-release stage>`
129128
# Example: go1.16rc1

test/images/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
REPO_ROOT:=${CURDIR}/../..
1516
REGISTRY ?= registry.k8s.io/e2e-test-images
1617
GOARM ?= 7
1718
DOCKER_CERT_BASE_PATH ?=
1819
QEMUVERSION=v5.1.0-2
19-
GOLANG_VERSION=1.24.2
20+
GOLANG_VERSION=$(shell cat $(REPO_ROOT)/.go-version)
2021
export
2122

2223
ifndef WHAT

0 commit comments

Comments
 (0)