Skip to content

Commit 673e825

Browse files
committed
fix lint
1 parent 99b423d commit 673e825

1 file changed

Lines changed: 9 additions & 13 deletions

File tree

internal/controller/apisixconsumer_controller.go

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232

3333
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
3434
apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
35-
v2 "github.com/apache/apisix-ingress-controller/api/v2"
3635
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
3736
"github.com/apache/apisix-ingress-controller/internal/controller/status"
3837
"github.com/apache/apisix-ingress-controller/internal/provider"
@@ -72,34 +71,31 @@ func (r *ApisixConsumerReconciler) Reconcile(ctx context.Context, req ctrl.Reque
7271
}
7372

7473
var (
75-
tctx = provider.NewDefaultTranslateContext(ctx)
76-
reasonErr error
74+
tctx = provider.NewDefaultTranslateContext(ctx)
75+
ingressClass *networkingv1.IngressClass
76+
err error
7777
)
7878
defer func() {
79-
r.updateStatus(ac, reasonErr)
79+
r.updateStatus(ac, err)
8080
}()
8181

82-
ingressClass, err := GetIngressClass(tctx, r.Client, r.Log, ac.Spec.IngressClassName)
82+
ingressClass, err = GetIngressClass(tctx, r.Client, r.Log, ac.Spec.IngressClassName)
8383
if err != nil {
8484
r.Log.Error(err, "failed to get IngressClass")
85-
reasonErr = err
8685
return ctrl.Result{}, err
8786
}
8887

89-
if err := ProcessIngressClassParameters(tctx, r.Client, r.Log, ac, ingressClass); err != nil {
88+
if err = ProcessIngressClassParameters(tctx, r.Client, r.Log, ac, ingressClass); err != nil {
9089
r.Log.Error(err, "failed to process IngressClass parameters", "ingressClass", ingressClass.Name)
91-
reasonErr = err
9290
return ctrl.Result{}, err
9391
}
9492

95-
if err := r.processSpec(ctx, tctx, ac); err != nil {
96-
reasonErr = err
93+
if err = r.processSpec(ctx, tctx, ac); err != nil {
9794
return ctrl.Result{}, err
9895
}
9996

100-
if err := r.Provider.Update(ctx, tctx, ac); err != nil {
97+
if err = r.Provider.Update(ctx, tctx, ac); err != nil {
10198
r.Log.Error(err, "failed to update provider", "ApisixConsumer", ac)
102-
reasonErr = err
10399
return ctrl.Result{}, err
104100
}
105101
return ctrl.Result{}, nil
@@ -180,7 +176,7 @@ func (r *ApisixConsumerReconciler) listApisixConsumerForSecret(ctx context.Conte
180176
ctx,
181177
r.Client,
182178
r.Log,
183-
&v2.ApisixConsumerList{},
179+
&apiv2.ApisixConsumerList{},
184180
client.MatchingFields{
185181
indexer.SecretIndexRef: indexer.GenIndexKey(secret.GetNamespace(), secret.GetName()),
186182
},

0 commit comments

Comments
 (0)