From 501a16555669ab96bd718105d2f04398d1b1a4bd Mon Sep 17 00:00:00 2001
From: smoshiur1237 <moshiur.rahman@est.tech>
Date: Tue, 12 Nov 2024 11:58:29 +0200
Subject: [PATCH] Support go 1.22 to fix CVE

Signed-off-by: smoshiur1237 <moshiur.rahman@est.tech>
---
 .github/workflows/build.yml | 2 +-
 .github/workflows/test.yml  | 2 +-
 images/Dockerfile           | 2 +-
 images/Dockerfile.debug     | 2 +-
 images/Dockerfile.thick     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60a9858c9..f04180945 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.20.x, 1.21.x]
+        go-version: [1.20.x, 1.21.x, 1.22.x, 1.23.x]
         goarch: [386, amd64, arm, arm64, ppc64le, s390x]
         os: [ubuntu-latest] #, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 23d32df22..7d21dd0bc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.20.x, 1.21.x]
+        go-version: [1.20.x, 1.21.x, 1.22.x, 1.23.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/images/Dockerfile b/images/Dockerfile
index f55691a03..edecd0ca7 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -1,5 +1,5 @@
 # This Dockerfile is used to build the image available on DockerHub
-FROM --platform=$BUILDPLATFORM golang:1.21 as build
+FROM --platform=$BUILDPLATFORM golang:1.23 as build
 
 # Add everything
 ADD . /usr/src/multus-cni
diff --git a/images/Dockerfile.debug b/images/Dockerfile.debug
index 47e54611b..f31a5bb40 100644
--- a/images/Dockerfile.debug
+++ b/images/Dockerfile.debug
@@ -1,5 +1,5 @@
 # This Dockerfile is used to build the image available on DockerHub
-FROM --platform=$BUILDPLATFORM golang:1.21 as build
+FROM --platform=$BUILDPLATFORM golang:1.23 as build
 
 # Add everything
 ADD . /usr/src/multus-cni
diff --git a/images/Dockerfile.thick b/images/Dockerfile.thick
index ae170150a..4452e37f0 100644
--- a/images/Dockerfile.thick
+++ b/images/Dockerfile.thick
@@ -1,5 +1,5 @@
 # This Dockerfile is used to build the image available on DockerHub
-FROM golang:1.21 as build
+FROM golang:1.23 as build
 
 # Add everything
 ADD . /usr/src/multus-cni