From d1a93b08cdd0d817252f12f6b505765d5c1214d3 Mon Sep 17 00:00:00 2001 From: Trilok Khairnar <214651+cruizen@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:17:24 +0530 Subject: [PATCH] Update golang to 1.23 (#276) --- Dockerfile | 2 +- Makefile | 2 +- dhcp-controller/Dockerfile | 2 +- dhcp-controller/dhcpserver/Dockerfile | 2 +- dhcp-controller/dhcpserver/go.mod | 2 +- dhcp-controller/go.mod | 2 +- go.mod | 4 ++-- hostplumber/Dockerfile | 2 +- hostplumber/Makefile | 2 +- hostplumber/go.mod | 4 ++-- yoshi/Dockerfile | 2 +- yoshi/go.mod | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9ecabc9..895a151a 100644 --- 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 index 9e73746c..501cad9e 100644 --- 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 index fc87e6ca..d1895069 100644 --- 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 index be6e2c4a..0659ab07 100644 --- 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 index 487e7eca..81493dfb 100644 --- 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 index 66a05d7c..5ab3fb54 100644 --- 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 index 389a0de2..388fb4b9 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/platform9/luigi -go 1.22.0 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.3 require ( github.com/dustin/go-humanize v1.0.1 diff --git a/hostplumber/Dockerfile b/hostplumber/Dockerfile index 95399df3..d5f0980f 100644 --- 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 index cd1ca049..e81c34a5 100755 --- 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 index 2574da18..7b716f88 100644 --- 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 index fcc4ef5b..7c3311e3 100644 --- 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 index 14b914fd..3bad616e 100644 --- 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