diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index be687dddf..efe3b6ff1 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -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 diff --git a/Makefile b/Makefile index 81ebb6e3f..5ca7a476a 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/internal/controller/argo.go b/internal/controller/argo.go index d0954a05b..1ca33b56d 100644 --- a/internal/controller/argo.go +++ b/internal/controller/argo.go @@ -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{ diff --git a/internal/controller/pattern_controller.go b/internal/controller/pattern_controller.go index 915256a01..24d82b47d 100644 --- a/internal/controller/pattern_controller.go +++ b/internal/controller/pattern_controller.go @@ -324,7 +324,6 @@ func (r *PatternReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct } result := ctrl.Result{ - Requeue: false, RequeueAfter: ReconcileLoopRequeueTime, }