Skip to content

Commit 4231a2f

Browse files
[bootloose image] Infer helm version from go mod
Fix the mismatch between go.mod and embedded-bins/Makefile.variables once and for all. Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <[email protected]>
1 parent 0b5bd42 commit 4231a2f

File tree

3 files changed

+2
-1
lines changed

3 files changed

+2
-1
lines changed

embedded-bins/Makefile.variables

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ containerd_build_shim_go_cgo_enabled = 0
2323
containerd_build_go_ldflags_extra = "-w -s -extldflags=-static"
2424

2525
kubernetes_version = 1.33.1
26-
helm_version = 3.17.2
2726
kubernetes_buildimage = $(golang_buildimage)
2827
kubernetes_build_go_tags = "providerless"
2928
#kubernetes_build_go_cgo_enabled =

inttest/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ bin:
1919
bin/sonobuoy: | bin
2020
$(curl) $(sonobuoy_url) | tar -C bin/ -zxv $(notdir $@)
2121

22+
helm_version = $(strip $(subst v,,$(shell ../vars.sh FROM=../ helm_version)))
2223
bootloose_alpine_build_cmdline := \
2324
--build-arg GOLANG_IMAGE=$(golang_buildimage) \
2425
--build-arg ALPINE_VERSION=$(alpine_patch_version) \

vars.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ done
6060
case "$var" in
6161
k0sctl_version) pkg=github.com/k0sproject/k0sctl ;;
6262
k0s_sort_version) pkg=github.com/k0sproject/version ;;
63+
helm_version) pkg=helm.sh/helm/v3 ;;
6364
*) pkg='' ;;
6465
esac
6566

0 commit comments

Comments
 (0)