Skip to content

Commit 4a3899d

Browse files
committed
fix
1 parent 2e71e07 commit 4a3899d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ jobs:
211211
MANGLE_METADATA: "1"
212212
run: |
213213
export K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION)
214+
export K0S_GO_VERSION=$(make print-PREVIOUS_K0S_GO_VERSION)
214215
export EC_VERSION=$(git describe --tags --match='[0-9]*.[0-9]*.[0-9]*')-previous-k0s
215216
export APP_VERSION=appver-dev-${{ needs.git-sha.outputs.git_sha }}-previous-k0s
216217

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
1010
ADMIN_CONSOLE_IMAGE_OVERRIDE =
1111
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
1212
ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE =
13-
K0S_VERSION = v1.30.5+k0s.0-ec.0
13+
K0S_VERSION = v1.30.5+k0s.0
1414
K0S_GO_VERSION = v1.30.5+k0s.0
1515
PREVIOUS_K0S_VERSION ?= v1.29.9+k0s.0-ec.0
16+
PREVIOUS_K0S_GO_VERSION ?= v1.29.9+k0s.0
1617
K0S_BINARY_SOURCE_OVERRIDE =
1718
TROUBLESHOOT_VERSION = v0.105.2
1819
KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
@@ -26,9 +27,7 @@ METADATA_K0S_BINARY_URL_OVERRIDE =
2627
METADATA_KOTS_BINARY_URL_OVERRIDE =
2728
METADATA_OPERATOR_BINARY_URL_OVERRIDE =
2829

29-
ifeq ($(K0S_VERSION),v1.30.5+k0s.0-ec.0)
30-
K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.30.5%2Bk0s.0-ec.0-$(ARCH)
31-
else ifeq ($(K0S_VERSION),v1.29.9+k0s.0-ec.0)
30+
ifeq ($(K0S_VERSION),v1.29.9+k0s.0-ec.0)
3231
K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.29.9%2Bk0s.0-ec.0-$(ARCH)
3332
else ifeq ($(K0S_VERSION),v1.28.14+k0s.0-ec.0)
3433
K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.28.14%2Bk0s.0-ec.0-$(ARCH)

0 commit comments

Comments
 (0)