Enable and Refactor Single Group to Multi-Group API Support

.biased_lang_exclude

@@ -26,9 +26,9 @@ config/manifests/bases/splunk-operator.clusterserviceversion.yaml
 config/crd/kustomization.yaml
 config/crd/patches/patch_preserve_unknown_fields.yaml
 config/rbac/role.yaml
-api/v3/licensemaster_types.go
-api/v3/zz_generated.deepcopy.go
-api/v3/common_types.go
+api/enterprise/v3/licensemaster_types.go
+api/enterprise/v3/zz_generated.deepcopy.go
+api/enterprise/v3/common_types.go
 pkg/splunk/enterprise/licensemaster.go
 controller/licensemaster_controller.go
 tools/k8s_collectors/k8s-systeminfo-collector.sh
@@ -37,9 +37,9 @@ pkg/splunk/enterprise/finalizers.go
 controller/monitoringconsole_controller.go
 pkg/splunk/enterprise/events.go
 #Exceptions for dual support of cluster manager
-api/v3/clustermaster_types.go
-api/v3/indexercluster_types.go
-api/v3/clustermanager_types.go
+api/enterprise/v3/clustermaster_types.go
+api/enterprise/v3/indexercluster_types.go
+api/enterprise/v3/clustermanager_types.go
 config/crd/patches/cainjection_in_clustermasters.yaml
 config/crd/patches/webhook_in_clustermasters.yaml
 config/crd/patches/webhook_in_clustermasters.yaml
@@ -70,10 +70,10 @@ test/clustermaster/cmaster_appframework_test.go
 test/clustermaster/cmaster_appframework_test.go
 test/licensemaster/lmaster_m4_test.go
 tools/k8s_collectors/k8s-splunk-collector.sh
-api/v4/clustermanager_types.go
-api/v4/indexercluster_types.go
-api/v4/zz_generated.deepcopy.go
-api/v4/common_types.go
+api/enterprise/v4/clustermanager_types.go
+api/enterprise/v4/indexercluster_types.go
+api/enterprise/v4/zz_generated.deepcopy.go
+api/enterprise/v4/common_types.go
 #Below should be reviewed once CRDs have no bias lang
 tools/bias_lang_migration.sh
 go.mod

api/v3/clustermaster_types.go → api/enterprise/v3/clustermaster_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v3
 
 import (
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

api/v3/indexercluster_types.go → api/enterprise/v3/indexercluster_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v3
 
 import (
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

api/v3/licensemaster_types.go → api/enterprise/v3/licensemaster_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v3
 
 import (
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

api/v3/monitoringconsole_types.go → api/enterprise/v3/monitoringconsole_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v3
 
 import (
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

api/v3/searchheadcluster_types.go → api/enterprise/v3/searchheadcluster_types.go

@@ -18,7 +18,7 @@ limitations under the License.
 package v3
 
 import (
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

api/v3/standalone_types.go → api/enterprise/v3/standalone_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v3
 
 import (
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

cmd/main.go

@@ -27,7 +27,6 @@ import (
 
 	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
 
-	intController "github.com/splunk/splunk-operator/internal/controller"
 	"github.com/splunk/splunk-operator/internal/controller/debug"
 	"github.com/splunk/splunk-operator/pkg/config"
 	"github.com/splunk/splunk-operator/pkg/splunk/enterprise/validation"
@@ -50,9 +49,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
-	enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
-	"github.com/splunk/splunk-operator/internal/controller"
+	enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
+	enterpriseController "github.com/splunk/splunk-operator/internal/controller/enterprise"
 	//+kubebuilder:scaffold:imports
 	//extapi "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 )
@@ -198,7 +197,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&intController.ClusterManagerReconciler{
+	if err = (&enterpriseController.ClusterManagerReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("clustermanager-controller"),
@@ -208,71 +207,71 @@ func main() {
 		os.Exit(1)
 	}
 	fmt.Printf("%v", err)
-	if err = (&intController.ClusterMasterReconciler{
+	if err = (&enterpriseController.ClusterMasterReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("clustermaster-controller"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "ClusterMaster")
 		os.Exit(1)
 	}
-	if err = (&intController.IndexerClusterReconciler{
+	if err = (&enterpriseController.IndexerClusterReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("indexercluster-controller"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "IndexerCluster")
 		os.Exit(1)
 	}
-	if err = (&intController.LicenseMasterReconciler{
+	if err = (&enterpriseController.LicenseMasterReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("licensemaster-controller"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "LicenseMaster")
 		os.Exit(1)
 	}
-	if err = (&intController.LicenseManagerReconciler{
+	if err = (&enterpriseController.LicenseManagerReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("licensemanager-controller"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "LicenseManager")
 		os.Exit(1)
 	}
-	if err = (&intController.MonitoringConsoleReconciler{
+	if err = (&enterpriseController.MonitoringConsoleReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("monitoringconsole-controller"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "MonitoringConsole")
 		os.Exit(1)
 	}
-	if err = (&intController.SearchHeadClusterReconciler{
+	if err = (&enterpriseController.SearchHeadClusterReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("searchheadcluster-controller"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "SearchHeadCluster")
 		os.Exit(1)
 	}
-	if err = (&intController.StandaloneReconciler{
+	if err = (&enterpriseController.StandaloneReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("standalone-controller"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Standalone")
 		os.Exit(1)
 	}
-	if err := (&controller.IngestorClusterReconciler{
+	if err := (&enterpriseController.IngestorClusterReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("ingestorcluster-controller"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "IngestorCluster")
 		os.Exit(1)
 	}
-	if err = (&intController.TelemetryReconciler{
+	if err = (&enterpriseController.TelemetryReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
 	}).SetupWithManager(mgr); err != nil {

internal/controller/common/predicate.go

@@ -4,8 +4,8 @@ import (
 	"reflect"
 
 	"github.com/google/go-cmp/cmp"
-	enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

internal/controller/clustermanager_controller.go → internal/controller/enterprise/clustermanager_controller.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"time"
 
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	"github.com/splunk/splunk-operator/internal/controller/common"
 	splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"
 

internal/controller/clustermanager_controller_test.go → internal/controller/enterprise/clustermanager_controller_test.go

@@ -3,9 +3,10 @@ package controller
 import (
 	"context"
 	"fmt"
+
 	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	splutil "github.com/splunk/splunk-operator/pkg/splunk/util"
 
 	"time"

internal/controller/clustermaster_controller.go → internal/controller/enterprise/clustermaster_controller.go

@@ -20,12 +20,12 @@ import (
 	"context"
 	"time"
 
-	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
+	enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4"
 	"github.com/splunk/splunk-operator/internal/controller/common"
 	splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"
 
 	"github.com/pkg/errors"
-	enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
+	enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3"
 	metrics "github.com/splunk/splunk-operator/pkg/splunk/client/metrics"
 	enterprise "github.com/splunk/splunk-operator/pkg/splunk/enterprise"
 	appsv1 "k8s.io/api/apps/v1"