Bump golangci-lint and switch to the revive (#4089)

* Bump golag-ci lint version to 1.40.1 Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com> * Bump linter on CI Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com> * Fix promlinter and examples Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
prometheus-operator · Jun 9, 2021 · 9fcdff9 · 9fcdff9
1 parent fa3edac
commit 9fcdff9
Show file tree

Hide file tree

Showing 22 changed files with 19,031 additions and 5,956 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -45,7 +45,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.33
+          version: v1.40.1
           args: --timeout 10m0s
   check-metrics:
     runs-on: ubuntu-latest

diff --git a/.golangci.yml b/.golangci.yml
@@ -3,13 +3,17 @@ run:
 
 linters:
   enable:
-  - golint
+  - revive
 
 issues:
   exclude-rules:
   - path: _test.go
     linters:
     - errcheck
+  # TODO: fix linter errors before enabling it for the framework
+  - path: test/framework
+    linters:
+    - revive
 
 linters-settings:
   errcheck:

diff --git a/Makefile b/Makefile
@@ -240,7 +240,7 @@ shellcheck: $(SHELLCHECK_BINARY)
 
 .PHONY: check-metrics
 check-metrics: $(PROMLINTER_BINARY)
-	$(PROMLINTER_BINARY) .
+	$(PROMLINTER_BINARY) lint .
 
 .PHONY: check-golang
 check-golang: $(GOLANGCILINTER_BINARY)

diff --git a/bundle.yaml b/bundle.yaml
diff --git a/cmd/operator/main.go b/cmd/operator/main.go
@@ -366,7 +366,7 @@ func Main() int {
 		return 1
 	}
 
-	var tlsConfig *tls.Config = nil
+	var tlsConfig *tls.Config
 	if serverTLS {
 		if rawTLSCipherSuites != "" {
 			cfg.ServerTLSConfig.CipherSuites = strings.Split(rawTLSCipherSuites, ",")

diff --git a/example/mixin/alerts.yaml b/example/mixin/alerts.yaml
@@ -3,7 +3,8 @@ groups:
   rules:
   - alert: PrometheusOperatorListErrors
     annotations:
-      description: Errors while performing List operations in controller {{$labels.controller}} in {{$labels.namespace}} namespace.
+      description: Errors while performing List operations in controller {{$labels.controller}}
+        in {{$labels.namespace}} namespace.
       summary: Errors while performing list operations in controller.
     expr: |
       (sum by (controller,namespace) (rate(prometheus_operator_list_operations_failed_total{job="prometheus-operator"}[10m])) / sum by (controller,namespace) (rate(prometheus_operator_list_operations_total{job="prometheus-operator"}[10m]))) > 0.4
@@ -12,7 +13,8 @@ groups:
       severity: warning
   - alert: PrometheusOperatorWatchErrors
     annotations:
-      description: Errors while performing watch operations in controller {{$labels.controller}} in {{$labels.namespace}} namespace.
+      description: Errors while performing watch operations in controller {{$labels.controller}}
+        in {{$labels.namespace}} namespace.
       summary: Errors while performing watch operations in controller.
     expr: |
       (sum by (controller,namespace) (rate(prometheus_operator_watch_operations_failed_total{job="prometheus-operator"}[10m])) / sum by (controller,namespace) (rate(prometheus_operator_watch_operations_total{job="prometheus-operator"}[10m]))) > 0.4
@@ -21,7 +23,8 @@ groups:
       severity: warning
   - alert: PrometheusOperatorSyncFailed
     annotations:
-      description: Controller {{ $labels.controller }} in {{ $labels.namespace }} namespace fails to reconcile {{ $value }} objects.
+      description: Controller {{ $labels.controller }} in {{ $labels.namespace }}
+        namespace fails to reconcile {{ $value }} objects.
       summary: Last controller reconciliation failed
     expr: |
       min_over_time(prometheus_operator_syncs{status="failed",job="prometheus-operator"}[5m]) > 0
@@ -30,7 +33,8 @@ groups:
       severity: warning
   - alert: PrometheusOperatorReconcileErrors
     annotations:
-      description: '{{ $value | humanizePercentage }} of reconciling operations failed for {{ $labels.controller }} controller in {{ $labels.namespace }} namespace.'
+      description: '{{ $value | humanizePercentage }} of reconciling operations failed
+        for {{ $labels.controller }} controller in {{ $labels.namespace }} namespace.'
       summary: Errors while reconciling controller.
     expr: |
       (sum by (controller,namespace) (rate(prometheus_operator_reconcile_errors_total{job="prometheus-operator"}[5m]))) / (sum by (controller,namespace) (rate(prometheus_operator_reconcile_operations_total{job="prometheus-operator"}[5m]))) > 0.1
@@ -39,7 +43,8 @@ groups:
       severity: warning
   - alert: PrometheusOperatorNodeLookupErrors
     annotations:
-      description: Errors while reconciling Prometheus in {{ $labels.namespace }} Namespace.
+      description: Errors while reconciling Prometheus in {{ $labels.namespace }}
+        Namespace.
       summary: Errors while reconciling Prometheus.
     expr: |
       rate(prometheus_operator_node_address_lookup_errors_total{job="prometheus-operator"}[5m]) > 0.1
@@ -48,7 +53,8 @@ groups:
       severity: warning
   - alert: PrometheusOperatorNotReady
     annotations:
-      description: Prometheus operator in {{ $labels.namespace }} namespace isn't ready to reconcile {{ $labels.controller }} resources.
+      description: Prometheus operator in {{ $labels.namespace }} namespace isn't
+        ready to reconcile {{ $labels.controller }} resources.
       summary: Prometheus operator not ready
     expr: |
       min by(namespace, controller) (max_over_time(prometheus_operator_ready{job="prometheus-operator"}[5m]) == 0)
@@ -57,7 +63,9 @@ groups:
       severity: warning
   - alert: PrometheusOperatorRejectedResources
     annotations:
-      description: Prometheus operator in {{ $labels.namespace }} namespace rejected {{ printf "%0.0f" $value }} {{ $labels.controller }}/{{ $labels.resource }} resources.
+      description: Prometheus operator in {{ $labels.namespace }} namespace rejected
+        {{ printf "%0.0f" $value }} {{ $labels.controller }}/{{ $labels.resource }}
+        resources.
       summary: Resources rejected by Prometheus operator
     expr: |
       min_over_time(prometheus_operator_managed_resources{state="rejected",job="prometheus-operator"}[5m]) > 0