diff --git a/Makefile b/Makefile index 8bd6e40f3..97ad9ea0e 100644 --- a/Makefile +++ b/Makefile @@ -10,12 +10,12 @@ ADMIN_CONSOLE_CHART_REPO_OVERRIDE = ADMIN_CONSOLE_IMAGE_OVERRIDE = ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE = ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE = -K0S_VERSION = v1.30.9+k0s.0 +K0S_VERSION = v1.32.1+k0s.0 K0S_GO_VERSION = v1.30.9+k0s.0 PREVIOUS_K0S_VERSION ?= v1.29.9+k0s.0-ec.0 PREVIOUS_K0S_GO_VERSION ?= v1.29.9+k0s.0 K0S_BINARY_SOURCE_OVERRIDE = -TROUBLESHOOT_VERSION = v0.112.1 +TROUBLESHOOT_VERSION = v0.115.2 KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/') # When updating KOTS_BINARY_URL_OVERRIDE, also update the KOTS_VERSION above or @@ -32,11 +32,11 @@ METADATA_MANAGER_BINARY_URL_OVERRIDE = METADATA_OPERATOR_BINARY_URL_OVERRIDE = ifeq ($(K0S_VERSION),v1.30.5+k0s.0-ec.1) -K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.30.5%2Bk0s.0-ec.1-$(ARCH) +K0S_BINARY_SOURCE_OVERRIDE = else ifeq ($(K0S_VERSION),v1.29.9+k0s.0-ec.0) -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) +K0S_BINARY_SOURCE_OVERRIDE = else ifeq ($(K0S_VERSION),v1.28.14+k0s.0-ec.0) -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) +K0S_BINARY_SOURCE_OVERRIDE = endif ifneq ($(KOTS_BINARY_FILE_OVERRIDE),) diff --git a/go.sum b/go.sum index 4a0b8bb18..3543651f0 100644 --- a/go.sum +++ b/go.sum @@ -1715,7 +1715,6 @@ google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= -google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a h1:UIpYSuWdWHSzjwcAFRLjKcPXFZVVLXGEM23W+NWqipw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=