Fix Headers in Generated Code & Cleanup

This commit updates the header for all generated code, specifically
removing any leading spaces.  Additionally, various other cleanup
is included per code review feedback.

controller/namespace/namespacecontroller.go

@@ -18,38 +18,30 @@ limitations under the License.
 import (
 	"github.com/crunchydata/postgres-operator/config"
 	"github.com/crunchydata/postgres-operator/controller"
-	"github.com/crunchydata/postgres-operator/kubeapi"
 	"github.com/crunchydata/postgres-operator/operator"
 
 	log "github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	coreinformers "k8s.io/client-go/informers/core/v1"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 )
 
 // Controller holds the connections for the controller
 type Controller struct {
-	NamespaceClient    *rest.RESTClient
-	NamespaceClientset *kubernetes.Clientset
-	ControllerManager  controller.ManagerInterface
-	Informer           coreinformers.NamespaceInformer
+	ControllerManager controller.ManagerInterface
+	Informer          coreinformers.NamespaceInformer
 }
 
 // NewNamespaceController creates a new namespace controller that will watch for namespace events
 // as responds accordingly.  This adding and removing controller groups as namespaces watched by the
 // PostgreSQL Operator are added and deleted.
-func NewNamespaceController(clients *kubeapi.ControllerClients,
-	controllerManager controller.ManagerInterface,
+func NewNamespaceController(controllerManager controller.ManagerInterface,
 	informer coreinformers.NamespaceInformer) (*Controller, error) {
 
 	controller := &Controller{
-		NamespaceClient:    clients.PGORestclient,
-		NamespaceClientset: clients.Kubeclientset,
-		ControllerManager:  controllerManager,
-		Informer:           informer,
+		ControllerManager: controllerManager,
+		Informer:          informer,
 	}
 
 	return controller, nil

hack/boilerplate.go.txt

@@ -1,10 +1,10 @@
 /*
- Copyright 2020 Crunchy Data Solutions, Inc.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Copyright 2020 Crunchy Data Solutions, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
- http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

kubeapi/client_config.go

@@ -17,7 +17,6 @@ package kubeapi
 
 import (
 	clientset "github.com/crunchydata/postgres-operator/pkg/generated/clientset/versioned"
-	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -87,7 +86,6 @@ func createPGOClient(config *rest.Config) (*rest.RESTClient, *clientset.Clientse
 	pgoClientset, err := clientset.NewForConfig(config)
 	pgoRESTClient := pgoClientset.CrunchydataV1().RESTClient().(*rest.RESTClient)
 	if err != nil {
-		log.Error(err)
 		return nil, nil, err
 	}
 	return pgoRESTClient, pgoClientset, nil

pgo-rmdata/pgo-rmdata.go

@@ -60,7 +60,7 @@ func main() {
 	}
 
 	var err error
-	_, request.Clientset, err = kubeapi.NewKubeClient()
+	request.RESTConfig, request.Clientset, err = kubeapi.NewKubeClient()
 	if err != nil {
 		log.Fatalln(err.Error())
 	}

pgo-scheduler/pgo-scheduler.go

@@ -35,7 +35,6 @@ import (
 	kubeinformers "k8s.io/client-go/informers"
 	coreinformers "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 )
 
@@ -166,21 +165,6 @@ func main() {
 	}
 }
 
-func newKubeClient() (*kubernetes.Clientset, error) {
-	var client *kubernetes.Clientset
-	config, err := rest.InClusterConfig()
-	if err != nil {
-		return client, err
-	}
-
-	client, err = kubernetes.NewForConfig(config)
-	if err != nil {
-		return client, err
-	}
-
-	return client, nil
-}
-
 // SetupNamespaceController sets up a namespace controller that monitors for namespace add and
 // delete events, and then either creates or removes controllers for those namespaces
 func SetupNamespaceController(installationName string, scheduler *scheduler.Scheduler,

pgo-scheduler/scheduler/configmapcontroller.go

@@ -51,17 +51,15 @@ func (c *Controller) onAdd(obj interface{}) {
 
 // onDelete is called when a configMap is deleted
 func (c *Controller) onDelete(obj interface{}) {
-	{
-		cm, ok := obj.(*v1.ConfigMap)
-		if !ok {
-			log.WithFields(log.Fields{}).Error("Could not convert runtime object to configmap..")
-		}
+	cm, ok := obj.(*v1.ConfigMap)
+	if !ok {
+		log.WithFields(log.Fields{}).Error("Could not convert runtime object to configmap..")
+	}
 
-		if _, ok := cm.Labels["crunchy-scheduler"]; !ok {
-			return
-		}
-		c.Scheduler.DeleteSchedule(cm)
+	if _, ok := cm.Labels["crunchy-scheduler"]; !ok {
+		return
 	}
+	c.Scheduler.DeleteSchedule(cm)
 }
 
 // AddConfigMapEventHandler adds the pgcluster event handler to the pgcluster informer