Test

.github/workflows/test.yml

@@ -92,30 +92,36 @@ jobs:
         env:
           DOCKERBUILD_ACTION: ""
 
-  codegen:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
+  # codegen:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
 
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.18
+  #     - name: Set up Go
+  #       uses: actions/setup-go@v2
+  #       with:
+  #         go-version: 1.22
 
-      - name: Check codegen
-        run: make check-generated
+  #     - name: debug paths and dirs
+  #       run: |
+  #         ls -la .
+  #         pwd
+  #         ls -la pkg/generated/ || echo "NO DIR"
+
+  #     - name: Check codegen
+  #       run: make check-generated
 
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.18
-      - uses: actions/checkout@v3
+          go-version: '1.22'
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          args: --timeout=3m
+          version: latest
 
   tests:
     runs-on: ubuntu-latest
@@ -124,7 +130,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.22
     - name: Test
       run: make test
     - name: Upload coverage

.golangci.yml

@@ -13,6 +13,7 @@ linters:
     - gosec
     - ireturn
     - maligned
+    - mnd
     - nestif # remove
     - nlreturn
     - nonamedreturns # fix maybe?

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:latest
 
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.18-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine as builder
 RUN apk update
 RUN apk add make bash
 WORKDIR /workspace

Dockerfile.monitor

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 
-FROM --platform=$BUILDPLATFORM golang:1.18-buster AS builder
+FROM --platform=$BUILDPLATFORM golang:1.22-bullseye AS builder
 
 WORKDIR /workspace
 COPY go.mod go.sum ./

Dockerfile.webhook

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:latest
 
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.18-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine as builder
 RUN apk update
 RUN apk add make bash
 WORKDIR /workspace

charts/kubeserial-crds/templates/app.kubeserial.com_kubeserials.yaml

@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels: {{ include "kubeserial-crds.labels" . | nindent 4 }}
   name: kubeserials.app.kubeserial.com
 spec:
@@ -21,10 +20,24 @@ spec:
         description: KubeSerial is the Schema for the kubeserials API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object.
+
+              Servers should convert recognized schemas to the latest internal value, and
+
+              may reject unrecognized values.
+
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this object represents.
+
+              Servers may infer this from the endpoint the client submits requests to.
+
+              Cannot be updated.
+
+              In CamelCase.
+
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object

charts/kubeserial-crds/templates/app.kubeserial.com_managers.yaml

@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels: {{ include "kubeserial-crds.labels" . | nindent 4 }}
   name: managers.app.kubeserial.com
 spec:
@@ -21,10 +20,24 @@ spec:
         description: Manager is the Schema for the managers API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object.
+
+              Servers should convert recognized schemas to the latest internal value, and
+
+              may reject unrecognized values.
+
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this object represents.
+
+              Servers may infer this from the endpoint the client submits requests to.
+
+              Cannot be updated.
+
+              In CamelCase.
+
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object

charts/kubeserial-crds/templates/app.kubeserial.com_managerschedulerequests.yaml

@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels: {{ include "kubeserial-crds.labels" . | nindent 4 }}
   name: managerschedulerequests.app.kubeserial.com
 spec:
@@ -31,10 +30,24 @@ spec:
         description: ManagerScheduleRequest is the Schema for the managerschedulerequests API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object.
+
+              Servers should convert recognized schemas to the latest internal value, and
+
+              may reject unrecognized values.
+
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this object represents.
+
+              Servers may infer this from the endpoint the client submits requests to.
+
+              Cannot be updated.
+
+              In CamelCase.
+
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object

charts/kubeserial-crds/templates/app.kubeserial.com_serialdevices.yaml

@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   labels: {{ include "kubeserial-crds.labels" . | nindent 4 }}
   name: serialdevices.app.kubeserial.com
 spec:
@@ -31,10 +30,24 @@ spec:
         description: SerialDevice is the Schema for the SerialDevices API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object.
+
+              Servers should convert recognized schemas to the latest internal value, and
+
+              may reject unrecognized values.
+
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this object represents.
+
+              Servers may infer this from the endpoint the client submits requests to.
+
+              Cannot be updated.
+
+              In CamelCase.
+
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object
@@ -67,7 +80,9 @@ spec:
                       format: date-time
                       type: string
                     message:
-                      description: message is a human readable message indicating details about the transition. This may be an empty string.
+                      description: 'message is a human readable message indicating details about the transition.
+
+                        This may be an empty string.'
                       maxLength: 32768
                       type: string
                     observedGeneration:

cmd/device-monitor/main.go

@@ -7,7 +7,6 @@ import (
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	metrics "sigs.k8s.io/controller-runtime/pkg/metrics"
 
 	"github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned"
 	"github.com/janekbaraniewski/kubeserial/pkg/monitor"
@@ -23,10 +22,10 @@ func main() {
 
 	log.Info("Start setup")
 
-	_, err := metrics.NewListener(":8080")
-	if err != nil {
-		log.Info("Failed setting up metrics listener")
-	}
+	// _, err := metrics.NewListener(":8080")
+	// if err != nil {
+	// 	log.Info("Failed setting up metrics listener")
+	// }
 
 	config, err := rest.InClusterConfig()
 	if err != nil {

cmd/manager/main.go

@@ -30,6 +30,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	kubeserialv1alpha1 "github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1"
 	"github.com/janekbaraniewski/kubeserial/pkg/controllers"
@@ -80,9 +81,10 @@ func main() {
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:                 scheme,
-		MetricsBindAddress:     metricsAddr,
-		Port:                   9443,
+		Scheme: scheme,
+		Metrics: server.Options{
+			BindAddress: metricsAddr,
+		},
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "0fe39e81.app.kubeserial.com",

cmd/webhook/main.go

@@ -11,6 +11,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	"github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned"
@@ -42,8 +43,14 @@ func main() {
 	// Setup a Manager
 	entryLog.Info("setting up manager")
 	mgr, err := manager.New(config.GetConfigOrDie(), manager.Options{
-		MetricsBindAddress:     ":8080",
+		Metrics: server.Options{
+			BindAddress: ":8080",
+		},
 		HealthProbeBindAddress: ":8081",
+		WebhookServer: webhook.NewServer(webhook.Options{
+			Port:    params.port,
+			CertDir: params.certDir,
+		}),
 	})
 	if err != nil {
 		entryLog.Error(err, "unable to set up overall controller manager")
@@ -56,10 +63,8 @@ func main() {
 
 	// Setup webhooks
 	entryLog.Info("setting up webhook server")
-	hookServer := mgr.GetWebhookServer()
 
-	hookServer.Port = params.port
-	hookServer.CertDir = params.certDir
+	hookServer := mgr.GetWebhookServer()
 
 	config, err := rest.InClusterConfig()
 	if err != nil {