Bump golang to v1.23 and dependencies to latest; fix compatibility ch…

…anges with k8s apis
gavinbunney · Nov 25, 2024 · 5f04c7b · 5f04c7b
1 parent 717e1cc
commit 5f04c7b
Show file tree

Hide file tree

Showing 20 changed files with 805 additions and 1,244 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,10 +14,10 @@ jobs:
       GO111MODULE: on
     steps:
       - uses: actions/checkout@v3
-      - name: Set up GO 1.18.x
+      - name: Set up GO 1.23.x
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.23'
           check-latest: true
 
       - run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
@@ -32,10 +32,10 @@ jobs:
       GO111MODULE: on
     steps:
       - uses: actions/checkout@v3
-      - name: Set up GO 1.18.x
+      - name: Set up GO 1.23.x
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.23'
           check-latest: true
 
       - run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
@@ -50,10 +50,10 @@ jobs:
       GO111MODULE: on
     steps:
       - uses: actions/checkout@v3
-      - name: Set up GO 1.18.x
+      - name: Set up GO 1.23.x
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.23'
           check-latest: true
 
       - run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
@@ -78,10 +78,10 @@ jobs:
       GO111MODULE: on
     steps:
       - uses: actions/checkout@v3
-      - name: Set up GO 1.18.x
+      - name: Set up GO 1.23.x
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.23'
           check-latest: true
 
       - run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
@@ -96,10 +96,10 @@ jobs:
       GO111MODULE: on
     steps:
       - uses: actions/checkout@v3
-      - name: Set up GO 1.18.x
+      - name: Set up GO 1.23.x
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.23'
           check-latest: true
 
       - run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -16,10 +16,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Set up GO 1.18.x
+      - name: Set up GO 1.23.x
         uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.23'
           check-latest: true
 
       - name: Import GPG key

diff --git a/Makefile b/Makefile
@@ -1,6 +1,5 @@
 CURRENT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 TEST?=$$(go list ./... |grep -v 'vendor')
-GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 PKG_NAME=kubernetes
 export GO111MODULE=on
 
@@ -41,8 +40,12 @@ vet:
 		exit 1; \
 	fi
 
+update-deps:
+	go get -u ./...
+	go mod tidy
+
 fmt:
-	gofmt -w $(GOFMT_FILES)
+	gofmt -s -w .
 
 fmtcheck:
 	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
@@ -51,11 +54,12 @@ errcheck:
 	@sh -c "'$(CURDIR)/scripts/errcheck.sh'"
 
 ci-build-setup:
-	sudo rm /usr/local/bin/docker-compose
-	curl -L https://github.com/docker/compose/releases/download/1.25.4/docker-compose-`uname -s`-`uname -m` > docker-compose
+	sudo rm -f /usr/local/bin/docker-compose
+	curl -L https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-`uname -s`-`uname -m` > docker-compose
 	chmod +x docker-compose
 	sudo mv docker-compose /usr/local/bin
 	curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.20.7/bin/linux/amd64/kubectl
+	curl -LO "https://dl.k8s.io/release/v1.31.3/bin/linux/amd64/kubectl"
 	chmod +x kubectl
 	sudo mv kubectl /usr/local/bin/
 	bash scripts/gogetcookie.sh