Merge pull request #512 from mlguerrero12/upgradegoversion

Bump Go version 1.23
k8snetworkplumbingwg · Oct 24, 2024 · 53ace55 · 53ace55
2 parents a83b184 + f17422d
commit 53ace55
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,19 +4,18 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.21.x]
         #goarch: [386, amd64, arm, ppc64le, arm64]
         goarch: [amd64, arm64]
         os: [ubuntu-latest] #, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: ${{ matrix.go-version }}
-
-    - name: Checkout code
-      uses: actions/checkout@v4
+        go-version-file: go.mod
 
     - name: Install kubebuilder tools
       run: ./hack/install-kubebuilder-tools.sh

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,17 +4,16 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.21.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: ${{ matrix.go-version }}
-
-    - name: Checkout code
-      uses: actions/checkout@v4
+        go-version-file: go.mod
 
     - name: Get all changed files excluding docs and README
       id: changed-files
@@ -71,13 +70,13 @@ jobs:
     env:
       NUMBER_OF_COMPUTE_NODES: 5
     steps:
+      - name: Checkout code into the Go module directory
+        uses: actions/checkout@v4
+
       - name: Set up Go version
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.x
-
-      - name: Checkout code into the Go module directory
-        uses: actions/checkout@v4
+          go-version-file: go.mod
 
       - name: Get all changed files excluding docs and README
         id: changed-files

diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -678,7 +678,7 @@ var _ = Describe("Whereabouts functionality", func() {
 					enableOverlappingRanges), func() {
 					BeforeEach(func() {
 						netAttachDef2 = util.MacvlanNetworkWithWhereaboutsIPAMNetwork(testNetwork2Name, testNamespace,
-							ipv4TestRangeOverlapping, []string{}, "", false)
+							ipv4TestRangeOverlapping, []string{}, "", enableOverlappingRanges)
 
 						By("creating a second NetworkAttachmentDefinition for whereabouts")
 						_, err := clientInfo.AddNetAttachDef(netAttachDef2)

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/k8snetworkplumbingwg/whereabouts
 
-go 1.21
+go 1.23
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
@@ -59,7 +59,7 @@ require (
 	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/term v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/time v0.3.0
 	golang.org/x/tools v0.20.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
@@ -68,7 +68,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
-	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/klog/v2 v2.110.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect