update go to 1.22 and debian to bookworm

replicatedhq · Aug 5, 2024 · eaee801 · eaee801
1 parent 666360b
commit eaee801
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version-file: go.mod
 
       - name: setup env
         run: |
@@ -26,8 +26,8 @@ jobs:
     needs: validate-go-mod
     steps:
     - uses: actions/setup-go@v5
-      with:
-        go-version: 1.19
+        with:
+          go-version-file: go.mod
     - name: setup env
       run: |
         echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -43,8 +43,8 @@ jobs:
     needs: validate-go-mod
     steps:
     - uses: actions/setup-go@v5
-      with:
-        go-version: 1.19
+        with:
+          go-version-file: go.mod
     - name: setup env
       run: |
         echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV

diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/replicatedhq/kurl-testgrid
 
-go 1.19
+go 1.21
+
+toolchain go1.22.0
 
 require (
 	filippo.io/age v1.1.1
@@ -133,21 +135,21 @@ exclude (
 	k8s.io/client-go v1.5.0
 	k8s.io/client-go v1.5.1
 	k8s.io/client-go v1.5.2
-	k8s.io/client-go v10.0.0+incompatible
-	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/client-go v2.0.0+incompatible
 	k8s.io/client-go v2.0.0-alpha.1+incompatible
-	k8s.io/client-go v3.0.0+incompatible
+	k8s.io/client-go v2.0.0+incompatible
 	k8s.io/client-go v3.0.0-beta.0+incompatible
-	k8s.io/client-go v4.0.0+incompatible
+	k8s.io/client-go v3.0.0+incompatible
 	k8s.io/client-go v4.0.0-beta.0+incompatible
+	k8s.io/client-go v4.0.0+incompatible
 	k8s.io/client-go v5.0.0+incompatible
 	k8s.io/client-go v5.0.1+incompatible
 	k8s.io/client-go v6.0.0+incompatible
 	k8s.io/client-go v7.0.0+incompatible
 	k8s.io/client-go v8.0.0+incompatible
-	k8s.io/client-go v9.0.0+incompatible
 	k8s.io/client-go v9.0.0-invalid+incompatible
+	k8s.io/client-go v9.0.0+incompatible
+	k8s.io/client-go v10.0.0+incompatible
+	k8s.io/client-go v11.0.0+incompatible
+	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
+	k8s.io/client-go v12.0.0+incompatible
 )
diff --git a/tgapi/Dockerfile.okteto b/tgapi/Dockerfile.okteto
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.3
-FROM golang:1.19
+FROM golang:1.22
 
 EXPOSE 3000
 EXPOSE 6060

diff --git a/tgapi/Dockerfile.skaffold b/tgapi/Dockerfile.skaffold
@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.22
 
 EXPOSE 3000
 EXPOSE 6060

diff --git a/tgapi/deploy/Dockerfile b/tgapi/deploy/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.22
 
 ADD ./go.* /go/src/github.com/replicatedhq/kurl-testgrid/
 ADD ./tgapi /go/src/github.com/replicatedhq/kurl-testgrid/tgapi
@@ -17,7 +17,7 @@ RUN go build -o ./bin/tgapi \
     ./cmd/api
 
 
-FROM debian:buster-slim
+FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y --no-install-recommends \
     curl ca-certificates git \
     && rm -rf /var/lib/apt/lists/*

diff --git a/tgrun/Dockerfile b/tgrun/Dockerfile
@@ -1,5 +1,5 @@
 ############################
-FROM golang:1.19-alpine AS builder
+FROM golang:1.22-alpine AS builder
 
 RUN apk update && apk add --no-cache git ca-certificates && update-ca-certificates