Skip to content

Commit 208a85b

Browse files
committed
fix e2e workflows and fix linter
1 parent 156a5ab commit 208a85b

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

.github/workflows/kind-e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
fail-fast: false # Keep running if one leg fails.
1212
matrix:
1313
k8s-version:
14-
- v1.31.x
1514
- v1.32.x
15+
- v1.33.x
1616
ingress:
1717
- istio
1818
- contour

.golangci.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ linters:
141141
disable:
142142
- errcheck
143143
settings:
144+
staticcheck:
145+
checks:
146+
- all
147+
- "-QF1008" # Disable https://staticcheck.dev/docs/checks/#QF1008
144148
gocritic:
145149
disabled-checks:
146150
- exitAfterDefer
@@ -178,6 +182,9 @@ linters:
178182
- legacy
179183
- std-error-handling
180184
rules:
185+
- linters:
186+
- staticcheck
187+
text: v1.Endpoint.* is deprecated
181188
- linters:
182189
- gosec
183190
- noctx

pkg/reconciler/ingress/lister.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (l *gatewayPodTargetLister) BackendsToProbeTargets(ctx context.Context, bac
107107
} else {
108108
gw, err := l.gatewayLister.Gateways(gateway.Namespace).Get(gateway.Name)
109109
if apierrs.IsNotFound(err) {
110-
return nil, fmt.Errorf("Gateway %q does not exist: %w", gateway, err) //nolint:stylecheck
110+
return nil, fmt.Errorf("Gateway %q does not exist: %w", gateway, err) //nolint:staticcheck
111111
} else if err != nil {
112112
return nil, err
113113
}

pkg/reconciler/ingress/reconcile_resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ func (c *Reconciler) reconcileGatewayListeners(
316316
gw, err := c.gatewayLister.Gateways(gwName.Namespace).Get(gwName.Name)
317317
if apierrs.IsNotFound(err) {
318318
recorder.Eventf(ing, corev1.EventTypeWarning, "GatewayMissing", "Unable to update Gateway %s", gwName.String())
319-
return fmt.Errorf("Gateway %s does not exist: %w", gwName, err) //nolint:stylecheck
319+
return fmt.Errorf("Gateway %s does not exist: %w", gwName, err) //nolint:staticcheck
320320
} else if err != nil {
321321
return err
322322
}

pkg/reconciler/testing/factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func MakeFactory(ctor Ctor) rtesting.Factory {
7070
// Set up our Controller from the fakes.
7171
c := ctor(ctx, &ls, configmap.NewStaticWatcher())
7272
// Update the context with the stuff we decorated it with.
73-
r.Ctx = ctx //nolint:fatcontext
73+
r.Ctx = ctx
7474

7575
// The Reconciler won't do any work until it becomes the leader.
7676
if la, ok := c.(reconciler.LeaderAware); ok {

0 commit comments

Comments
 (0)