From 97124546461b1b8f496c84b83c511e02a2de9afc Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Tue, 3 Oct 2023 09:20:44 -0700 Subject: [PATCH 1/4] Update Go to 1.21.1 Apparently something in our dependency tree [no longer builds][1] on Go 1.19. I've gone ahead and bumped to the latest version of Go to fix this. We could also bump more conveniently to 1.20, but I figured it was better to stay on the latest; happy to change that if we'd rather just go to 1.20.8. [1]: https://github.com/linkerd/dev/actions/runs/6395603721/job/17359636186#step:4:757 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 73970e0..bb13e9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -267,7 +267,7 @@ COPY --link --from=tools-script /bin/* /bin/ ## # A Go build environment. -FROM docker.io/library/golang:1.19.8 as go +FROM docker.io/library/golang:1.21.1 as go RUN --mount=type=cache,from=apt-base,source=/etc/apt,target=/etc/apt,ro \ --mount=type=cache,from=apt-base,source=/var/cache/apt,target=/var/cache/apt \ --mount=type=cache,from=apt-base,source=/var/lib/apt/lists,target=/var/lib/apt/lists,ro \ From 6d8d21355ec7ae356735c8acf6477e95491ae68b Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Tue, 3 Oct 2023 10:02:37 -0700 Subject: [PATCH 2/4] oh there's all this other stuff too --- Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb13e9c..73a0ee2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -197,38 +197,38 @@ COPY --link bin/just-cargo /bin/ ## Go tools ## -FROM docker.io/library/golang:1.19.8 as go-delve +FROM docker.io/library/golang:1.21.1 as go-delve RUN go install github.com/go-delve/delve/cmd/dlv@latest -FROM docker.io/library/golang:1.19.8 as go-impl +FROM docker.io/library/golang:1.21.1 as go-impl RUN go install github.com/josharian/impl@latest -FROM docker.io/library/golang:1.19.8 as go-outline +FROM docker.io/library/golang:1.21.1 as go-outline RUN go install github.com/ramya-rao-a/go-outline@latest -FROM docker.io/library/golang:1.19.8 as go-protoc +FROM docker.io/library/golang:1.21.1 as go-protoc RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1 RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 -FROM docker.io/library/golang:1.19.8 as golangci-lint +FROM docker.io/library/golang:1.21.1 as golangci-lint RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest -FROM docker.io/library/golang:1.19.8 as gomodifytags +FROM docker.io/library/golang:1.21.1 as gomodifytags RUN go install github.com/fatih/gomodifytags@latest -FROM docker.io/library/golang:1.19.8 as gopkgs +FROM docker.io/library/golang:1.21.1 as gopkgs RUN go install github.com/uudashr/gopkgs/v2/cmd/gopkgs@latest -FROM docker.io/library/golang:1.19.8 as goplay +FROM docker.io/library/golang:1.21.1 as goplay RUN go install github.com/haya14busa/goplay/cmd/goplay@latest -FROM docker.io/library/golang:1.19.8 as gopls +FROM docker.io/library/golang:1.21.1 as gopls RUN go install golang.org/x/tools/gopls@latest -FROM docker.io/library/golang:1.19.8 as gotests +FROM docker.io/library/golang:1.21.1 as gotests RUN go install github.com/cweill/gotests/gotests@latest -FROM docker.io/library/golang:1.19.8 as gotestsum +FROM docker.io/library/golang:1.21.1 as gotestsum RUN go install gotest.tools/gotestsum@v0.4.2 FROM scratch as tools-go From 07edf0dac35f8a4fcc4d5b84d8cc7e8ec1411d70 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Tue, 3 Oct 2023 10:31:47 -0700 Subject: [PATCH 3/4] sync k3s images --- k3s-images.json | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/k3s-images.json b/k3s-images.json index 0487e15..8f9dce9 100644 --- a/k3s-images.json +++ b/k3s-images.json @@ -1,26 +1,27 @@ { "name": "docker.io/rancher/k3s", "channels": { - "stable": "v1.26.4-k3s1", - "latest": "v1.27.2-k3s1", + "stable": "v1.27.6-k3s1", + "latest": "v1.28.2-k3s1", "v1.20": "v1.20.15-k3s1", "v1.21": "v1.21.14-k3s1", "v1.22": "v1.22.17-k3s1", "v1.23": "v1.23.17-k3s1", - "v1.24": "v1.24.14-k3s1", - "v1.25": "v1.25.10-k3s1", - "v1.26": "v1.26.5-k3s1", - "v1.27": "v1.27.2-k3s1" + "v1.24": "v1.24.17-k3s1", + "v1.25": "v1.25.14-k3s1", + "v1.26": "v1.26.9-k3s1", + "v1.27": "v1.27.6-k3s1", + "v1.28": "v1.28.2-k3s1" }, "digests": { "v1.20.15-k3s1": "sha256:0e49b63b8ee234e308ff578682f8f4f2f95bffda7ba75077e5da29548cd2a6b3", "v1.21.14-k3s1": "sha256:85745e4fa94050ead9c8a935c2a2136bfdfe107c3592fb229fb6aff26640ca72", "v1.22.17-k3s1": "sha256:c35db9bc45a073607f821343d94104ac2d9ca0ef85892b80fce21dd89583fb14", "v1.23.17-k3s1": "sha256:6f2b6d6d756b3f2f04c864ca2773435b9f19473a3568893720aef46f2cd47606", - "v1.24.14-k3s1": "sha256:2835a8194b85198bdc10e9172920f19f2f1b0b3f81dca8c4ffc85e84f49db470", - "v1.25.10-k3s1": "sha256:fbb83e55b0b7933d5e26869aacc35460d778f0ed0a479560023184dc4ef83ff7", - "v1.26.4-k3s1": "sha256:ff61834317d7f0a58e3366546fe301b7e6802a36c39126de686d9eb9e64f81cf", - "v1.26.5-k3s1": "sha256:ac34a7e8a2811639abc5c2aec9f918dcab1d0d9a2ed6a031e016591dc5d6df25", - "v1.27.2-k3s1": "sha256:66d13a1d6f92c7aa41f7734d5e97526a868484071d7467feb69dd868ad653254" + "v1.24.17-k3s1": "sha256:9e034931999854c6210b86a0708fde66b91370459fa077a4f9d008e7f51fc51d", + "v1.25.14-k3s1": "sha256:5f7b660e6f2a6dd712350a8f1fd5ad6beafd62a06df5e2f46e432e6f151652fc", + "v1.26.9-k3s1": "sha256:f4639f27230e24029798705f52d2acbdfea0d0d723a1f09c5aa29ae94c73ba32", + "v1.27.6-k3s1": "sha256:656a9f3cf74e6a9cc64671bd0b71ae9a0a465999329a3f0a51a3c6c2f515134d", + "v1.28.2-k3s1": "sha256:8c2599ecfca826bb4f63de10d31c2d54355965cbe2eaa63e7d2ebb7a79ae6772" } -} +} \ No newline at end of file From 5d07862588b9f7d487813601d59b1fd58f08a7d8 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Tue, 3 Oct 2023 10:50:49 -0700 Subject: [PATCH 4/4] lol --- k3s-images.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k3s-images.json b/k3s-images.json index 8f9dce9..cc5dffa 100644 --- a/k3s-images.json +++ b/k3s-images.json @@ -24,4 +24,4 @@ "v1.27.6-k3s1": "sha256:656a9f3cf74e6a9cc64671bd0b71ae9a0a465999329a3f0a51a3c6c2f515134d", "v1.28.2-k3s1": "sha256:8c2599ecfca826bb4f63de10d31c2d54355965cbe2eaa63e7d2ebb7a79ae6772" } -} \ No newline at end of file +}