Fix update preparation & lint issues (#472)

.github/workflows/check-codegen.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.19'
       - name: Run make generate
         run: make generate
       - name: Compare the expected and actual generated/* directories

.github/workflows/golangci-lint.yml

@@ -13,8 +13,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.19'
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.43.0
+          version: v1.48.0

.github/workflows/test.yml

@@ -1,7 +1,7 @@
 name: Pull Request Code test
 
 on:
-  pull_request_target:
+  pull_request:
     types: [ assigned, opened, synchronize, reopened ]
     paths-ignore:
       - 'docs/**'
@@ -13,9 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: '1.19'
       - run: make test

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.18 as builder
+FROM --platform=$BUILDPLATFORM golang:1.19 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

apis/common/v1alpha1/common_types.go

@@ -58,7 +58,7 @@ type LocalUIDReference struct {
 }
 
 // IP is an IP address.
-//+kubebuilder:validation:Type=string
+// +kubebuilder:validation:Type=string
 type IP struct {
 	netaddr.IP `json:"-"`
 }
@@ -254,8 +254,8 @@ func EqualIPRanges(a, b IPRange) bool {
 }
 
 // IPPrefix represents a network prefix.
-//+kubebuilder:validation:Type=string
-//+nullable
+// +kubebuilder:validation:Type=string
+// +nullable
 type IPPrefix struct {
 	netaddr.IPPrefix `json:"-"`
 }
@@ -375,7 +375,7 @@ type Taint struct {
 	Effect TaintEffect `json:"effect"`
 }
 
-//+kubebuilder:validation:Enum=NoSchedule
+// +kubebuilder:validation:Enum=NoSchedule
 type TaintEffect string
 
 const (
@@ -408,11 +408,14 @@ type Toleration struct {
 // ToleratesTaint checks if the toleration tolerates the taint.
 // The matching follows the rules below:
 // (1) Empty toleration.effect means to match all taint effects,
-//     otherwise taint effect must equal to toleration.effect.
+//
+//	otherwise taint effect must equal to toleration.effect.
+//
 // (2) If toleration.operator is 'Exists', it means to match all taint values.
 // (3) Empty toleration.key means to match all taint keys.
-//     If toleration.key is empty, toleration.operator must be 'Exists';
-//     this combination means to match all taint values and all taint keys.
+//
+//	If toleration.key is empty, toleration.operator must be 'Exists';
+//	this combination means to match all taint values and all taint keys.
 func (t *Toleration) ToleratesTaint(taint *Taint) bool {
 	if len(t.Effect) > 0 && t.Effect != taint.Effect {
 		return false
@@ -433,7 +436,7 @@ func (t *Toleration) ToleratesTaint(taint *Taint) bool {
 }
 
 // A toleration operator is the set of operators that can be used in a toleration.
-//+kubebuilder:validation:Enum=Equal;Exists
+// +kubebuilder:validation:Enum=Equal;Exists
 type TolerationOperator string
 
 const (

apis/compute/machine_types.go

@@ -167,7 +167,7 @@ type MachineStatus struct {
 }
 
 // MachineState is the state of a machine.
-//+enum
+// +enum
 type MachineState string
 
 const (

apis/compute/machinepool_types.go

@@ -110,7 +110,7 @@ type MachinePoolCondition struct {
 }
 
 // MachinePoolState is a state a MachinePool can be in.
-//+enum
+// +enum
 type MachinePoolState string
 
 const (

apis/compute/register.go

@@ -15,8 +15,8 @@
  */
 
 // Package compute contains API Schema definitions for the compute internal API group
-//+kubebuilder:object:generate=true
-//+groupName=compute.api.onmetal.de
+// +kubebuilder:object:generate=true
+// +groupName=compute.api.onmetal.de
 package compute
 
 import (

apis/compute/v1alpha1/machine_types.go

@@ -167,7 +167,7 @@ type MachineStatus struct {
 }
 
 // MachineState is the state of a machine.
-//+enum
+// +enum
 type MachineState string
 
 const (

apis/compute/v1alpha1/machinepool_types.go

@@ -110,7 +110,7 @@ type MachinePoolCondition struct {
 }
 
 // MachinePoolState is a state a MachinePool can be in.
-//+enum
+// +enum
 type MachinePoolState string
 
 const (

apis/compute/v1alpha1/register.go

@@ -15,8 +15,8 @@
  */
 
 // Package v1alpha1 contains API Schema definitions for the compute v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=compute.api.onmetal.de
+// +kubebuilder:object:generate=true
+// +groupName=compute.api.onmetal.de
 package v1alpha1
 
 import (

apis/ipam/register.go

@@ -15,8 +15,8 @@
  */
 
 // Package ipam contains API Schema definitions for the ipam internal API group
-//+kubebuilder:object:generate=true
-//+groupName=ipam.api.onmetal.de
+// +kubebuilder:object:generate=true
+// +groupName=ipam.api.onmetal.de
 package ipam
 
 import (

apis/ipam/v1alpha1/register.go

@@ -15,8 +15,8 @@
  */
 
 // Package v1alpha1 contains API Schema definitions for the network v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=ipam.api.onmetal.de
+// +kubebuilder:object:generate=true
+// +groupName=ipam.api.onmetal.de
 package v1alpha1
 
 import (

apis/networking/register.go

@@ -15,8 +15,8 @@
  */
 
 // Package networking contains API Schema definitions for the networking internal API group
-//+kubebuilder:object:generate=true
-//+groupName=networking.api.onmetal.de
+// +kubebuilder:object:generate=true
+// +groupName=networking.api.onmetal.de
 package networking
 
 import (

apis/networking/v1alpha1/register.go

@@ -15,8 +15,8 @@
  */
 
 // Package v1alpha1 contains API Schema definitions for the networking v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=networking.api.onmetal.de
+// +kubebuilder:object:generate=true
+// +groupName=networking.api.onmetal.de
 package v1alpha1
 
 import (

apis/storage/register.go

@@ -15,8 +15,8 @@
  */
 
 // Package storage contains API Schema definitions for the storage internal API group
-//+kubebuilder:object:generate=true
-//+groupName=storage.api.onmetal.de
+// +kubebuilder:object:generate=true
+// +groupName=storage.api.onmetal.de
 package storage
 
 import (

apis/storage/v1alpha1/register.go

@@ -15,8 +15,8 @@
  */
 
 // Package v1alpha1 contains API Schema definitions for the storage v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=storage.api.onmetal.de
+// +kubebuilder:object:generate=true
+// +groupName=storage.api.onmetal.de
 package v1alpha1
 
 import (

controllers/ipam/prefix_controller.go

@@ -348,11 +348,11 @@ func (r *PrefixReconciler) allocateSubPrefix(ctx context.Context, log logr.Logge
 
 // adjustedAllocationPhase calculates an adjusted phase of a PrefixAllocation.
 // For the adjusted phase, it is considered
-// * If the allocation is in a terminal phase, that state is returned.
-// * If the allocation is not scheduled, that state is returned.
-// * If the allocation is scheduled but no lastTransitionTime has been recorded, that state is returned
-// * If the allocation is in a non-terminal state, and it has been scheduled, once a configurable timeout has passed,
-//   it is considered to be failed.
+//   - If the allocation is in a terminal phase, that state is returned.
+//   - If the allocation is not scheduled, that state is returned.
+//   - If the allocation is scheduled but no lastTransitionTime has been recorded, that state is returned
+//   - If the allocation is in a non-terminal state, and it has been scheduled, once a configurable timeout has passed,
+//     it is considered to be failed.
 func (r *PrefixReconciler) adjustedAllocationPhase(allocation *ipamv1alpha1.PrefixAllocation) ipamv1alpha1.PrefixAllocationPhase {
 	allocationPhase := allocation.Status.Phase
 	if allocationPhase.IsTerminal() || allocation.Spec.PrefixRef == nil {

docs/development/setup.md

@@ -2,7 +2,7 @@
 
 ## Requirements
 
-* `go` >= 1.17
+* `go` >= 1.19
 * `git`, `make` and `kubectl`
 * [Kustomize](https://kustomize.io/)
 * Access to a Kubernetes cluster ([Minikube](https://minikube.sigs.k8s.io/docs/), [kind](https://kind.sigs.k8s.io/) or a

envtestutils/apiservice.go

@@ -18,7 +18,6 @@ import (
 	"bufio"
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -79,8 +78,20 @@ func renderAPIServices(options *APIServiceInstallOptions) ([]*apiregistrationv1.
 
 		if !info.IsDir() {
 			filePath, files = filepath.Dir(path), []os.FileInfo{info}
-		} else if files, err = ioutil.ReadDir(path); err != nil {
-			return nil, err
+		} else {
+			entries, err := os.ReadDir(path)
+			if err != nil {
+				return nil, err
+			}
+
+			for _, entry := range entries {
+				file, err := entry.Info()
+				if err != nil {
+					return nil, err
+				}
+
+				files = append(files, file)
+			}
 		}
 
 		log.V(1).Info("reading APIServices from path", "path", path)

envtestutils/envtestutils.go

@@ -17,7 +17,6 @@ package envtestutils
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -106,7 +105,7 @@ func (o *APIServiceInstallOptions) setupCA() error {
 		return fmt.Errorf("unable to set up api service serving certs: %v", err)
 	}
 
-	localServingCertsDir, err := ioutil.TempDir("", "envtest-apiservice-certs-")
+	localServingCertsDir, err := os.MkdirTemp("", "envtest-apiservice-certs-")
 	o.LocalServingCertDir = localServingCertsDir
 	if err != nil {
 		return fmt.Errorf("unable to create directory for apiservice serving certs: %v", err)
@@ -117,13 +116,13 @@ func (o *APIServiceInstallOptions) setupCA() error {
 		return fmt.Errorf("unable to marshal api service serving certs: %v", err)
 	}
 
-	if err := ioutil.WriteFile(o.caCertPath(), apiServiceCA.CA.CertBytes(), 0640); err != nil {
+	if err := os.WriteFile(o.caCertPath(), apiServiceCA.CA.CertBytes(), 0640); err != nil {
 		return fmt.Errorf("unable to write api service ca to disk: %w", err)
 	}
-	if err := ioutil.WriteFile(o.tlsCertPath(), certData, 0640); err != nil {
+	if err := os.WriteFile(o.tlsCertPath(), certData, 0640); err != nil {
 		return fmt.Errorf("unable to write api service serving cert to disk: %w", err)
 	}
-	if err := ioutil.WriteFile(o.tlsKeyPath(), keyData, 0640); err != nil {
+	if err := os.WriteFile(o.tlsKeyPath(), keyData, 0640); err != nil {
 		return fmt.Errorf("unable to write api service serving key to disk: %w", err)
 	}
 
@@ -232,7 +231,7 @@ func (o *APIServiceInstallOptions) SetupClientCA() error {
 		return fmt.Errorf("unable to set up apiserver client serving certs: %v", err)
 	}
 
-	clientCertDir, err := ioutil.TempDir("", "envtest-apiserver-client-certs-")
+	clientCertDir, err := os.MkdirTemp("", "envtest-apiserver-client-certs-")
 	o.ClientCertDir = clientCertDir
 	if err != nil {
 		return fmt.Errorf("unable to create directory for apiserver client certs: %v", err)
@@ -243,13 +242,13 @@ func (o *APIServiceInstallOptions) SetupClientCA() error {
 		return fmt.Errorf("unable to marshal apiserver client certs: %v", err)
 	}
 
-	if err := ioutil.WriteFile(o.clientCACertPath(), clientCA.CA.CertBytes(), 0640); err != nil {
+	if err := os.WriteFile(o.clientCACertPath(), clientCA.CA.CertBytes(), 0640); err != nil {
 		return fmt.Errorf("unable to write apiserver client ca to disk: %w", err)
 	}
-	if err := ioutil.WriteFile(o.clientCertPath(), certData, 0640); err != nil {
+	if err := os.WriteFile(o.clientCertPath(), certData, 0640); err != nil {
 		return fmt.Errorf("unable to write apiserver client cert to disk: %w", err)
 	}
-	if err := ioutil.WriteFile(o.clientKeyPath(), keyData, 0640); err != nil {
+	if err := os.WriteFile(o.clientKeyPath(), keyData, 0640); err != nil {
 		return fmt.Errorf("unable to write apiserver client key to disk: %w", err)
 	}