Merge pull request #857 from SchSeba/bump_controller_runtime_0.20.2

Bump controller-runtime and kubernetes

Author: SchSeba

.github/workflows/test.yml

@@ -99,7 +99,7 @@ jobs:
       uses: actions/checkout@v2
     - name: run lint checks
       run: make lint
-  
+
   shellcheck:
     name: Shellcheck
     runs-on: ubuntu-latest
@@ -192,7 +192,7 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
-      - name: Set up Go 1.22
+      - name: Set up Go 1.23
         uses: actions/setup-go@v3
         with:
           go-version: 1.23.x

.gitignore

@@ -84,3 +84,5 @@ tags
 .idea/
 # test-environment files
 registry-login.conf
+# go telemetry
+.config/

.golangci.yml

@@ -107,7 +107,6 @@ issues:
     - doc/
     - bindata/
     - pkg/client
-  # Excluding configuration per-path, per-linter, per-text and per-source
   exclude-rules:
     - path: _test\.go
       linters:

config/crd/bases/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml

@@ -83,11 +83,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string

controllers/drain_controller.go

@@ -190,14 +190,14 @@ func (dr *DrainReconcile) ensureAnnotationExists(ctx context.Context, object cli
 // SetupWithManager sets up the controller with the Manager.
 func (dr *DrainReconcile) SetupWithManager(mgr ctrl.Manager) error {
 	createUpdateEnqueue := handler.Funcs{
-		CreateFunc: func(ctx context.Context, e event.CreateEvent, q workqueue.RateLimitingInterface) {
-			q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
+		CreateFunc: func(c context.Context, e event.TypedCreateEvent[client.Object], w workqueue.TypedRateLimitingInterface[reconcile.Request]) {
+			w.Add(reconcile.Request{NamespacedName: types.NamespacedName{
 				Namespace: vars.Namespace,
 				Name:      e.Object.GetName(),
 			}})
 		},
-		UpdateFunc: func(ctx context.Context, e event.UpdateEvent, q workqueue.RateLimitingInterface) {
-			q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
+		UpdateFunc: func(ctx context.Context, e event.TypedUpdateEvent[client.Object], w workqueue.TypedRateLimitingInterface[reconcile.Request]) {
+			w.Add(reconcile.Request{NamespacedName: types.NamespacedName{
 				Namespace: vars.Namespace,
 				Name:      e.ObjectNew.GetName(),
 			}})

controllers/drain_controller_test.go

@@ -17,7 +17,7 @@ import (
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
+	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 
 	sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1"
 	constants "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/consts"
@@ -90,8 +90,9 @@ var _ = Describe("Drain Controller", Ordered, func() {
 	})
 
 	BeforeEach(func() {
-		Expect(k8sClient.DeleteAllOf(context.Background(), &corev1.Node{})).ToNot(HaveOccurred())
-		Expect(k8sClient.DeleteAllOf(context.Background(), &sriovnetworkv1.SriovNetworkNodeState{}, client.InNamespace(vars.Namespace))).ToNot(HaveOccurred())
+		Expect(k8sClient.DeleteAllOf(context.Background(), &corev1.Node{}, &client.DeleteAllOfOptions{DeleteOptions: client.DeleteOptions{GracePeriodSeconds: pointer.Int64(0)}})).ToNot(HaveOccurred())
+		Expect(k8sClient.DeleteAllOf(context.Background(), &sriovnetworkv1.SriovNetworkNodeState{}, client.InNamespace(vars.Namespace), &client.DeleteAllOfOptions{DeleteOptions: client.DeleteOptions{GracePeriodSeconds: pointer.Int64(0)}})).ToNot(HaveOccurred())
+		Expect(k8sClient.DeleteAllOf(context.Background(), &corev1.Pod{}, client.InNamespace(testNamespace), &client.DeleteAllOfOptions{DeleteOptions: client.DeleteOptions{GracePeriodSeconds: pointer.Int64(0)}})).ToNot(HaveOccurred())
 
 		poolConfig := &sriovnetworkv1.SriovNetworkPoolConfig{}
 		poolConfig.SetNamespace(testNamespace)

controllers/generic_network_controller.go

@@ -40,7 +40,7 @@ import (
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/vars"
 )
 
-type networkCRInstance interface {
+type NetworkCRInstance interface {
 	client.Object
 	// renders NetAttDef from the network instance
 	RenderNetAttDef() (*uns.Unstructured, error)
@@ -53,7 +53,7 @@ type networkController interface {
 	reconcile.Reconciler
 	// GetObject should return CR type which implements networkCRInstance
 	// interface
-	GetObject() networkCRInstance
+	GetObject() NetworkCRInstance
 	// should return CR list type
 	GetObjectList() client.ObjectList
 	// should return name of the controller
@@ -207,7 +207,7 @@ func (r *genericNetworkReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r.controller)
 }
 
-func (r *genericNetworkReconciler) namespaceHandlerCreate(ctx context.Context, e event.CreateEvent, q workqueue.RateLimitingInterface) {
+func (r *genericNetworkReconciler) namespaceHandlerCreate(ctx context.Context, e event.TypedCreateEvent[client.Object], w workqueue.TypedRateLimitingInterface[reconcile.Request]) {
 	networkList := r.controller.GetObjectList()
 	err := r.List(ctx,
 		networkList,
@@ -227,7 +227,7 @@ func (r *genericNetworkReconciler) namespaceHandlerCreate(ctx context.Context, e
 	unsList.SetUnstructuredContent(unsContent)
 	_ = unsList.EachListItem(func(o runtime.Object) error {
 		unsObj := o.(*uns.Unstructured)
-		q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
+		w.Add(reconcile.Request{NamespacedName: types.NamespacedName{
 			Namespace: unsObj.GetNamespace(),
 			Name:      unsObj.GetName(),
 		}})
@@ -236,7 +236,7 @@ func (r *genericNetworkReconciler) namespaceHandlerCreate(ctx context.Context, e
 }
 
 // deleteNetAttDef deletes the generated net-att-def CR
-func (r *genericNetworkReconciler) deleteNetAttDef(ctx context.Context, cr networkCRInstance) error {
+func (r *genericNetworkReconciler) deleteNetAttDef(ctx context.Context, cr NetworkCRInstance) error {
 	// Fetch the NetworkAttachmentDefinition instance
 	namespace := cr.NetworkNamespace()
 	if namespace == "" {

controllers/ovsnetwork_controller.go

@@ -48,7 +48,7 @@ func (r *OVSNetworkReconciler) Name() string {
 }
 
 // return empty instance of the OVSNetwork CR
-func (r *OVSNetworkReconciler) GetObject() networkCRInstance {
+func (r *OVSNetworkReconciler) GetObject() NetworkCRInstance {
 	return &sriovnetworkv1.OVSNetwork{}
 }
 

controllers/sriovibnetwork_controller.go

@@ -48,7 +48,7 @@ func (r *SriovIBNetworkReconciler) Name() string {
 }
 
 // return empty instance of the SriovIBNetwork CR
-func (r *SriovIBNetworkReconciler) GetObject() networkCRInstance {
+func (r *SriovIBNetworkReconciler) GetObject() NetworkCRInstance {
 	return &sriovnetworkv1.SriovIBNetwork{}
 }
 

controllers/sriovnetwork_controller.go

@@ -48,7 +48,7 @@ func (r *SriovNetworkReconciler) Name() string {
 }
 
 // return empty instance of the SriovIBNetwork CR
-func (r *SriovNetworkReconciler) GetObject() networkCRInstance {
+func (r *SriovNetworkReconciler) GetObject() NetworkCRInstance {
 	return &sriovnetworkv1.SriovNetwork{}
 }