Merge pull request #396 from roguepikachu/chore/upgrade-go-k8s-version

Chore: upgrades Go (1.23.8) and K8s (1.31.0) versions

Author: anoop2811

.github/workflows/e2e-test.yml

@@ -12,12 +12,12 @@ on:
       - master
 
 env:
-  GO_VERSION: '1.17.6'
+  GO_VERSION: '1.23.8'
   KIND_VERSION: 'v0.12.0'
 
 jobs:
   e2e-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out code into the Go module directory

.github/workflows/format.yml

@@ -13,12 +13,12 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17.6'
+  GO_VERSION: '1.23.8'
   KIND_VERSION: 'v0.7.0'
 
 jobs:
   detect-noop:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
     steps:
@@ -32,7 +32,7 @@ jobs:
           concurrent_skipping: false
 
   make-reviewable:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
 

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.23
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.2

.github/workflows/unit-test.yml

@@ -15,7 +15,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17.6'
+  GO_VERSION: '1.23.8'
 
 jobs:
   lint:
@@ -31,7 +31,7 @@ jobs:
           make lint
 
   unit-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Set up Go
@@ -46,7 +46,7 @@ jobs:
           submodules: true
 
       - name: Cache Go Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: .work/pkg
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}

.golangci.yml

@@ -2,12 +2,11 @@ run:
   timeout: 10m
 
   skip-files:
-    - "zz_generated\\..+\\.go$"
-    - ".*_test.go$"
+    
 
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
-  format: colored-line-number
+  formats: colored-line-number
 
 linters-settings:
   errcheck:
@@ -22,7 +21,7 @@ linters-settings:
     # [deprecated] comma-separated list of pairs of the form pkg:regex
     # the regex is used to ignore names within pkg. (default "fmt:.*").
     # see https://github.com/kisielk/errcheck#the-deprecated-method for details
-    ignore: fmt:.*,io/ioutil:^Read.*
+    exclude-functions: fmt:.*,io/ioutil:^Read.*
 
   exhaustive:
     # indicates that switch statements are to be considered exhaustive if a
@@ -100,7 +99,6 @@ linters-settings:
 
 linters:
   enable:
-    - megacheck
     - govet
     - gocyclo
     - gocritic
@@ -111,6 +109,9 @@ linters:
     - unconvert
     - misspell
     - nakedret
+    - staticcheck
+    - gosimple
+    - unused
 
   presets:
     - bugs
@@ -119,6 +120,12 @@ linters:
 
 
 issues:
+  exclude-files:
+    # Exclude files that are generated by controller-gen.
+    - "zz_generated\\..+\\.go$"
+    # Exclude test files.
+    - ".*_test.go$"
+
   # Excluding configuration per-path and per-linter
   exclude-rules:
     # Exclude some linters from running on tests files.

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.17-alpine as builder
+FROM golang:1.23-alpine as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -3,7 +3,7 @@
 IMG ?= oamdev/terraform-controller:0.2.8
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
+CRD_OPTIONS ?= "crd"
 
 TIME_SHORT	= `date +%H:%M:%S`
 TIME		= $(TIME_SHORT)
@@ -82,15 +82,15 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.5 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)
 endif
 
-GOLANGCILINT_VERSION ?= v1.50.1
+GOLANGCILINT_VERSION ?= v1.60.1
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
 HOSTARCH := $(shell uname -m)
 ifeq ($(HOSTARCH),x86_64)
@@ -131,7 +131,7 @@ goimports:
 ifeq (, $(shell which goimports))
 	@{ \
 	set -e ;\
-	GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports ;\
+	go install golang.org/x/tools/cmd/goimports@latest ;\
 	}
 GOIMPORTS=$(GOBIN)/goimports
 else