Upgrade to Go 1.23 meshery#575

Swastik-Swarup-Dash · Jan 2, 2025 · 31ac40e · 31ac40e
1 parent 0eacb42
commit 31ac40e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/approve-to-run-ci.yml b/.github/workflows/approve-to-run-ci.yml
@@ -11,7 +11,7 @@ jobs:
         strategy:
           matrix:
             platform: [ubuntu-22.04]
-            go-version: [1.21.x]
+            go-version: [1.23.x]
         runs-on: ${{ matrix.platform }}
         steps:
           - uses: actions/setup-go@v4
@@ -37,7 +37,7 @@ jobs:
           - name: Set up Go
             uses: actions/setup-go@v4
             with:
-              go-version: 1.21.x
+              go-version: 1.23.x
               cache: true
               cache-dependency-path: go.sum
           - name: Run go mod tidy
@@ -54,7 +54,7 @@ jobs:
           - name: Set up Go
             uses: actions/setup-go@v4
             with:
-              go-version: 1.21.x
+              go-version: 1.23.x
               cache: true
               cache-dependency-path: go.sum
           - name: Set up test-env
@@ -80,7 +80,7 @@ jobs:
           - name: Set up Go
             uses: actions/setup-go@v4
             with:
-              go-version: 1.21.x
+              go-version: 1.23.x
               cache: true
               cache-dependency-path: go.sum
           - name: Build

diff --git a/.github/workflows/error-ref-publisher.yaml b/.github/workflows/error-ref-publisher.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.21
+          go-version: 1.23
 
       - name: Run utility
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21 as builder 
+FROM golang:1.23 as builder 
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/Makefile b/Makefile
@@ -121,6 +121,8 @@ test: manifests generate fmt vet ## Run tests.
 
 ##@ Build
 
++GO_VERSION ?= 1.23
++export GO_VERSION 
 .PHONY: build
 build: generate fmt vet manifests ## Build manager binary.
 	go build -o bin/manager main.go

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/layer5io/meshery-operator
 
-go 1.21
+go 1.23
 
 replace (
 	k8s.io/api => k8s.io/api v0.25.3
@@ -15,7 +15,6 @@ require (
 	github.com/go-logr/logr v1.3.0
 	github.com/onsi/ginkgo/v2 v2.13.0
 	github.com/onsi/gomega v1.27.10
-	github.com/sirupsen/logrus v1.8.1
 	k8s.io/api v0.26.1
 	k8s.io/apiextensions-apiserver v0.26.1
 	k8s.io/apimachinery v0.26.1

diff --git a/go.sum b/go.sum
@@ -135,15 +135,12 @@ github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJf
 github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@@ -202,7 +199,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=