Refactor pkg/controller/cluster into just pkg/controller (#1495)

* Refactor pkg/controller/cluster into just pkg/controller

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>

pkg/apis/minio.min.io/v2/helper.go

@@ -37,8 +37,6 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/minio/operator/pkg/common"
-
 	"github.com/miekg/dns"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -74,11 +72,6 @@ func envGet(key, defaultValue string) string {
 	return defaultValue
 }
 
-// List of webhook APIs
-const (
-	WebhookAPIUpdate = common.WebhookAPIVersion + "/update"
-)
-
 type hostsTemplateValues struct {
 	StatefulSet string
 	CIService   string

pkg/common/const.go

@@ -22,4 +22,5 @@ const (
 	UpgradeServerPort       = "4221"
 	WebhookDefaultPort      = "4222"
 	WebhookAPIBucketService = WebhookAPIVersion + "/bucketsrv"
+	WebhookAPIUpdate        = WebhookAPIVersion + "/update"
 )

pkg/controller/cluster/artifacts.go → pkg/controller/artifacts.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/console.go → pkg/controller/console.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/controller.go

@@ -23,6 +23,8 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/minio/operator/pkg"
+
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/minio/minio-go/v7/pkg/set"
@@ -32,7 +34,6 @@ import (
 
 	clientset "github.com/minio/operator/pkg/client/clientset/versioned"
 	informers "github.com/minio/operator/pkg/client/informers/externalversions"
-	"github.com/minio/operator/pkg/controller/cluster"
 	promclientset "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
 	kubeinformers "k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
@@ -45,9 +46,6 @@ const (
 	HostnameEnv = "HOSTNAME"
 )
 
-// version provides the version of this operator
-var version = "DEVELOPMENT.GOGET"
-
 var (
 	masterURL     string
 	kubeconfig    string
@@ -76,7 +74,7 @@ func StartOperator() {
 	flag.Parse()
 
 	if checkVersion {
-		fmt.Println(version)
+		fmt.Println(pkg.Version)
 		return
 	}
 
@@ -128,7 +126,7 @@ func StartOperator() {
 		podName = "operator-pod"
 	}
 
-	mainController := cluster.NewController(
+	mainController := NewController(
 		podName,
 		namespaces,
 		kubeClient,
@@ -141,7 +139,7 @@ func StartOperator() {
 		minioInformerFactory.Sts().V1alpha1().PolicyBindings(),
 		kubeInformerFactory.Core().V1().Services(),
 		hostsTemplate,
-		version,
+		pkg.Version,
 	)
 
 	go kubeInformerFactory.Start(stopCh)

pkg/controller/cluster/csr.go → pkg/controller/csr.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/minio/operator/pkg/controller/cluster/certificates"
+	"github.com/minio/operator/pkg/controller/certificates"
 
 	certificatesV1 "k8s.io/api/certificates/v1"
 

pkg/controller/cluster/custom.go → pkg/controller/custom.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/decomission.go → pkg/controller/decomission.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/events.go → pkg/controller/events.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/kes.go → pkg/controller/kes.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"bytes"
@@ -26,7 +26,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/minio/operator/pkg/controller/cluster/certificates"
+	"github.com/minio/operator/pkg/controller/certificates"
 
 	corev1 "k8s.io/api/core/v1"
 

pkg/controller/cluster/log-search.go → pkg/controller/log-search.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/main-controller.go → pkg/controller/main-controller.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"context"
@@ -30,7 +30,7 @@ import (
 
 	xcerts "github.com/minio/pkg/certs"
 
-	"github.com/minio/operator/pkg/controller/cluster/certificates"
+	"github.com/minio/operator/pkg/controller/certificates"
 
 	"k8s.io/klog/v2"
 
@@ -1146,7 +1146,7 @@ func (c *Controller) syncHandler(key string) error {
 			miniov2.GetNSFromFile(),
 			miniov2.GetClusterDomain(),
 			common.UpgradeServerPort,
-			miniov2.WebhookAPIUpdate,
+			common.WebhookAPIUpdate,
 		))
 		if err != nil {
 			_ = c.removeArtifacts()

pkg/controller/cluster/minio-services.go → pkg/controller/minio-services.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/minio-services_test.go → pkg/controller/minio-services_test.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"testing"

pkg/controller/cluster/minio.go → pkg/controller/minio.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"bytes"
@@ -31,7 +31,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"github.com/minio/operator/pkg/controller/cluster/certificates"
+	"github.com/minio/operator/pkg/controller/certificates"
 
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"

pkg/controller/cluster/monitoring.go → pkg/controller/monitoring.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/operator.go → pkg/controller/operator.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/pods.go → pkg/controller/pods.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/pools.go → pkg/controller/pools.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/pools_test.go → pkg/controller/pools_test.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"testing"

pkg/controller/cluster/prometheus.go → pkg/controller/prometheus.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import (
 	"bufio"

pkg/controller/cluster/service-account.go → pkg/controller/service-account.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/status.go → pkg/controller/status.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/sts.go → pkg/controller/sts.go

@@ -1,4 +1,4 @@
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/sts_handlers.go → pkg/controller/sts_handlers.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 //lint:file-ignore ST1005 Incorrectly formatted error string
 
@@ -28,6 +28,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/minio/operator/pkg/common"
+
 	"github.com/minio/operator/pkg/apis/sts.min.io/v1alpha1"
 	iampolicy "github.com/minio/pkg/iam/policy"
 
@@ -42,7 +44,7 @@ import (
 
 // Supported remote envs
 const (
-	updatePath = "/tmp" + miniov2.WebhookAPIUpdate + slashSeparator
+	updatePath = "/tmp" + common.WebhookAPIUpdate + slashSeparator
 )
 
 const contextLogKey = contextKeyType("operatorlog")

pkg/controller/cluster/tenants.go → pkg/controller/tenants.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/tls.go → pkg/controller/tls.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"time"
 
 	miniov2 "github.com/minio/operator/pkg/apis/minio.min.io/v2"
-	"github.com/minio/operator/pkg/controller/cluster/certificates"
+	"github.com/minio/operator/pkg/controller/certificates"
 	xcerts "github.com/minio/pkg/certs"
 	"github.com/minio/pkg/env"
 	corev1 "k8s.io/api/core/v1"

pkg/controller/cluster/upgrades.go → pkg/controller/upgrades.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package cluster
+package controller
 
 import (
 	"context"

pkg/controller/cluster/upgrades_test.go → pkg/controller/upgrades_test.go

@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License, version 3,
 // along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-package cluster
+package controller
 
 import "testing"