tilt-dev · Nov 4, 2022 · Dec 5, 2022 · Dec 5, 2022 · Dec 6, 2022 · Dec 6, 2022
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
@@ -9,34 +9,33 @@
 # Similar to the release image (which contains everything BUT the build
 # toolchain)
 
-FROM golang:1.19-buster
+FROM golang:1.24-bookworm
 
-RUN apt update && apt install -y curl ca-certificates liblz4-tool rsync socat
+RUN apt update && apt install -y curl ca-certificates liblz4-tool rsync socat gpg
 
-# Install docker
-# Adapted from https://github.com/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.17
+# Install docker CLI
 RUN set -exu \
-  && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" \
-  && echo Docker URL: $DOCKER_URL \
-  && curl --silent --show-error --location --fail --retry 3 --output /tmp/docker.tgz "${DOCKER_URL}" \
-  && ls -lha /tmp/docker.tgz \
-  && tar -xz -C /tmp -f /tmp/docker.tgz \
-  && mv /tmp/docker/* /usr/bin \
-  && rm -rf /tmp/docker /tmp/docker.tgz \
-  && which docker \
-  && (docker version || true)
+  # Add Docker's official GPG key:
+  && install -m 0755 -d /etc/apt/keyrings \
+  && curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
+  && chmod a+r /etc/apt/keyrings/docker.asc \
+  # Add the repository to Apt sources: 
+  && echo \
+    "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+    $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  tee /etc/apt/sources.list.d/docker.list > /dev/null \
+  && apt update \
+  && apt install -y docker-ce-cli=5:25.0.3-1~debian.12~bookworm docker-buildx-plugin
 
 # Install kubectl client
-RUN apt install -y apt-transport-https gnupg \
-  && curl -fsS https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
-  && touch /etc/apt/sources.list.d/kubernetes.list \
-  && echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
-  && apt update && apt install -y kubectl
+ENV KUBECTL_VERSION=v1.31.0
+RUN curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
+    && curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256" \
+    && echo "$(cat kubectl.sha256)  kubectl" | sha256sum --check \
+    && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
 
 # install Kind
-ENV KIND_VERSION=v0.17.0
+ENV KIND_VERSION=v0.27.0
 RUN set -exu \
   && curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" \
   && chmod +x ./kind-linux-amd64 \

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,113 +5,120 @@ orbs:
 jobs:
   build:
     docker:
-      - image: cimg/go:1.19
+      - image: cimg/go:1.24
     steps:
       - checkout
       - run: go get -v -t -d ./...
       - run: go test -v ./...
-      - run: cd .. && go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2
+      - run: cd .. && go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
       - run: make golangci-lint
       - slack/notify-on-failure:
           only_for_branches: main
-
   e2e-remote-docker:
     docker:
-      - image: docker/tilt-ctlptl-ci@sha256:a06365a5d76f900883950aeec65d5a3cd49a96ee750a327ac34c3f4850298ee3
+      - image: "docker/tilt-ctlptl-ci@sha256:4bb1c8ca66157e1ea8dc63711666ca0a9f5a30d3f8dbe124315e76d447f93144"
     steps:
       - checkout
       - setup_remote_docker
       - run: make install
-      - run: test/kind-cluster-network/e2e.sh
-
+      - run: test/kind/e2e.sh
   e2e:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2204:2023.04.2
     steps:
       - checkout
       - kubernetes/install-kubectl
       - run: |
           set -ex
-          wget https://golang.org/dl/go1.19.linux-amd64.tar.gz
+          wget https://golang.org/dl/go1.24.0.linux-amd64.tar.gz
           sudo rm -fR /usr/local/go
-          sudo tar -C /usr/local -xzf go1.19.linux-amd64.tar.gz
-      # We need a newer Docker version to work around a k3d/containerd bug.
-      # https://github.com/rancher/k3d/issues/807
-      - run: |
-          set -ex
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
-            $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-          sudo apt update
-          export DEBIAN_FRONTEND=noninteractive
-          sudo apt upgrade -y containerd.io
+          sudo tar -C /usr/local -xzf go1.24.0.linux-amd64.tar.gz
       - run: |
           set -ex
