From 73a7f574c29949c82b2f42eea92dedea155d46f3 Mon Sep 17 00:00:00 2001 From: Alice Wasko Date: Thu, 16 May 2024 18:35:32 -0700 Subject: [PATCH] update go Signed-off-by: Alice Wasko --- DEPENDENCIES.md | 2 +- docker/base-python/Dockerfile | 2 +- docker/test-http/Dockerfile | 2 +- go.mod | 2 +- tools/src/chart-doc-gen/go.mod | 2 +- tools/src/crane/go.mod | 2 +- tools/src/ct/go.mod | 2 +- tools/src/golangci-lint/go.mod | 2 +- tools/src/ocibuild/go.mod | 2 +- tools/src/yq/go.mod | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 5bb694c40f..ff3d2c62f7 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -3,7 +3,7 @@ following Free and Open Source software: Name Version License(s) ---- ------- ---------- - the Go language standard library ("std") v1.21.10 3-clause BSD license + the Go language standard library ("std") v1.22.3 3-clause BSD license dario.cat/mergo v1.0.0 3-clause BSD license github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 MIT license github.com/MakeNowJust/heredoc v1.0.0 MIT license diff --git a/docker/base-python/Dockerfile b/docker/base-python/Dockerfile index 468eff5545..fdec21b4e9 100644 --- a/docker/base-python/Dockerfile +++ b/docker/base-python/Dockerfile @@ -76,7 +76,7 @@ RUN apk --no-cache add \ # 'python3' versions above. RUN pip3 install "Cython<3.0" pip-tools==7.3 -RUN curl --fail -L https://dl.google.com/go/go1.21.10.linux-amd64.tar.gz | tar -C /usr/local -xzf - +RUN curl --fail -L https://dl.google.com/go/go1.22.3.linux-amd64.tar.gz | tar -C /usr/local -xzf - # The YAML parser is... special. To get the C version, we need to install Cython and libyaml, then # build it locally -- just using pip won't work. diff --git a/docker/test-http/Dockerfile b/docker/test-http/Dockerfile index 35312ecef0..968e5d7509 100644 --- a/docker/test-http/Dockerfile +++ b/docker/test-http/Dockerfile @@ -1,7 +1,7 @@ # The `test-http` image gets built by `pkg/kubeapply` for use by # various kubeapply-templated YAML files. -FROM golang:1.21 +FROM golang:1.22 COPY httptest.go /usr/local/bin/httptest.go RUN go build -o /usr/local/bin/httptest /usr/local/bin/httptest.go ENTRYPOINT ["/usr/local/bin/httptest"] diff --git a/go.mod b/go.mod index 5ee232a534..70b3cdb0df 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/emissary-ingress/emissary/v3 -go 1.21 +go 1.22 // If you're editing this file, there's a few things you should know: // diff --git a/tools/src/chart-doc-gen/go.mod b/tools/src/chart-doc-gen/go.mod index 5fc540201f..1fea7979c1 100644 --- a/tools/src/chart-doc-gen/go.mod +++ b/tools/src/chart-doc-gen/go.mod @@ -1,6 +1,6 @@ module local -go 1.21 +go 1.22 require kubepack.dev/chart-doc-gen v0.5.0 diff --git a/tools/src/crane/go.mod b/tools/src/crane/go.mod index 4ec406c841..1a0734ea49 100644 --- a/tools/src/crane/go.mod +++ b/tools/src/crane/go.mod @@ -1,6 +1,6 @@ module local -go 1.21 +go 1.22 require github.com/google/go-containerregistry v0.17.0 diff --git a/tools/src/ct/go.mod b/tools/src/ct/go.mod index 8432e2c989..892153619b 100644 --- a/tools/src/ct/go.mod +++ b/tools/src/ct/go.mod @@ -1,6 +1,6 @@ module local -go 1.21 +go 1.22 require github.com/helm/chart-testing/v3 v3.10.1 diff --git a/tools/src/golangci-lint/go.mod b/tools/src/golangci-lint/go.mod index b17bdf95f2..79e61c4a46 100644 --- a/tools/src/golangci-lint/go.mod +++ b/tools/src/golangci-lint/go.mod @@ -1,6 +1,6 @@ module local -go 1.21 +go 1.22 require github.com/golangci/golangci-lint v1.56.1 diff --git a/tools/src/ocibuild/go.mod b/tools/src/ocibuild/go.mod index a3ac308847..4b59779465 100644 --- a/tools/src/ocibuild/go.mod +++ b/tools/src/ocibuild/go.mod @@ -1,6 +1,6 @@ module local -go 1.21 +go 1.22 require github.com/datawire/ocibuild v0.0.3-0.20220131233601-25ee488931d1 diff --git a/tools/src/yq/go.mod b/tools/src/yq/go.mod index de108cddeb..b84cdc37ff 100644 --- a/tools/src/yq/go.mod +++ b/tools/src/yq/go.mod @@ -1,6 +1,6 @@ module local -go 1.21 +go 1.22 require github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37