Skip to content

Commit c82b8ab

Browse files
committed
chore: make versions configurable
Bump Talos, pkgs, and tools. Signed-off-by: Alexey Palazhchenko <[email protected]>
1 parent 5594c96 commit c82b8ab

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ ENV GOPROXY https://proxy.golang.org
2424
ENV CGO_ENABLED 0
2525
ENV GOCACHE /.cache/go-build
2626
ENV GOMODCACHE /.cache/mod
27-
RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/[email protected]
28-
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/[email protected]
27+
ARG CONTROLLER_GEN_VERSION
28+
ARG CONVERSION_GEN_VERSION
29+
RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION}
30+
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@${CONVERSION_GEN_VERSION}
2931
WORKDIR /src
3032
COPY ./go.mod ./
3133
COPY ./go.sum ./

Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ NAME := cluster-api-talos-controller
88

99
ARTIFACTS := _out
1010

11-
TOOLS ?= ghcr.io/talos-systems/tools:v0.5.0
12-
PKGS ?= v0.5.0
13-
TALOS_VERSION ?= v0.12.0
11+
TOOLS ?= ghcr.io/talos-systems/tools:v0.7.0
12+
PKGS ?= v0.7.0
13+
TALOS_VERSION ?= v0.12.1
1414
K8S_VERSION ?= 1.21.4
1515

16+
CONTROLLER_GEN_VERSION ?= v0.5.0
17+
CONVERSION_GEN_VERSION ?= v0.21.0
18+
1619
BUILD := docker buildx build
1720
PLATFORM ?= linux/amd64
1821
PROGRESS ?= auto
@@ -25,6 +28,8 @@ COMMON_ARGS += --build-arg=NAME=$(NAME)
2528
COMMON_ARGS += --build-arg=TAG=$(TAG)
2629
COMMON_ARGS += --build-arg=PKGS=$(PKGS)
2730
COMMON_ARGS += --build-arg=TOOLS=$(TOOLS)
31+
COMMON_ARGS += --build-arg=CONTROLLER_GEN_VERSION=$(CONTROLLER_GEN_VERSION)
32+
COMMON_ARGS += --build-arg=CONVERSION_GEN_VERSION=$(CONVERSION_GEN_VERSION)
2833

2934
all: manifests container
3035

0 commit comments

Comments
 (0)