-          export MINIKUBE_VERSION=v1.27.0
+          export MINIKUBE_VERSION=v1.34.0
           curl -fLo ./minikube-linux-amd64 "https://github.com/kubernetes/minikube/releases/download/${MINIKUBE_VERSION}/minikube-linux-amd64"
           chmod +x ./minikube-linux-amd64
           sudo mv ./minikube-linux-amd64 /usr/local/bin/minikube
       - run: |
           set -ex
-          export KIND_VERSION=v0.16.0
+          export KIND_VERSION=v0.27.0
           curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64"
           chmod +x ./kind-linux-amd64
           sudo mv ./kind-linux-amd64 /usr/local/bin/kind
       - run: |
           set -ex
-          export TAG=v5.2.2
+          export TAG=v5.6.0
           curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
       - run: |
           set -ex
           go get -v -t -d ./...
           test/e2e.sh
       - slack/notify-on-failure:
           only_for_branches: main
-
   release-dry-run:
     docker:
-      - image: golang:1.19-bullseye
-    environment:
-      DOCKER_CLI_EXPERIMENTAL: enabled
+      - image: golang:1.24-bookworm
     steps:
       - checkout
       - setup_remote_docker
       # https://discuss.circleci.com/t/arm-version-of-remote-docker/41624
       - run: ssh remote-docker "sudo apt-get update; sudo apt-get install -y qemu-user-static binfmt-support"
       - run: git fetch --tags
-      - run: go install github.com/goreleaser/goreleaser@latest
+      - run: go install github.com/goreleaser/goreleaser/v2@latest
       - run: |
+          set -e
           pushd /tmp
