Skip to content

Upgrade golangci-lint to v2.14.0 #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbaldessari wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade golangci-lint to v2.14.0 #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Run golangci-lint
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0
with:
version: v2.12.2
version: v2.14.0
args: --timeout 5m -v

#--exclude SA5011
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GOFLAGS=-mod=vendor
REGISTRY ?= localhost
UPLOADREGISTRY ?= quay.io/validatedpatterns
GOLANGCI_IMG ?= docker.io/golangci/golangci-lint
GOLANGCI_VERSION ?= 2.12.2
GOLANGCI_VERSION ?= 2.14.0


# CI uses a non-writable home dir, make sure .cache is writable
Expand Down
19 changes: 0 additions & 19 deletions internal/controller/argo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,25 +384,6 @@ return health_status`,
},
},
},
Grafana: argooperator.ArgoCDGrafanaSpec{
Enabled: false,
Ingress: argooperator.ArgoCDIngressSpec{
Enabled: false,
},
Route: argooperator.ArgoCDRouteSpec{
Enabled: false,
},
Resources: &v1.ResourceRequirements{
Limits: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("500m"),
v1.ResourceMemory: resource.MustParse("256Mi"),
},
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("250m"),
v1.ResourceMemory: resource.MustParse("128Mi"),
},
},
},
HA: argooperator.ArgoCDHASpec{
Enabled: false,
Resources: &v1.ResourceRequirements{
Expand Down
1 change: 0 additions & 1 deletion internal/controller/pattern_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,6 @@ func (r *PatternReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
}

result := ctrl.Result{
Requeue: false,
RequeueAfter: ReconcileLoopRequeueTime,
}

Expand Down
Loading