Store client

.golangci.yaml

@@ -75,6 +75,9 @@ linters-settings:
       alias: metav1
     - pkg: sigs.k8s.io/gateway-api/apis/(v[\w\d]+)
       alias: gateway${1}
+
+    - pkg: sigs.k8s.io/controller-runtime/pkg/client/fake
+      alias: ctrlclientfake
   gomodguard:
     blocked:
       modules:

hack/generators/controllers/networking/main.go

@@ -528,11 +528,11 @@ func (r *{{.PackageAlias}}{{.Kind}}Reconciler) Reconcile(ctx context.Context, re
 			obj.Name = req.Name
 			{{if .NeedsUpdateReferences}}
 			// remove reference record where the {{.Kind}} is the referrer
-			if err := ctrlref.DeleteReferencesByReferrer(r.ReferenceIndexers, r.DataplaneClient, obj); err != nil {
+			if err := ctrlref.DeleteReferencesByReferrer(ctx, r.ReferenceIndexers, r.DataplaneClient, obj); err != nil {
 				return ctrl.Result{}, err
 			}
 			{{end}}
-			return ctrl.Result{}, r.DataplaneClient.DeleteObject(obj)
+			return ctrl.Result{}, r.DataplaneClient.DeleteObject(ctx, obj)
 		}
 		return ctrl.Result{}, err
 	}
