Merge pull request #345 from m00g3n/317-update-golang-version

Update golang version to 1.23.0
kyma-project · Sep 10, 2024 · 57c6730 · 57c6730
2 parents 3fb38f5 + c8caf29
commit 57c6730
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 25 deletions.
diff --git a/.github/workflows/gateway.yaml b/.github/workflows/gateway.yaml
@@ -109,7 +109,7 @@ jobs:
       - name: Set up go environment
         uses: actions/setup-go@v4
         with:
-          go-version: 1.22.4
+          go-version: 1.23.0
       - name: Install k3d
         env:
           K3D_URL: https://github.com/raw/k3d-io/k3d/main/install.sh

diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -19,15 +19,15 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.4'
+          go-version: '1.23.0'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4.0.0
+        uses: golangci/golangci-lint-action@v6.0.0
         with:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
           # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.56.2
+          version: v1.58.2
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

diff --git a/.github/workflows/reusable-k3d-agent-test.yml b/.github/workflows/reusable-k3d-agent-test.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set up go environment
         uses: actions/setup-go@v4
         with:
-          go-version: 1.22.4
+          go-version: 1.23.0
       - name: install-k3d
         env:
           K3D_URL: https://github.com/raw/k3d-io/k3d/main/install.sh

diff --git a/.github/workflows/run-validation.yaml b/.github/workflows/run-validation.yaml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up go environment
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.4
+        go-version: 1.23.0
 
     - name: Run integration tests without lifecycle-manager
       run: make -C hack/ci run-without-lifecycle-manager
diff --git a/.github/workflows/run-vuln-check.yaml b/.github/workflows/run-vuln-check.yaml
@@ -15,5 +15,5 @@ jobs:
     - name: vulncheck
       uses: golang/govulncheck-action@v1
       with:
-        go-version-input: 1.22.4
+        go-version-input: 1.23.0
         go-package: ./...
diff --git a/.github/workflows/validator.yaml b/.github/workflows/validator.yaml
@@ -106,7 +106,7 @@ jobs:
       - name: Set up go environment
         uses: actions/setup-go@v4
         with:
-          go-version: 1.22.4
+          go-version: 1.23.0
       - name: Install k3d
         env:
           K3D_URL: https://github.com/raw/k3d-io/k3d/main/install.sh

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22.6-alpine as builder
+FROM golang:1.23.0-alpine3.20 as builder
 
 WORKDIR /acm-workspace
 

diff --git a/components/central-application-connectivity-validator/Dockerfile b/components/central-application-connectivity-validator/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.6-alpine as builder
+FROM golang:1.23.0-alpine3.20 as builder
 
 ARG DOCK_PKG_DIR=/go/src/github.com/kyma-project/kyma/components/central-application-connectivity-validator
 WORKDIR $DOCK_PKG_DIR

diff --git a/components/central-application-connectivity-validator/go.mod b/components/central-application-connectivity-validator/go.mod
@@ -2,7 +2,7 @@ module github.com/kyma-project/kyma/components/central-application-connectivity-
 
 go 1.22.0
 
-toolchain go1.22.6
+toolchain go1.23.0
 
 require (
 	github.com/gorilla/mux v1.8.1

diff --git a/components/central-application-gateway/Dockerfile b/components/central-application-gateway/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.6-alpine as builder
+FROM golang:1.23.0-alpine3.20 as builder
 
 ARG DOCK_PKG_DIR=/go/src/github.com/kyma-project/kyma/components/central-application-gateway
 WORKDIR $DOCK_PKG_DIR

diff --git a/components/central-application-gateway/go.mod b/components/central-application-gateway/go.mod
@@ -2,7 +2,7 @@ module github.com/kyma-project/kyma/components/central-application-gateway
 
 go 1.22.0
 
-toolchain go1.22.6
+toolchain go1.23.0
 
 require (
 	github.com/gorilla/mux v1.8.1

diff --git a/components/compass-runtime-agent/Dockerfile b/components/compass-runtime-agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.6-alpine as builder
+FROM golang:1.23.0-alpine3.20 as builder
 
 
 ARG DOCK_PKG_DIR=/compass-runtime-agent

diff --git a/components/compass-runtime-agent/go.mod b/components/compass-runtime-agent/go.mod
@@ -2,7 +2,7 @@ module github.com/kyma-project/kyma/components/compass-runtime-agent
 
 go 1.22.0
 
-toolchain go1.22.6
+toolchain go1.23.0
 
 require (
 	github.com/google/uuid v1.6.0

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kyma-project/application-connector-manager
 
-go 1.22.5
+go 1.23.0
 
 require (
 	github.com/onsi/ginkgo/v2 v2.20.1

diff --git a/tests/Dockerfile.compass-runtime-agent b/tests/Dockerfile.compass-runtime-agent
@@ -1,4 +1,4 @@
-FROM golang:1.22.6-alpine as builder
+FROM golang:1.23.0-alpine as builder
 
 WORKDIR /compass-test/
 

diff --git a/tests/Dockerfile.connectivity-validator b/tests/Dockerfile.connectivity-validator
@@ -1,4 +1,4 @@
-FROM golang:1.22.6-alpine as builder
+FROM golang:1.23.0-alpine as builder
 
 WORKDIR /validator-test/
 

diff --git a/tests/Dockerfile.gateway b/tests/Dockerfile.gateway
@@ -1,4 +1,4 @@
-FROM golang:1.22.6-alpine as builder
+FROM golang:1.23.0-alpine as builder
 
 WORKDIR /gateway-test/
 

diff --git a/tests/Dockerfile.mockapp b/tests/Dockerfile.mockapp
@@ -1,4 +1,4 @@
-FROM golang:1.22.6-alpine as builder
+FROM golang:1.23.0-alpine as builder
 
 WORKDIR /mock-app/
 

diff --git a/tests/go.mod b/tests/go.mod
@@ -86,5 +86,6 @@ replace (
 	golang.org/x/crypto => golang.org/x/crypto v0.26.0
 	golang.org/x/net => golang.org/x/net v0.28.0
 	golang.org/x/text => golang.org/x/text v0.18.0
+	golang.org/x/time => golang.org/x/time v0.6.0
 	google.golang.org/protobuf => google.golang.org/protobuf v1.33.0
 )
diff --git a/tests/go.sum b/tests/go.sum
@@ -397,11 +397,8 @@ golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
 golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
 golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
 golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
+golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=