diff --git a/Makefile b/Makefile index a145827..d2df77a 100644 --- a/Makefile +++ b/Makefile @@ -27,13 +27,10 @@ test: vendor CGO_ENABLED=0 go test -v ./... linters: - go get -u github.com/alecthomas/gometalinter - gometalinter --install + go get -u github.com/golangci/golangci-lint/cmd/golangci-lint lint: - gometalinter --tests --disable-all --vendor --deadline=5m -e ".*generated.*" \ - -E gofmt -E golint -E gosimple -E vet -E misspell -E ineffassign -E deadcode \ - $(LINTER_PKGS) + golangci-lint run -D errcheck -D staticcheck ./... cover: vendor CGO_ENABLED=0 go test -v -coverprofile=coverage.txt -covermode=atomic ./... diff --git a/internal/ingressmonitor/operator_test.go b/internal/ingressmonitor/operator_test.go index 2e51a6e..57697a1 100644 --- a/internal/ingressmonitor/operator_test.go +++ b/internal/ingressmonitor/operator_test.go @@ -13,7 +13,7 @@ import ( imfake "github.com/jelmersnoeck/ingress-monitor/pkg/client/generated/clientset/versioned/fake" "github.com/prometheus/client_golang/prometheus" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -349,7 +349,6 @@ type operatorConfig struct { providers []runtime.Object templates []runtime.Object - monitors []runtime.Object ingressmonitors []runtime.Object crdObjects []runtime.Object } @@ -377,13 +376,6 @@ func withTemplates(obj ...runtime.Object) optionFunc { } } -func withMonitors(obj ...runtime.Object) optionFunc { - return func(op *operatorConfig) { - op.monitors = append(op.monitors, obj...) - op.crdObjects = append(op.crdObjects, obj...) - } -} - func withIngressMonitors(obj ...runtime.Object) optionFunc { return func(op *operatorConfig) { op.ingressmonitors = append(op.ingressmonitors, obj...)