diff --git a/Makefile b/Makefile index 11d1da1f8..5f695a5a6 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ include common.mk APP_NAME = embedded-cluster ADMIN_CONSOLE_CHART_REPO_OVERRIDE = -ADMIN_CONSOLE_IMAGE_OVERRIDE = ttl.sh/ethan/kotsadm:24h +ADMIN_CONSOLE_IMAGE_OVERRIDE = ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE = ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE = K0S_VERSION = v1.29.8+k0s.0 @@ -13,10 +13,10 @@ PREVIOUS_K0S_VERSION ?= v1.28.10+k0s.0 K0S_BINARY_SOURCE_OVERRIDE = PREVIOUS_K0S_BINARY_SOURCE_OVERRIDE = TROUBLESHOOT_VERSION = v0.100.0 -KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/') +KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | # When updating KOTS_BINARY_URL_OVERRIDE, also update the KOTS_VERSION above or # scripts/ci-cache-files.sh may find the version in the cache and not upload the overridden binary. -KOTS_BINARY_URL_OVERRIDE = https://repldev-ethan-test.s3.amazonaws.com/kots.tar.gz +KOTS_BINARY_URL_OVERRIDE = # TODO: move this to a manifest file LOCAL_ARTIFACT_MIRROR_IMAGE ?= proxy.replicated.com/anonymous/replicated/embedded-cluster-local-artifact-mirror:$(VERSION) # These are used to override the binary urls in dev and e2e tests