github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Simplify kube-cross dependency handling

Browse Source 
We can indirectly retrieve the kube-cross version from the
`build/build-image/cross/VERSION` for the sample-apiserver. This allows
us to simplify the handling in `build/dependencies.yaml` as well as
the required approval (via `OWNERS`) if the kube-cross version changes.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
This commit is contained in:
Sascha Grunert 2021-05-27 14:37:07 +02:00
parent 6db6c80656
commit 0ed0714f8c
No known key found for this signature in database
GPG Key ID: 09D97D153EF94D93
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -127,8 +127,6 @@ dependencies:
version: v1.16.4-2 version: v1.16.4-2
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
- path: test/images/sample-apiserver/Makefile
match: k8s\.gcr\.io\/build-image\/kube-cross:v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
# Base images # Base images
- name: "k8s.gcr.io/debian-base: dependents" - name: "k8s.gcr.io/debian-base: dependents"

3
test/images/sample-apiserver/Makefile
View File

@ -18,13 +18,14 @@ TARGET ?= $(CURDIR)
GOARM = 7 GOARM = 7
GOLANG_VERSION ?= latest GOLANG_VERSION ?= latest
SRC_DIR = $(notdir $(shell pwd)) SRC_DIR = $(notdir $(shell pwd))
KUBE_CROSS_VERSION ?= $(shell cat ../../../build/build-image/cross/VERSION)
export export
# Build v1.17.0 to ensure the current release supports a prior version of the sample apiserver # Build v1.17.0 to ensure the current release supports a prior version of the sample apiserver
# Get without building to populate module cache # Get without building to populate module cache
# Then, get with OS/ARCH-specific env to build # Then, get with OS/ARCH-specific env to build
bin: bin:
docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.16.4-2 \ docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:${KUBE_CROSS_VERSION} \
/bin/bash -c "\ /bin/bash -c "\
mkdir -p /go/src /go/bin && \ mkdir -p /go/src /go/bin && \
GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \ GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \