From 16b48c39a4247e4269617642d8c8a32b9263c2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
Date: Mon, 31 Mar 2025 13:30:46 +0200
Subject: [PATCH] Build with go 1.24

---
 .github/workflows/ci.yml | 6 ++----
 Makefile                 | 4 +---
 go.mod                   | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c018dd34..36e7f287 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,11 +15,9 @@ on:
     - prep-v[1-9].*
 
 env:
-  BUILDTIME_BASE: "golang:1.23.6-alpine3.21"
-  # Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
-  # https://github.com/cloudnativelabs/kube-router/issues/1676
+  BUILDTIME_BASE: "golang:1.24.1-alpine3.21"
   RUNTIME_BASE: "alpine:3.21"
-  GO_VERSION: "~1.23.6"
+  GO_VERSION: "~1.24.1"
   GO_CACHE: "/home/runner/.cache/go-build"
   GO_MOD_CACHE: "/home/runner/go/pkg/mod"
 
diff --git a/Makefile b/Makefile
index af3f5329..cdb33cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,12 @@ DOCKER=$(if $(or $(IN_DOCKER_GROUP),$(IS_ROOT),$(OSX)),docker,sudo docker)
 MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 UPSTREAM_IMPORT_PATH=$(GOPATH)/src/github.com/cloudnativelabs/kube-router/
 BUILD_IN_DOCKER?=true
-DOCKER_BUILD_IMAGE?=golang:1.23.6-alpine3.21
+DOCKER_BUILD_IMAGE?=golang:1.24.1-alpine3.21
 ## These variables are used by the Dockerfile as the bases for building and creating the runtime container
 ## During CI these come from .github/workflows/ci.yaml below we define for local builds as well
 GO_CACHE?=$(shell go env GOCACHE)
 GO_MOD_CACHE?=$(shell go env GOMODCACHE)
 BUILDTIME_BASE?=$(DOCKER_BUILD_IMAGE)
-# Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
-# https://github.com/cloudnativelabs/kube-router/issues/1676
 RUNTIME_BASE?=alpine:3.21
 DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.63.4
 DOCKER_MARKDOWNLINT_IMAGE?=tmknom/markdownlint:0.39.0
diff --git a/go.mod b/go.mod
index 580811df..60c22ca3 100644
--- a/go.mod
+++ b/go.mod
@@ -127,6 +127,6 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-go 1.23.0
+go 1.24.0
 
-toolchain go1.23.6
+toolchain go1.24.1