-          curl -O https://download.docker.com/linux/debian/dists/bullseye/pool/stable/amd64/docker-ce-cli_20.10.17~3-0~debian-bullseye_amd64.deb
-          dpkg -i *.deb
-          rm -f *.deb
+          apt-get update && apt-get install -y \
+            ca-certificates \
+            curl \
+            gnupg \
+            lsb-release
+          mkdir -p /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+          echo \
+            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
+            $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+          apt-get update
+          apt-get install -y docker-ce-cli docker-buildx-plugin
+          docker --version
+          rm -rf /var/lib/apt/lists/*
+
           popd
-      - run: goreleaser --debug --rm-dist --skip-publish --snapshot
+      - run: goreleaser --verbose --clean --skip=publish --snapshot
       - slack/notify-on-failure:
           only_for_branches: main
-
   release:
     docker:
-      - image: golang:1.19-bullseye
-    environment:
-      DOCKER_CLI_EXPERIMENTAL: enabled
+      - image: golang:1.24-bookworm
     steps:
       - checkout
       - setup_remote_docker
       # https://discuss.circleci.com/t/arm-version-of-remote-docker/41624
       - run: ssh remote-docker "sudo apt-get update; sudo apt-get install -y qemu-user-static binfmt-support"
       - run: git fetch --tags
-      - run: go install github.com/goreleaser/goreleaser@latest
+      - run: go install github.com/goreleaser/goreleaser/v2@latest
       - run: |
+          set -e
           pushd /tmp
-          curl -O https://download.docker.com/linux/debian/dists/bullseye/pool/stable/amd64/docker-ce-cli_20.10.17~3-0~debian-bullseye_amd64.deb
-          dpkg -i *.deb
-          rm -f *.deb
+          apt-get update && apt-get install -y \
+            ca-certificates \
+            curl \
+            gnupg \
+            lsb-release
+          mkdir -p /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+          echo \
+            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
+            $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+          apt-get update
+          apt-get install -y docker-ce-cli docker-buildx-plugin
+          docker --version
+          rm -rf /var/lib/apt/lists/*
+
           popd
       - run: ./hack/release.sh
       - slack/status:
           mentions: "nick"
-
 workflows:
   version: 2
   build:
@@ -130,8 +137,8 @@ workflows:
     jobs:
       - release:
           context:
-          - Tilt Release CLI Context
-          - Tilt Docker Login Context
+            - Tilt Release CLI Context
+            - Tilt Docker Login Context
           filters:
             branches:
               only: never-release-on-a-branch

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,3 +1,4 @@
+version: 2
 project_name: ctlptl
 builds:
 - main: ./cmd/ctlptl/main.go
@@ -15,21 +16,21 @@ builds:
   - goos: windows
     goarch: arm64
 archives:
-- name_template: "{{ .ProjectName }}.{{ .Version }}.{{ .Os }}.{{ .Arch }}"
-  replacements:
-    windows: windows
-    darwin: mac
-    linux: linux
-    386: i386
-    amd64: x86_64
+- name_template: >-
+    {{ .ProjectName }}.{{ .Version }}.
+    {{- if eq .Os "darwin"}}mac
+    {{- else }}{{ .Os }}{{ end }}.
+    {{- if eq .Arch "amd64" }}x86_64
+    {{- else if eq .Arch "386" }}i386
+    {{- else }}{{ .Arch }}{{ end }}
   format_overrides:
     - goos: windows
       format: zip
 checksum:
   name_template: 'checksums.txt'
 snapshot:
-  name_template: "{{ .Tag }}-next"
-  
+  version_template: "{{ .Tag }}-next"
+
 changelog:
   sort: asc
   use: github
@@ -40,9 +41,9 @@ changelog:
     - '^cleanup:'
     - '^circleci:'
     - '^ci:'
-    
+
 brews:
-- tap:
+- repository:
     owner: tilt-dev
     name: homebrew-tap
   commit_author:
@@ -53,7 +54,7 @@ brews:
   description: "Making local Kubernetes clusters easy to set up and tear down"
   install: |
     bin.install "ctlptl"
-    
+
     # Install bash completion
     output = Utils.safe_popen_read("#{bin}/ctlptl", "completion", "bash")
     (bash_completion/"ctlptl").write output
@@ -67,9 +68,9 @@ brews:
     (fish_completion/"ctlptl.fish").write output
   test: |
     system "#{bin}/ctlptl version"
-scoop:
-  url_template: "https://github.com/tilt-dev/ctlptl/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
-  bucket:
+scoops:
+- url_template: "https://github.com/tilt-dev/ctlptl/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
+  repository:
     owner: tilt-dev
     name: scoop-bucket
   commit_author:
@@ -133,7 +134,7 @@ docker_manifests:
   - docker/tilt-{{ .ProjectName }}:{{ .Tag }}-amd64
   - docker/tilt-{{ .ProjectName }}:{{ .Tag }}-arm64
 
-  
+
 # Uncomment these lines if you want to experiment with other
 # parts of the release process without releasing new binaries.
 # release:

diff --git a/INSTALL.md b/INSTALL.md
@@ -40,21 +40,21 @@ go install github.com/tilt-dev/ctlptl/cmd/ctlptl@latest
 On macOS:
 
 ```bash
-CTLPTL_VERSION="0.8.11"
+CTLPTL_VERSION="0.8.40"
 curl -fsSL https://github.com/tilt-dev/ctlptl/releases/download/v$CTLPTL_VERSION/ctlptl.$CTLPTL_VERSION.mac.x86_64.tar.gz | sudo tar -xzv -C /usr/local/bin ctlptl
 ```
 
 On Linux:
 
 ```bash
-CTLPTL_VERSION="0.8.11"
+CTLPTL_VERSION="0.8.40"
 curl -fsSL https://github.com/tilt-dev/ctlptl/releases/download/v$CTLPTL_VERSION/ctlptl.$CTLPTL_VERSION.linux.x86_64.tar.gz | sudo tar -xzv -C /usr/local/bin ctlptl
 ```
 
 On Windows:
 
 ```powershell
-$CTLPTL_VERSION = "0.8.11"
+$CTLPTL_VERSION = "0.8.40"
 Invoke-WebRequest "https://github.com/tilt-dev/ctlptl/releases/download/v$CTLPTL_VERSION/ctlptl.$CTLPTL_VERSION.windows.x86_64.zip" -OutFile "ctlptl.zip"
 Expand-Archive "ctlptl.zip" -DestinationPath "ctlptl"
 Move-Item -Force -Path "ctlptl\ctlptl.exe" -Destination "$home\bin\ctlptl.exe"

diff --git a/Makefile b/Makefile
@@ -22,13 +22,12 @@ e2e:
 
 .PHONY: golangci-lint
 golangci-lint: $(GOLANGCILINT)
-	$(GOPATH)/bin/golangci-lint run --verbose
+	$(GOPATH)/bin/golangci-lint run --verbose --timeout=120s
 
 $(GOLANGCILINT):
-	(cd /; GO111MODULE=on GOPROXY="direct" GOSUMDB=off go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.30.0)
+	(cd /; GO111MODULE=on GOPROXY="direct" GOSUMDB=off go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8)
 
 BUILDER=buildx-multiarch
 
 publish-ci-image:
-	docker buildx inspect $(BUILDER) || docker buildx create --name=$(BUILDER) --driver=docker-container --driver-opt=network=host
-	docker buildx build --builder=$(BUILDER) --pull --platform=linux/amd64,linux/arm64 --push -t docker/tilt-ctlptl-ci -f .circleci/Dockerfile .
+	./hack/publish-ci-image.sh
diff --git a/README.md b/README.md
@@ -21,7 +21,8 @@ declare your local cluster with YAML and use `ctlptl` to set it up.
 
 Install your cluster of choice: [Docker for
 Desktop](https://www.docker.com/products/docker-desktop),
-[Kind](https://kind.sigs.k8s.io/), or
+[Kind](https://kind.sigs.k8s.io/), 
+[k3d](https://k3d.io/) or
 [Minikube](https://minikube.sigs.k8s.io/). Then run:
 
 ### Homebrew (Mac/Linux)
@@ -37,6 +38,12 @@ scoop bucket add tilt-dev https://github.com/tilt-dev/scoop-bucket
 scoop install ctlptl
 ```
 
+### Go install
+
+```
+go install github.com/tilt-dev/ctlptl/cmd/ctlptl@latest
+```
+
 ### Alternative Options
 
 If automatic installers aren't your cup of tea, check out the [installation

diff --git a/docs/ctlptl.md b/docs/ctlptl.md
@@ -27,4 +27,4 @@ Mess around with local Kubernetes clusters without consequences
 * [ctlptl socat](ctlptl_socat.md)	 - Use socat to connect components. Experimental.
 * [ctlptl version](ctlptl_version.md)	 - Current ctlptl version
 
-###### Auto generated by spf13/cobra on 28-Oct-2022
+###### Auto generated by spf13/cobra on 22-Mar-2025
diff --git a/docs/ctlptl_analytics.md b/docs/ctlptl_analytics.md
@@ -17,4 +17,4 @@ ctlptl analytics
 * [ctlptl](ctlptl.md)	 - Mess around with local Kubernetes clusters without consequences
 * [ctlptl analytics opt](ctlptl_analytics_opt.md)	 - opt-in or -out to tilt-dev analytics collection/upload
 
-###### Auto generated by spf13/cobra on 28-Oct-2022
+###### Auto generated by spf13/cobra on 22-Mar-2025
diff --git a/docs/ctlptl_analytics_opt.md b/docs/ctlptl_analytics_opt.md
@@ -16,4 +16,4 @@ ctlptl analytics opt [flags]
 
 * [ctlptl analytics](ctlptl_analytics.md)	 - info and status about tilt-dev analytics
 
-###### Auto generated by spf13/cobra on 28-Oct-2022
+###### Auto generated by spf13/cobra on 22-Mar-2025
Original file line number	Diff line number	Diff line change
		@@ -16,4 +16,4 @@ ctlptl analytics opt [flags]

		* [ctlptl analytics](ctlptl_analytics.md) - info and status about tilt-dev analytics

		###### Auto generated by spf13/cobra on 28-Oct-2022
		###### Auto generated by spf13/cobra on 22-Mar-2025