From f4ac85dfed262b427502722f317e33680a021235 Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Sat, 30 Apr 2022 17:15:40 +0200 Subject: [PATCH] refactor: using k8s client scheme --- controllers/secret/errors.go | 3 +-- controllers/servicelabels/endpoint.go | 5 ++--- controllers/servicelabels/endpoint_slices.go | 3 +-- controllers/servicelabels/service.go | 5 ++--- controllers/tenant/limitranges.go | 2 +- controllers/tenant/manager.go | 2 -- controllers/tenant/networkpolicies.go | 2 +- controllers/tenant/resourcequotas.go | 2 +- controllers/tenant/rolebindings.go | 2 +- main.go | 3 --- 10 files changed, 10 insertions(+), 19 deletions(-) diff --git a/controllers/secret/errors.go b/controllers/secret/errors.go index c12fe63d..4e8d6117 100644 --- a/controllers/secret/errors.go +++ b/controllers/secret/errors.go @@ -3,8 +3,7 @@ package secret -type MissingCaError struct { -} +type MissingCaError struct{} func (MissingCaError) Error() string { return "CA has not been created yet, please generate a new" diff --git a/controllers/servicelabels/endpoint.go b/controllers/servicelabels/endpoint.go index 44ac7882..d9eb80bc 100644 --- a/controllers/servicelabels/endpoint.go +++ b/controllers/servicelabels/endpoint.go @@ -19,9 +19,8 @@ type EndpointsLabelsReconciler struct { func (r *EndpointsLabelsReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error { r.abstractServiceLabelsReconciler = abstractServiceLabelsReconciler{ - obj: &corev1.Endpoints{}, - scheme: mgr.GetScheme(), - log: r.Log, + obj: &corev1.Endpoints{}, + log: r.Log, } return ctrl.NewControllerManagedBy(mgr). diff --git a/controllers/servicelabels/endpoint_slices.go b/controllers/servicelabels/endpoint_slices.go index 5389e398..ccb88075 100644 --- a/controllers/servicelabels/endpoint_slices.go +++ b/controllers/servicelabels/endpoint_slices.go @@ -22,8 +22,7 @@ type EndpointSlicesLabelsReconciler struct { func (r *EndpointSlicesLabelsReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error { r.abstractServiceLabelsReconciler = abstractServiceLabelsReconciler{ - scheme: mgr.GetScheme(), - log: r.Log, + log: r.Log, } switch { diff --git a/controllers/servicelabels/service.go b/controllers/servicelabels/service.go index 1e097b43..97a21715 100644 --- a/controllers/servicelabels/service.go +++ b/controllers/servicelabels/service.go @@ -19,9 +19,8 @@ type ServicesLabelsReconciler struct { func (r *ServicesLabelsReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error { r.abstractServiceLabelsReconciler = abstractServiceLabelsReconciler{ - obj: &corev1.Service{}, - scheme: mgr.GetScheme(), - log: r.Log, + obj: &corev1.Service{}, + log: r.Log, } return ctrl.NewControllerManagedBy(mgr). For(r.abstractServiceLabelsReconciler.obj, r.abstractServiceLabelsReconciler.forOptionPerInstanceName(ctx)). diff --git a/controllers/tenant/limitranges.go b/controllers/tenant/limitranges.go index 726108c5..642935d1 100644 --- a/controllers/tenant/limitranges.go +++ b/controllers/tenant/limitranges.go @@ -65,7 +65,7 @@ func (r *Manager) syncLimitRange(ctx context.Context, tenant *capsulev1beta1.Ten limitRangeLabel: strconv.Itoa(i), } target.Spec = spec - return controllerutil.SetControllerReference(tenant, target, r.Scheme) + return controllerutil.SetControllerReference(tenant, target, r.Client.Scheme()) }) r.emitEvent(tenant, target.GetNamespace(), res, fmt.Sprintf("Ensuring LimitRange %s", target.GetName()), err) diff --git a/controllers/tenant/manager.go b/controllers/tenant/manager.go index 00054649..fb3ad18d 100644 --- a/controllers/tenant/manager.go +++ b/controllers/tenant/manager.go @@ -8,7 +8,6 @@ import ( networkingv1 "k8s.io/api/networking/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/retry" @@ -22,7 +21,6 @@ import ( type Manager struct { client.Client Log logr.Logger - Scheme *runtime.Scheme Recorder record.EventRecorder RESTConfig *rest.Config } diff --git a/controllers/tenant/networkpolicies.go b/controllers/tenant/networkpolicies.go index f460c4b9..d821092d 100644 --- a/controllers/tenant/networkpolicies.go +++ b/controllers/tenant/networkpolicies.go @@ -66,7 +66,7 @@ func (r *Manager) syncNetworkPolicy(ctx context.Context, tenant *capsulev1beta1. }) target.Spec = spec - return controllerutil.SetControllerReference(tenant, target, r.Scheme) + return controllerutil.SetControllerReference(tenant, target, r.Client.Scheme()) }) r.emitEvent(tenant, target.GetNamespace(), res, fmt.Sprintf("Ensuring NetworkPolicy %s", target.GetName()), err) diff --git a/controllers/tenant/resourcequotas.go b/controllers/tenant/resourcequotas.go index 6d6186ef..02473cb6 100644 --- a/controllers/tenant/resourcequotas.go +++ b/controllers/tenant/resourcequotas.go @@ -187,7 +187,7 @@ func (r *Manager) syncResourceQuota(ctx context.Context, tenant *capsulev1beta1. target.Spec.Hard = resQuota.Hard } - return controllerutil.SetControllerReference(tenant, target, r.Scheme) + return controllerutil.SetControllerReference(tenant, target, r.Client.Scheme()) }) return retryErr diff --git a/controllers/tenant/rolebindings.go b/controllers/tenant/rolebindings.go index 85f49c7d..c52acd70 100644 --- a/controllers/tenant/rolebindings.go +++ b/controllers/tenant/rolebindings.go @@ -134,7 +134,7 @@ func (r *Manager) syncAdditionalRoleBinding(ctx context.Context, tenant *capsule } target.Subjects = roleBinding.Subjects - return controllerutil.SetControllerReference(tenant, target, r.Scheme) + return controllerutil.SetControllerReference(tenant, target, r.Client.Scheme()) }) r.emitEvent(tenant, target.GetNamespace(), res, fmt.Sprintf("Ensuring RoleBinding %s", target.GetName()), err) diff --git a/main.go b/main.go index 5d462128..de3d0cb0 100644 --- a/main.go +++ b/main.go @@ -133,7 +133,6 @@ func main() { if err = (&secretcontroller.CAReconciler{ Client: manager.GetClient(), Log: ctrl.Log.WithName("controllers").WithName("CA"), - Scheme: manager.GetScheme(), Namespace: namespace, Configuration: cfg, }).SetupWithManager(manager); err != nil { @@ -144,7 +143,6 @@ func main() { if err = (&secretcontroller.TLSReconciler{ Client: manager.GetClient(), Log: ctrl.Log.WithName("controllers").WithName("Tls"), - Scheme: manager.GetScheme(), Namespace: namespace, Configuration: cfg, }).SetupWithManager(manager); err != nil { @@ -185,7 +183,6 @@ func main() { RESTConfig: manager.GetConfig(), Client: manager.GetClient(), Log: ctrl.Log.WithName("controllers").WithName("Tenant"), - Scheme: manager.GetScheme(), Recorder: manager.GetEventRecorderFor("tenant-controller"), }).SetupWithManager(manager); err != nil { setupLog.Error(err, "unable to create controller", "controller", "Tenant")