Reuse discovery client from k8s client set

fluxcd · Jan 22, 2019 · a936989 · a936989
1 parent 83a750b
commit a936989
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/cluster/kubernetes/scoper.go b/cluster/kubernetes/scoper.go
@@ -8,7 +8,7 @@ import (
 )
 
 type Scoper struct {
-	Client *discovery.DiscoveryClient
+	Client discovery.ServerResourcesInterface
 }
 
 func (s *Scoper) Scope(groupVersion string, kind string) (int, error) {

diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
@@ -17,11 +17,11 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/pflag"
-	k8sifclient "github.com/weaveworks/flux/integrations/client/clientset/versioned"
-	"k8s.io/client-go/discovery"
 	k8sclient "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
+	k8sifclient "github.com/weaveworks/flux/integrations/client/clientset/versioned"
+
 	"github.com/weaveworks/flux/checkpoint"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/cluster/kubernetes"
@@ -273,16 +273,11 @@ func main() {
 
 		k8s = k8sInst
 		imageCreds = k8sInst.ImagesToFetch
-		k8sDiscoveryClient, err := discovery.NewDiscoveryClientForConfig(restClientConfig)
-		if err != nil {
-			logger.Log("err", err)
-			os.Exit(1)
-		}
 		// There is only one way we currently interpret a repo of
 		// files as manifests, and that's as Kubernetes yamels.
 		k8sManifests = &kubernetes.Manifests{
 			AllowedNamespaces: allowedNamespaces,
-			Scoper:            &kubernetes.Scoper{Client: k8sDiscoveryClient},
+			Scoper:            &kubernetes.Scoper{Client: clientset.Discovery()},
 		}
 	}