From 0365373784a0ee9a9b5bd3812ee2f3f062407b75 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 22 Jan 2025 17:16:18 +0100 Subject: [PATCH 1/3] Bump Golang to 1.23 Signed-off-by: Pavol Loffay --- .circleci/config.yml | 6 +++--- Dockerfile | 2 +- go.mod | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7aca8ca4d..ea98047ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: golang:1.22 + - image: golang:1.23 steps: - checkout - run: | @@ -11,7 +11,7 @@ jobs: lint: docker: - - image: golang:1.22 + - image: golang:1.23 steps: - checkout - run: | @@ -45,7 +45,7 @@ jobs: generate: docker: - - image: golang:1.22 + - image: golang:1.23 steps: - checkout - run: | diff --git a/Dockerfile b/Dockerfile index 07a6e04c7..864eb2c80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.22.8-alpine3.20 as builder +FROM --platform=$BUILDPLATFORM golang:1.23.5-alpine3.20 as builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index bad1ef668..c28e0c1f0 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/observatorium/api -go 1.22.0 - -toolchain go1.22.8 +go 1.23.0 require ( github.com/brancz/kube-rbac-proxy v0.16.1 From 830b0a32b3b567654acc85b5cd97269ad8a2b320 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 22 Jan 2025 17:24:27 +0100 Subject: [PATCH 2/3] Bump Golang to 1.23 Signed-off-by: Pavol Loffay --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ea98047ad..f450f4ba1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: - run: | apt-get update && apt-get -y install xz-utils unzip openssl sudo rm -rf /usr/local/go - wget -qO- https://golang.org/dl/go1.21.7.linux-amd64.tar.gz | sudo tar -C /usr/local -xzf - + wget -qO- https://golang.org/dl/go1.23.5.linux-amd64.tar.gz | sudo tar -C /usr/local -xzf - export PATH=$PATH:/usr/local/go/bin go version make test --always-make @@ -38,7 +38,7 @@ jobs: - checkout - run: | sudo rm -rf /usr/local/go - wget -qO- https://golang.org/dl/go1.21.7.linux-amd64.tar.gz | sudo tar -C /usr/local -xzf - + wget -qO- https://golang.org/dl/go1.23.5.linux-amd64.tar.gz | sudo tar -C /usr/local -xzf - export PATH=$PATH:/usr/local/go/bin go version make test-e2e From 8d75968c47f859b90070b6f3a652332d7268a382 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 22 Jan 2025 17:36:35 +0100 Subject: [PATCH 3/3] Bump Golang to 1.23 Signed-off-by: Pavol Loffay --- Dockerfile.e2e-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.e2e-test b/Dockerfile.e2e-test index 72f80d2e6..7bf6f497d 100644 --- a/Dockerfile.e2e-test +++ b/Dockerfile.e2e-test @@ -1,4 +1,4 @@ -FROM golang:1.22.8-alpine3.20 as builder +FROM golang:1.23.5-alpine3.20 as builder RUN apk add --update --no-cache ca-certificates tzdata git make bash && update-ca-certificates