fix: bump kube-linter to version which supports more recent k8s apis (#189)

Author: Ajpantuso

Makefile

@@ -1,4 +1,3 @@
-GOFLAGS_MOD = -mod=vendor
 GOLANGCI_OPTIONAL_CONFIG = .golangci.yml
 IMAGE_REPOSITORY ?= app-sre
 REGISTRY_USER = $(QUAY_USER)

cmd/manager/main.go

@@ -196,8 +196,8 @@ func getManagerOptions(scheme *k8sruntime.Scheme, opts options) (manager.Options
 		HealthProbeBindAddress: opts.ProbeAddr,
 		MetricsBindAddress:     "0", // disable controller-runtime managed prometheus endpoint
 		// disable caching of everything
-		ClientBuilder: &newUncachedClientBuilder{},
-		Scheme:        scheme,
+		NewClient: newClient,
+		Scheme:    scheme,
 	}
 
 	// Add support for MultiNamespace set in WATCH_NAMESPACE (e.g ns1,ns2)
@@ -212,24 +212,15 @@ func getManagerOptions(scheme *k8sruntime.Scheme, opts options) (manager.Options
 	return mgrOpts, nil
 }
 
-type newUncachedClientBuilder struct {
-	uncached []client.Object
-}
-
-func (n *newUncachedClientBuilder) WithUncached(objs ...client.Object) manager.ClientBuilder {
-	n.uncached = append(n.uncached, objs...)
-	return n
-}
-
-func (n *newUncachedClientBuilder) Build(
-	cache cache.Cache, config *rest.Config, options client.Options) (client.Client, error) {
-	// Directly use the API client, without wrapping it in a delegatingClient for cache access.
+func newClient(_ cache.Cache, cfg *rest.Config, opts client.Options, _ ...client.Object) (client.Client, error) {
 	qps, err := kubeClientQPS()
 	if err != nil {
 		return nil, err
 	}
-	config.QPS = qps
-	return client.New(config, options)
+
+	cfg.QPS = qps
+
+	return client.New(cfg, opts)
 }
 
 func kubeClientQPS() (float32, error) {

go.mod

@@ -3,50 +3,19 @@ module github.com/app-sre/deployment-validation-operator
 go 1.16
 
 require (
-	cloud.google.com/go v0.74.0 // indirect
-	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
-	github.com/go-logr/logr v0.3.0
+	github.com/go-logr/logr v0.4.0
 	github.com/go-openapi/swag v0.19.15 // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de // indirect
 	github.com/mcuadros/go-defaults v1.2.0
-	github.com/mitchellh/mapstructure v1.4.1 // indirect
-	github.com/onsi/ginkgo v1.15.0 // indirect
-	github.com/onsi/gomega v1.10.5 // indirect
 	github.com/openshift/api v3.9.0+incompatible
-	github.com/pelletier/go-toml v1.7.0 // indirect
 	github.com/prometheus/client_golang v1.12.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/smartystreets/assertions v1.0.1 // indirect
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.7.0
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.5.0
-	golang.org/x/mod v0.4.2 // indirect
-	golang.org/x/oauth2 v0.0.0-20210210192628-66670185b0cd // indirect
-	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
-	golang.stackrox.io/kube-linter v0.0.0-20210923173231-2a83cbe3dec2
-	google.golang.org/protobuf v1.26.0 // indirect
-	gopkg.in/ini.v1 v1.57.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/api v0.21.0
-	k8s.io/apimachinery v0.21.0
-	k8s.io/client-go v0.21.0
-	sigs.k8s.io/controller-runtime v0.8.3
+	github.com/spf13/viper v1.9.0
+	go.uber.org/multierr v1.6.0
+	golang.stackrox.io/kube-linter v0.0.0-20210928184316-5e1ead387f43
+	k8s.io/api v0.22.2
+	k8s.io/apimachinery v0.22.2
+	k8s.io/client-go v0.22.2
+	sigs.k8s.io/controller-runtime v0.10.3
 )
-
-replace (
-	github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible // Required by OLM
-	github.com/go-openapi/spec => github.com/go-openapi/spec v0.0.0-20180415031709-bcff419492ee
-	github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v1.7.2
-	github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.46.0
-	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.9.0
-	k8s.io/api => k8s.io/api v0.20.4
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.4
-	k8s.io/apimachinery => k8s.io/apimachinery v0.20.4
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.4
-	k8s.io/client-go => k8s.io/client-go v0.20.4
-)
-
-exclude github.com/spf13/viper v1.3.2 // Required to fix CVE-2018-1098

go.sum

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	dto "github.com/prometheus/client_model/go"
 )
@@ -23,8 +24,8 @@ func NewServer(registry Registry, path, addr string) (*Server, error) {
 	}
 
 	var (
-		processCollector = prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{})
-		goCollector      = prometheus.NewGoCollector()
+		processCollector = collectors.NewProcessCollector(collectors.ProcessCollectorOpts{})
+		goCollector      = collectors.NewGoCollector()
 	)
 
 	if err := registry.Register(processCollector); err != nil {