🌱 Bump golang to v1.21.6

.github/workflows/release.yaml

@@ -27,7 +27,7 @@ jobs:
     - name: Install go
       uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
-        go-version: '1.20'
+        go-version: '1.21'
     - name: Generate release artifacts and notes
       run: |
         make release

.golangci.yaml

@@ -1,175 +1,175 @@
 run:
   deadline: 5m
   skip-dirs:
-    - mock*
+  - mock*
   skip-files:
-    - "zz_generated.*\\.go$"
-    - ".*conversion.*\\.go$"
+  - "zz_generated.*\\.go$"
+  - ".*conversion.*\\.go$"
 linters:
   disable-all: true
   enable:
-    - asciicheck
-    - bodyclose
-    - dogsled
-    - errcheck
-    - errorlint
-    - exportloopref
-    - goconst
-    - gocritic
-    - godot
-    - gofmt
-    - goimports
-    - gosimple
-    - govet
-    - importas
-    - gosec
-    - ineffassign
-    - misspell
-    - nakedret
-    - nilerr
-    - noctx
-    - nolintlint
-    - prealloc
-    - predeclared
-    - revive
-    - rowserrcheck
-    - staticcheck
-    - stylecheck
-    - thelper
-    - typecheck
-    - unconvert
-    - unused
-    - whitespace
+  - asciicheck
+  - bodyclose
+  - dogsled
+  - errcheck
+  - errorlint
+  - exportloopref
+  - goconst
+  - gocritic
+  - godot
+  - gofmt
+  - goimports
+  - gosimple
+  - govet
+  - importas
+  - gosec
+  - ineffassign
+  - misspell
+  - nakedret
+  - nilerr
+  - noctx
+  - nolintlint
+  - prealloc
+  - predeclared
+  - revive
+  - rowserrcheck
+  - staticcheck
+  - stylecheck
+  - thelper
+  - typecheck
+  - unconvert
+  - unused
+  - whitespace
   # Run with --fast=false for more extensive checks
   fast: true
 
 linters-settings:
   gosec:
-    go: "1.20"
+    go: "1.21"
     severity: medium
     confidence: medium
     concurrency: 8
   importas:
     no-unaliased: true
     alias:
-      # Kubernetes
-      - pkg: k8s.io/api/core/v1
-        alias: corev1
-      - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
-        alias: apiextensionsv1
-      - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
-        alias: metav1
-      - pkg: k8s.io/apimachinery/pkg/api/errors
-        alias: apierrors
-      - pkg: k8s.io/apimachinery/pkg/util/errors
-        alias: kerrors
-      - pkg: k8s.io/component-base/logs/api/v1
-        alias: logsv1
-      # Controller Runtime
-      - pkg: sigs.k8s.io/controller-runtime
-        alias: ctrl
-      # KCP
-      - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
-        alias: controlplanev1
-      # CAPI
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
-        alias: clusterv1alpha3
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
-        alias: clusterv1alpha4
-      - pkg: sigs.k8s.io/cluster-api/api/v1beta1
-        alias: clusterv1
-      # CAPM3
-      - pkg: github.com/metal3-io/cluster-api-provider-metal3/api/v1alpha5
-        alias: infrav1alpha5
-      - pkg: github.com/metal3-io/cluster-api-provider-metal3/api/v1beta1
-        alias: infrav1
-      # BMO
-      - pkg: github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1
-        alias: bmov1alpha1
+    # Kubernetes
+    - pkg: k8s.io/api/core/v1
+      alias: corev1
+    - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
+      alias: apiextensionsv1
+    - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+      alias: metav1
+    - pkg: k8s.io/apimachinery/pkg/api/errors
+      alias: apierrors
+    - pkg: k8s.io/apimachinery/pkg/util/errors
+      alias: kerrors
+    - pkg: k8s.io/component-base/logs/api/v1
+      alias: logsv1
+    # Controller Runtime
+    - pkg: sigs.k8s.io/controller-runtime
+      alias: ctrl
+    # KCP
+    - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
+      alias: controlplanev1
+    # CAPI
+    - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
+      alias: clusterv1alpha3
+    - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
+      alias: clusterv1alpha4
+    - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+      alias: clusterv1
+    # CAPM3
+    - pkg: github.com/metal3-io/cluster-api-provider-metal3/api/v1alpha5
+      alias: infrav1alpha5
+    - pkg: github.com/metal3-io/cluster-api-provider-metal3/api/v1beta1
+      alias: infrav1
+    # BMO
+    - pkg: github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1
+      alias: bmov1alpha1
   nolintlint:
     allow-unused: false
     allow-leading-space: false
     require-specific: true
   staticcheck:
-    go: "1.20"
+    go: "1.21"
   stylecheck:
-    go: "1.20"
+    go: "1.21"
   gocritic:
     enabled-tags:
-      - experimental
+    - experimental
     disabled-checks:
-      - appendAssign
-      - dupImport # https://github.com/go-critic/go-critic/issues/845
-      - evalOrder
-      - ifElseChain
-      - octalLiteral
-      - regexpSimplify
-      - sloppyReassign
-      - truncateCmp
-      - typeDefFirst
-      - unnamedResult
-      - unnecessaryDefer
-      - whyNoLint
-      - wrapperFunc
+    - appendAssign
+    - dupImport # https://github.com/go-critic/go-critic/issues/845
+    - evalOrder
+    - ifElseChain
+    - octalLiteral
+    - regexpSimplify
+    - sloppyReassign
+    - truncateCmp
+    - typeDefFirst
+    - unnamedResult
+    - unnecessaryDefer
+    - whyNoLint
+    - wrapperFunc
   unused:
