Merge pull request #177 from jianrongzhang89/cleanup

Code cleanup: remove un-used clientset

Author: jianrongzhang89

controllers/backstage_controller.go

@@ -31,7 +31,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/yaml"
-	"k8s.io/client-go/kubernetes"
 	"k8s.io/utils/pointer"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -46,8 +45,6 @@ const (
 type BackstageReconciler struct {
 	client.Client
 
-	Clientset *kubernetes.Clientset
-
 	Scheme *runtime.Scheme
 	// If true, Backstage Controller always sync the state of runtime objects created
 	// otherwise, runtime objects can be re-configured independently
@@ -298,14 +295,6 @@ func (r *BackstageReconciler) labels(meta *v1.ObjectMeta, backstage bs.Backstage
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *BackstageReconciler) SetupWithManager(mgr ctrl.Manager, log logr.Logger) error {
-
-	clientset, err := kubernetes.NewForConfig(mgr.GetConfig())
-	if err != nil {
-		log.Error(err, "unable to create clientset")
-		return err
-	}
-	r.Clientset = clientset
-
 	if len(r.PsqlImage) == 0 {
 		r.PsqlImage = "quay.io/fedora/postgresql-15:latest"
 		log.Info("Enviroment variable is not set, default is used", bs.EnvPostGresImage, r.PsqlImage)

controllers/backstage_controller_test.go

@@ -62,7 +62,6 @@ var _ = Describe("Backstage controller", func() {
 
 		backstageReconciler = &BackstageReconciler{
 			Client:         k8sClient,
-			Clientset:      k8sClientset,
 			Scheme:         k8sClient.Scheme(),
 			Namespace:      ns,
 			OwnsRuntime:    true,

controllers/suite_test.go

@@ -23,7 +23,6 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/util/rand"
 
-	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -40,7 +39,6 @@ import (
 
 var cfg *rest.Config
 var k8sClient client.Client
-var k8sClientset *kubernetes.Clientset
 
 var testEnv *envtest.Environment
 
@@ -77,10 +75,6 @@ var _ = BeforeSuite(func() {
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
 	Expect(err).NotTo(HaveOccurred())
 	Expect(k8sClient).NotTo(BeNil())
-
-	k8sClientset, err = kubernetes.NewForConfig(cfg)
-	Expect(err).NotTo(HaveOccurred())
-	Expect(k8sClientset).NotTo(BeNil())
 })
 
 var _ = AfterSuite(func() {