vendor: update to golang 1.21 (#6303)

also updates assorted deps

Signed-off-by: Nick Santos <[email protected]>

.circleci/Dockerfile

@@ -1,4 +1,4 @@
-FROM cimg/go:1.20-node
+FROM cimg/go:1.21-node
 
 # --- DEPENDENCIES ---
 USER root
@@ -7,20 +7,20 @@ RUN curl -L "https:/docker/compose/releases/download/1.29.2/docker-c
  && chmod +x /usr/local/bin/docker-compose-v1
 
 # NOTE: cimg/go already includes Docker Compose v2, but it's not always up-to-date
-ARG COMPOSE_V2_VERSION="2.15.1"
+ARG COMPOSE_V2_VERSION="2.24.5"
 RUN mkdir -p "${HOME}/.docker/cli-plugins" \
  && curl -sSL "https:/docker/compose/releases/download/v${COMPOSE_V2_VERSION}/docker-compose-linux-$(uname -m)" -o "${HOME}/.docker/cli-plugins/docker-compose" \
  && chmod +x "${HOME}/.docker/cli-plugins/docker-compose" \
  && docker compose version --short | grep -q -F "${COMPOSE_V2_VERSION}"
 
-ARG KUSTOMIZE_VERSION="4.5.5"
+ARG KUSTOMIZE_VERSION="5.3.0"
 RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/kustomize.tar.gz "https:/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" \
  && tar -xz -C /tmp -f /tmp/kustomize.tar.gz \
  && mv /tmp/kustomize /usr/bin/kustomize \
  && rm -f /tmp/kustomize.tar.gz \
  && kustomize version --short | grep -q -F "${KUSTOMIZE_VERSION}"
 
-ARG HELM_VERSION="3.10.2"
+ARG HELM_VERSION="3.14.0"
 RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/helm.tar.gz "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" \
  && tar -xz -C /tmp -f /tmp/helm.tar.gz \
  && mv /tmp/linux-amd64/helm /usr/bin/helm3 \
@@ -33,4 +33,4 @@ RUN go install github.com/google/wire/cmd/wire@latest \
  && go install golang.org/x/tools/cmd/goimports@latest \
  && go clean -cache -modcache
 
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.56.0

.circleci/Dockerfile.integration

@@ -1,4 +1,4 @@
-FROM cimg/go:1.20-node
+FROM cimg/go:1.21-node
 
 USER root
 
@@ -20,7 +20,7 @@ RUN apt update && apt install -y --no-install-recommends apt-transport-https \
 # Install docker
 # Adapted from https:/circleci/circleci-images/blob/staging/shared/images/Dockerfile-basic.template
 # Check https://download.docker.com/linux/static/stable/x86_64/ for latest versions
-ENV DOCKER_VERSION=20.10.18
+ENV DOCKER_VERSION=25.0.3
 RUN set -exu \
  && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" \
  && echo Docker URL: $DOCKER_URL \
@@ -39,13 +39,13 @@ RUN curl -fL "https:/docker/compose/releases/download/${DOCKER_COMPO
  && docker-compose-v1 version
 
 # docker-compose v2
-ARG DOCKER_COMPOSE_V2_VERSION=v2.18.1
+ARG DOCKER_COMPOSE_V2_VERSION=v2.24.5
 RUN curl -fL "https:/docker/compose/releases/download/${DOCKER_COMPOSE_V2_VERSION}/docker-compose-$(uname -s | tr '[A-Z]' '[a-z]')-$(uname -m)" -o /usr/local/bin/docker-compose \
  && chmod a+x /usr/local/bin/docker-compose \
  && docker-compose version
 
 # install Kind (Kubernetes in Docker)
-ENV KIND_VERSION=v0.20.0
+ENV KIND_VERSION=v0.21.0
 RUN curl -fLo ./kind-linux-amd64 https:/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64 \
  && chmod +x ./kind-linux-amd64 \
  && mv ./kind-linux-amd64 /usr/local/bin/kind \

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
  build-linux:
  resource_class: medium+
  docker:
- - image: docker/tilt-ci@sha256:45e24840891e22aed72548002d4dd7223c117a4819c10c20660fedb33e7cca40
+ - image: docker/tilt-ci@sha256:dc3b3adf081a326a0b5a036e2490acecb1643412f0bdbe0e6ed5ce13521b7f93
  # apiserver code generation scripts require being in GOPATH
  working_directory: /home/circleci/go/src/github.com/tilt-dev/tilt
 
@@ -50,7 +50,7 @@ jobs:
 
  check-docs:
  docker:
- - image: docker/tilt-ci@sha256:45e24840891e22aed72548002d4dd7223c117a4819c10c20660fedb33e7cca40
+ - image: docker/tilt-ci@sha256:dc3b3adf081a326a0b5a036e2490acecb1643412f0bdbe0e6ed5ce13521b7f93
  steps:
  - checkout
  - setup_remote_docker
@@ -73,7 +73,7 @@ jobs:
  steps:
  - run: |
  choco install -y make kustomize kubernetes-helm docker-compose
- choco upgrade -y --allow-downgrade golang --version=1.20.5
+ choco upgrade -y --allow-downgrade golang --version=1.21.6
 
  # mingw 13 seems to have broken gcc installs
  # https://community.chocolatey.org/packages/mingw#comment-6290804217
@@ -100,7 +100,7 @@ jobs:
  build-integration:
  resource_class: medium+
  docker:
- - image: docker/tilt-integration-ci@sha256:4ef0f0de684068fcef8bc74abbc08629a832a30425fc00592689b298a1412710
+ - image: docker/tilt-integration-ci@sha256:b90db4d6acee12436e2e407737d3fc177a81d3e2dd3934e4054e1f19b0a2cc1c
  steps:
  - checkout
  - run: echo 'export PATH=/go/bin:$PATH' >> $BASH_ENV
@@ -131,7 +131,7 @@ jobs:
  steps:
  - checkout
  - go/install:
- version: "1.20"
+ version: "1.21.7"
  - run: curl -fsSL "https:/gotestyourself/gotestsum/releases/download/v1.7.0/gotestsum_1.7.0_darwin_amd64.tar.gz" | sudo tar -xz -C /usr/local/bin gotestsum
  # We can't run the container tests on macos because nested
  # VMs don't work on circleci.
@@ -150,7 +150,7 @@ jobs:
  resource_class: medium+
  docker:
  # keep image in sync with build.toast.yml
- - image: docker/tilt-releaser@sha256:ff4a71c0d18717cc9c646778cc426a0a4f916885c5fe7eb001f0eaee0d3483a0
+ - image: docker/tilt-releaser@sha256:811bdf40b46a54b290fe887be675604e2fb643faa626a7b5ca55057b9a747f69
  environment:
  DOCKER_CLI_EXPERIMENTAL: enabled
  steps:
@@ -167,7 +167,7 @@ jobs:
  resource_class: medium+
  docker:
  # keep image in sync with build.toast.yml
- - image: docker/tilt-releaser@sha256:ff4a71c0d18717cc9c646778cc426a0a4f916885c5fe7eb001f0eaee0d3483a0
+ - image: docker/tilt-releaser@sha256:811bdf40b46a54b290fe887be675604e2fb643faa626a7b5ca55057b9a747f69
  environment:
  DOCKER_CLI_EXPERIMENTAL: enabled
  steps:

go.mod

@@ -1,6 +1,6 @@
 module github.com/tilt-dev/tilt
 
-go 1.20
+go 1.21
 
 require (
  github.com/adrg/xdg v0.4.0