-    go: "1.20"
+    go: "1.21"
 issues:
   exclude-rules:
-    - path: test/e2e
-      linters:
-        - gosec
-    - path: _test\.go
-      linters:
-        - unused
-    # Specific exclude rules for deprecated fields that are still part of the codebase.
-    # These should be removed as the referenced deprecated item is removed from the project.
-    - linters:
-        - staticcheck
-      text: "SA1019:"
-    # Disable linters for conversion
-    - linters:
-        - staticcheck
-      text: "SA1019:"
-      path: .*(api|types)\/.*\/conversion.*\.go$
-    # Dot imports for gomega or ginkgo are allowed
-    # within test files.
-    - path: _test\.go
-      text: should not use dot imports
-    - path: (test|e2e)/.*.go
-      text: should not use dot imports
-    - linters:
-        - revive
-      text: "exported: exported method .*\\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported"
-    # Exclude some packages or code to require comments, for example test code, or fake clients.
-    - linters:
-        - revive
-      text: exported (method|function|type|const) (.+) should have comment or be unexported
-      source: (func|type).*Fake.*
-    - linters:
-        - revive
-      text: exported (method|function|type|const) (.+) should have comment or be unexported
-      path: fake_\.go
-    - linters:
-        - revive
-      text: exported (method|function|type|const) (.+) should have comment or be unexported
-      path: .*(api|types)\/.*\/conversion.*\.go$
-    - linters:
-        - revive
-      text: "var-naming: don't use underscores in Go names;"
-      path: .*(api|types)\/.*\/conversion.*\.go$
-    - linters:
-        - revive
-      text: "receiver-naming: receiver name"
-      path: .*(api|types)\/.*\/conversion.*\.go$
-    - linters:
-        - stylecheck
-      text: "ST1003: should not use underscores in Go names;"
-      path: .*(api|types)\/.*\/conversion.*\.go$
-    - linters:
-        - stylecheck
-      text: "ST1016: methods on the same type should have the same receiver name"
-      path: .*(api|types)\/.*\/conversion.*\.go$
+  - path: test/e2e
+    linters:
+    - gosec
+  - path: _test\.go
+    linters:
+    - unused
+  # Specific exclude rules for deprecated fields that are still part of the codebase.
+  # These should be removed as the referenced deprecated item is removed from the project.
+  - linters:
+    - staticcheck
+    text: "SA1019:"
+  # Disable linters for conversion
+  - linters:
+    - staticcheck
+    text: "SA1019:"
+    path: .*(api|types)\/.*\/conversion.*\.go$
+  # Dot imports for gomega or ginkgo are allowed
+  # within test files.
+  - path: _test\.go
+    text: should not use dot imports
+  - path: (test|e2e)/.*.go
+    text: should not use dot imports
+  - linters:
+    - revive
+    text: "exported: exported method .*\\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported"
+  # Exclude some packages or code to require comments, for example test code, or fake clients.
+  - linters:
+    - revive
+    text: exported (method|function|type|const) (.+) should have comment or be unexported
+    source: (func|type).*Fake.*
+  - linters:
+    - revive
+    text: exported (method|function|type|const) (.+) should have comment or be unexported
+    path: fake_\.go
+  - linters:
+    - revive
+    text: exported (method|function|type|const) (.+) should have comment or be unexported
+    path: .*(api|types)\/.*\/conversion.*\.go$
+  - linters:
+    - revive
+    text: "var-naming: don't use underscores in Go names;"
+    path: .*(api|types)\/.*\/conversion.*\.go$
+  - linters:
+    - revive
+    text: "receiver-naming: receiver name"
+    path: .*(api|types)\/.*\/conversion.*\.go$
+  - linters:
+    - stylecheck
+    text: "ST1003: should not use underscores in Go names;"
+    path: .*(api|types)\/.*\/conversion.*\.go$
+  - linters:
+    - stylecheck
+    text: "ST1016: methods on the same type should have the same receiver name"
+    path: .*(api|types)\/.*\/conversion.*\.go$
   include:
-    - EXC0002 # include "missing comments" issues from golangci-lint
+  - EXC0002 # include "missing comments" issues from golangci-lint
   max-issues-per-linter: 0
   max-same-issues: 0

Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Support FROM override
-ARG BUILD_IMAGE=docker.io/golang:1.20.12@sha256:685846c2eb68f6ae4d784d56125ea9894981b3408340aa7d89362fef83e1aebb
+ARG BUILD_IMAGE=docker.io/golang:1.21.6@sha256:76aadd914a29a2ee7a6b0f3389bb2fdb87727291d688e1d972abe6c0fa6f2ee0
 ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:9ecc53c269509f63c69a266168e4a687c7eb8c0cfd753bd8bfcaa4f58a90876f
 
 # Build the manager binary on golang image

Makefile

@@ -20,7 +20,7 @@ SHELL:=/usr/bin/env bash
 
 .DEFAULT_GOAL:=help
 
-GO_VERSION ?= 1.20.12
+GO_VERSION ?= 1.21.6
 GO := $(shell type -P go)
 # Use GOPROXY environment variable if set
 GOPROXY := $(shell $(GO) env GOPROXY)

Tiltfile

@@ -129,7 +129,7 @@ def fixup_yaml_empty_arrays(yaml_str):
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.20 as tilt-helper
+FROM golang:1.21 as tilt-helper
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
     wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \

api/go.mod

@@ -1,6 +1,6 @@
 module github.com/metal3-io/cluster-api-provider-metal3/api
 
-go 1.20
+go 1.21
 
 require (
 	github.com/google/gofuzz v1.2.0