Update golang to 1.23 (#276)

platform9 · Nov 25, 2024 · 127b87f · 127b87f
1 parent 32695aa
commit 127b87f
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/anchore.yml b/.github/workflows/anchore.yml
@@ -36,11 +36,7 @@ jobs:
     - name: Build the Docker image
       run: docker build . --file Dockerfile --tag platform9/luigi_dev:latest
     - name: Run the Anchore Grype scan action
-<<<<<<< HEAD
-      uses: anchore/scan-action@v3
-=======
       uses: anchore/scan-action@v5
->>>>>>> 89d432e (Bump anchore/scan-action from 4 to 5 (#263))
       id: scan
       with:
         image: "platform9/luigi_dev:latest"

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

diff --git a/Makefile b/Makefile
@@ -155,7 +155,7 @@ $(ENVTEST): $(LOCALBIN)
 	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 
 img-test:
-	docker run --rm  -v $(SRCROOT):/luigi -w /luigi golang:1.22  bash -c "GOFLAGS=-buildvcs=false make test"
+	docker run --rm  -v $(SRCROOT):/luigi -w /luigi golang:1.23  bash -c "GOFLAGS=-buildvcs=false make test"
 
 img-build: $(BUILD_DIR) img-test
 	docker build --network host . -t ${IMG}

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

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

diff --git a/dhcp-controller/dhcpserver/go.mod b/dhcp-controller/dhcpserver/go.mod
@@ -1,6 +1,6 @@
 module dhcpserver
 
-go 1.21
+go 1.23
 
 require (
 	github.com/fsnotify/fsnotify v1.6.0

diff --git a/dhcp-controller/go.mod b/dhcp-controller/go.mod
@@ -1,6 +1,6 @@
 module dhcp-controller
 
-go 1.21
+go 1.23
 
 require (
 	github.com/apparentlymart/go-cidr v1.1.0

diff --git a/go.mod b/go.mod
@@ -2,6 +2,8 @@ module github.com/platform9/luigi
 
 go 1.23
 
+toolchain go1.23.3
+
 require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/go-logr/logr v1.4.1

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

diff --git a/hostplumber/Makefile b/hostplumber/Makefile
@@ -154,7 +154,7 @@ $(ENVTEST): $(LOCALBIN)
 	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 
 img-test:
-	docker run --rm  -v $(SRCROOT):/hostplumber -w /hostplumber golang:1.22  bash -c "make test"
+	docker run --rm  -v $(SRCROOT):/hostplumber -w /hostplumber golang:1.23  bash -c "make test"
 
 img-build: $(BUILD_DIR) img-test
 	docker build --network host . -t ${IMG}

diff --git a/hostplumber/go.mod b/hostplumber/go.mod
@@ -1,8 +1,8 @@
 module hostplumber
 
-go 1.22.0
+go 1.23
 
-toolchain go1.22.7
+toolchain go1.23.3
 
 require github.com/vishvananda/netlink v1.1.0
 

diff --git a/yoshi/Dockerfile b/yoshi/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22 AS builder
+FROM golang:1.23 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 

diff --git a/yoshi/go.mod b/yoshi/go.mod
@@ -1,8 +1,8 @@
 module github.com/platform9/luigi/yoshi
 
-go 1.22
+go 1.23
 
-toolchain go1.22.7
+toolchain go1.23.3
 
 require (
 	github.com/go-logr/logr v1.3.0