@@ -543,16 +543,16 @@ func (r *{{.PackageAlias}}{{.Kind}}Reconciler) Reconcile(ctx context.Context, re
 		log.V(util.DebugLevel).Info("resource is being deleted, its configuration will be removed", "type", "{{.Kind}}", "namespace", req.Namespace, "name", req.Name)
 		{{if .NeedsUpdateReferences}}
 		// remove reference record where the {{.Kind}} is the referrer
-		if err := ctrlref.DeleteReferencesByReferrer(r.ReferenceIndexers, r.DataplaneClient, obj); err != nil {
+		if err := ctrlref.DeleteReferencesByReferrer(ctx, r.ReferenceIndexers, r.DataplaneClient, obj); err != nil {
 			return ctrl.Result{}, err
 		}
 		{{end}}
-		objectExistsInCache, err := r.DataplaneClient.ObjectExists(obj)
+		objectExistsInCache, err := r.DataplaneClient.ObjectExists(ctx, obj)
 		if err != nil {
 			return ctrl.Result{}, err
 		}
 		if objectExistsInCache {
-			if err := r.DataplaneClient.DeleteObject(obj); err != nil {
+			if err := r.DataplaneClient.DeleteObject(ctx, obj); err != nil {
 				return ctrl.Result{}, err
 			}
 			return ctrl.Result{Requeue: true}, nil // wait until the object is no longer present in the cache
@@ -574,14 +574,14 @@ func (r *{{.PackageAlias}}{{.Kind}}Reconciler) Reconcile(ctx context.Context, re
 	if !ctrlutils.MatchesIngressClass(obj, r.IngressClassName, ctrlutils.IsDefaultIngressClass(class)) {
 		log.V(util.DebugLevel).Info("object missing ingress class, ensuring it's removed from configuration",
 		"namespace", req.Namespace, "name", req.Name, "class", r.IngressClassName)
-		return ctrl.Result{}, r.DataplaneClient.DeleteObject(obj)
+		return ctrl.Result{}, r.DataplaneClient.DeleteObject(ctx, obj)
 	} else {
 		log.V(util.DebugLevel).Info("object has matching ingress class", "namespace", req.Namespace, "name", req.Name,
 		"class", r.IngressClassName)
 	}
 {{end}}
 	// update the kong Admin API with the changes
-	if err := r.DataplaneClient.UpdateObject(obj); err != nil {
+	if err := r.DataplaneClient.UpdateObject(ctx, obj); err != nil {
 		return ctrl.Result{}, err
 	}
 

internal/adminapi/endpoints_test.go

@@ -13,7 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	ctrlclientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
 func TestAddressesFromEndpointSlice(t *testing.T) {
@@ -537,7 +537,7 @@ func TestGetAdminAPIsForService(t *testing.T) {
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			fakeClient := fakeclient.NewClientBuilder().
+			fakeClient := ctrlclientfake.NewClientBuilder().
 				WithLists(tt.objects...).
 				Build()
 

internal/admission/validator.go

@@ -111,7 +111,7 @@ func (validator KongHTTPValidator) ValidateConsumer(
 	ignoredSecrets := make(map[string]map[string]struct{})
 	for _, secretName := range consumer.Credentials {
 		// retrieve the credentials secret
-		secret, err := validator.SecretGetter.GetSecret(consumer.Namespace, secretName)
+		secret, err := validator.SecretGetter.GetSecret(ctx, consumer.Namespace, secretName)
 		if err != nil {
 			if apierrors.IsNotFound(err) {
 				return false, ErrTextConsumerCredentialSecretNotFound, err
@@ -236,7 +236,7 @@ func (validator KongHTTPValidator) ValidatePlugin(
 		if len(plugin.Config) > 0 {
 			return false, ErrTextPluginUsesBothConfigTypes, nil
 		}
-		config, err := kongstate.SecretToConfiguration(validator.SecretGetter, (*k8sPlugin.ConfigFrom).SecretValue, k8sPlugin.Namespace)
+		config, err := kongstate.SecretToConfiguration(ctx, validator.SecretGetter, (*k8sPlugin.ConfigFrom).SecretValue, k8sPlugin.Namespace)
 		if err != nil {
 			return false, ErrTextPluginSecretConfigUnretrievable, err
 		}
@@ -433,9 +433,9 @@ type managerClientSecretGetter struct {
 	managerClient client.Client
 }
 
-func (m *managerClientSecretGetter) GetSecret(namespace, name string) (*corev1.Secret, error) {
+func (m *managerClientSecretGetter) GetSecret(ctx context.Context, namespace, name string) (*corev1.Secret, error) {
 	secret := &corev1.Secret{}
-	return secret, m.managerClient.Get(context.Background(), client.ObjectKey{
+	return secret, m.managerClient.Get(ctx, client.ObjectKey{
 		Namespace: namespace,
 		Name:      name,
 	}, secret)

internal/controllers/configuration/secret_controller.go

@@ -103,7 +103,7 @@ func (r *CoreV1SecretReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		if apierrors.IsNotFound(err) {
 			secret.Namespace = req.Namespace
 			secret.Name = req.Name
-			return ctrl.Result{}, r.DataplaneClient.DeleteObject(secret)
+			return ctrl.Result{}, r.DataplaneClient.DeleteObject(ctx, secret)
 		}
 		return ctrl.Result{}, err
 	}
@@ -112,12 +112,12 @@ func (r *CoreV1SecretReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	// clean the object up if it's being deleted
 	if !secret.DeletionTimestamp.IsZero() && time.Now().After(secret.DeletionTimestamp.Time) {
 		log.V(util.DebugLevel).Info("resource is being deleted, its configuration will be removed", "type", "Secret", "namespace", req.Namespace, "name", req.Name)
-		objectExistsInCache, err := r.DataplaneClient.ObjectExists(secret)
+		objectExistsInCache, err := r.DataplaneClient.ObjectExists(ctx, secret)
 		if err != nil {
 			return ctrl.Result{}, err
 		}
 		if objectExistsInCache {
-			if err := r.DataplaneClient.DeleteObject(secret); err != nil {
+			if err := r.DataplaneClient.DeleteObject(ctx, secret); err != nil {
 				return ctrl.Result{}, err
 			}
 			return ctrl.Result{Requeue: true}, nil // wait until the object is no longer present in the cache
@@ -126,7 +126,7 @@ func (r *CoreV1SecretReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 
 	// update the kong Admin API with the changes
-	if err := r.DataplaneClient.UpdateObject(secret); err != nil {
+	if err := r.DataplaneClient.UpdateObject(ctx, secret); err != nil {
 		return ctrl.Result{}, err
 	}