mirror of
https://github.com/projectcapsule/capsule.git
synced 2026-05-17 06:46:38 +00:00
chore(deps): update dependency golangci/golangci-lint to v2.2.1 (#1521)
* chore(deps): update dependency golangci/golangci-lint to v2.2.1 * chore(deps): update github/codeql-action action to v3.29.1 (#1519) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update github/codeql-action digest to 4c57370 (#1518) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency b1nary-gr0up/nwa to v0.7.4 (#1520) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency golangci/golangci-lint to v2.2.1 chore(deps): update dependency golangci/golangci-lint to v2.2.1 Signed-off-by: Hristo Hristov <me@hhristov.info> --------- Signed-off-by: Hristo Hristov <me@hhristov.info> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Hristo Hristov <me@hhristov.info>
This commit is contained in:
@@ -42,8 +42,8 @@ func (m *MetadataReconciler) Reconcile(ctx context.Context, request ctrl.Request
|
||||
tenant, err := m.getTenant(ctx, request.NamespacedName, m.Client)
|
||||
if err != nil {
|
||||
noTenantObjError := &NonTenantObjectError{}
|
||||
noPodMetaError := &NoPodMetadataError{}
|
||||
|
||||
noPodMetaError := &NoPodMetadataError{}
|
||||
if errors.As(err, &noTenantObjError) || errors.As(err, &noPodMetaError) {
|
||||
return reconcile.Result{}, nil
|
||||
}
|
||||
|
||||
@@ -53,7 +53,6 @@ func (r *Manager) SetupWithManager(ctx context.Context, mgr ctrl.Manager, config
|
||||
}
|
||||
},
|
||||
}).Complete(r)
|
||||
|
||||
if crbErr != nil {
|
||||
err = errors.Join(err, crbErr)
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ import (
|
||||
|
||||
type resourceClaimController struct {
|
||||
client.Client
|
||||
|
||||
metrics *metrics.ClaimRecorder
|
||||
log logr.Logger
|
||||
recorder record.EventRecorder
|
||||
|
||||
@@ -33,6 +33,7 @@ import (
|
||||
|
||||
type resourcePoolController struct {
|
||||
client.Client
|
||||
|
||||
metrics *metrics.ResourcePoolRecorder
|
||||
log logr.Logger
|
||||
recorder record.EventRecorder
|
||||
@@ -103,7 +104,6 @@ func (r resourcePoolController) Reconcile(ctx context.Context, request ctrl.Requ
|
||||
|
||||
return r.Client.Status().Update(ctx, current)
|
||||
})
|
||||
|
||||
if reconcileErr != nil || err != nil {
|
||||
log.V(3).Info("Failed to reconcile ResourcePool", "error", err)
|
||||
|
||||
|
||||
@@ -202,6 +202,7 @@ func (r *Processor) HandleSection(ctx context.Context, tnt capsulev1beta2.Tenant
|
||||
|
||||
if opErr := r.createOrUpdate(ctx, &obj, objLabels, objAnnotations); opErr != nil {
|
||||
log.Error(opErr, "unable to sync namespacedItems", kv...)
|
||||
|
||||
errorsChan <- opErr
|
||||
|
||||
return
|
||||
|
||||
@@ -34,8 +34,8 @@ func (r *abstractServiceLabelsReconciler) Reconcile(ctx context.Context, request
|
||||
tenant, err := r.getTenant(ctx, request.NamespacedName, r.client)
|
||||
if err != nil {
|
||||
noTenantObjError := &NonTenantObjectError{}
|
||||
noSvcMetaError := &NoServicesMetadataError{}
|
||||
|
||||
noSvcMetaError := &NoServicesMetadataError{}
|
||||
if errors.As(err, &noTenantObjError) || errors.As(err, &noSvcMetaError) {
|
||||
return reconcile.Result{}, nil
|
||||
}
|
||||
|
||||
@@ -64,6 +64,7 @@ func (r *Manager) syncLimitRange(ctx context.Context, tenant *capsulev1beta2.Ten
|
||||
}
|
||||
|
||||
var res controllerutil.OperationResult
|
||||
|
||||
res, err = controllerutil.CreateOrUpdate(ctx, r.Client, target, func() (err error) {
|
||||
labels := target.GetLabels()
|
||||
if labels == nil {
|
||||
|
||||
@@ -25,6 +25,7 @@ import (
|
||||
|
||||
type Manager struct {
|
||||
client.Client
|
||||
|
||||
Metrics *metrics.TenantRecorder
|
||||
Log logr.Logger
|
||||
Recorder record.EventRecorder
|
||||
|
||||
@@ -63,6 +63,7 @@ func (r *Manager) syncNetworkPolicy(ctx context.Context, tenant *capsulev1beta2.
|
||||
}
|
||||
|
||||
var res controllerutil.OperationResult
|
||||
|
||||
res, err = controllerutil.CreateOrUpdate(ctx, r.Client, target, func() (err error) {
|
||||
labels := target.GetLabels()
|
||||
if labels == nil {
|
||||
|
||||
@@ -128,6 +128,7 @@ func (r *Manager) syncAdditionalRoleBinding(ctx context.Context, tenant *capsule
|
||||
}
|
||||
|
||||
var res controllerutil.OperationResult
|
||||
|
||||
res, err = controllerutil.CreateOrUpdate(ctx, r.Client, target, func() error {
|
||||
if target.Labels == nil {
|
||||
target.Labels = map[string]string{}
|
||||
|
||||
@@ -41,6 +41,7 @@ const (
|
||||
|
||||
type Reconciler struct {
|
||||
client.Client
|
||||
|
||||
Log logr.Logger
|
||||
Scheme *runtime.Scheme
|
||||
Namespace string
|
||||
|
||||
Reference in New Issue
Block a user