diff --git a/.biased_lang_exclude b/.biased_lang_exclude index 80b251425..b3e8a1f8e 100644 --- a/.biased_lang_exclude +++ b/.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 diff --git a/PROJECT b/PROJECT index e87979069..67ff80702 100644 --- a/PROJECT +++ b/PROJECT @@ -5,6 +5,7 @@ domain: splunk.com layout: - go.kubebuilder.io/v4 +multigroup: true plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} @@ -18,7 +19,7 @@ resources: domain: splunk.com group: enterprise kind: ClusterMaster - path: github.com/splunk/splunk-operator/api/v3 + path: github.com/splunk/splunk-operator/api/enterprise/v3 version: v3 - api: crdVersion: v1 @@ -27,7 +28,7 @@ resources: domain: splunk.com group: enterprise kind: IndexerCluster - path: github.com/splunk/splunk-operator/api/v3 + path: github.com/splunk/splunk-operator/api/enterprise/v3 version: v3 - api: crdVersion: v1 @@ -36,7 +37,7 @@ resources: domain: splunk.com group: enterprise kind: LicenseMaster - path: github.com/splunk/splunk-operator/api/v3 + path: github.com/splunk/splunk-operator/api/enterprise/v3 version: v3 - api: crdVersion: v1 @@ -45,7 +46,7 @@ resources: domain: splunk.com group: enterprise kind: MonitoringConsole - path: github.com/splunk/splunk-operator/api/v3 + path: github.com/splunk/splunk-operator/api/enterprise/v3 version: v3 - api: crdVersion: v1 @@ -54,7 +55,7 @@ resources: domain: splunk.com group: enterprise kind: SearchHeadCluster - path: github.com/splunk/splunk-operator/api/v3 + path: github.com/splunk/splunk-operator/api/enterprise/v3 version: v3 - api: crdVersion: v1 @@ -63,7 +64,7 @@ resources: domain: splunk.com group: enterprise kind: Standalone - path: github.com/splunk/splunk-operator/api/v3 + path: github.com/splunk/splunk-operator/api/enterprise/v3 version: v3 - api: crdVersion: v1 @@ -71,7 +72,7 @@ resources: domain: splunk.com group: enterprise kind: IndexerCluster - path: github.com/splunk/splunk-operator/api/v4 + path: github.com/splunk/splunk-operator/api/enterprise/v4 version: v4 - api: crdVersion: v1 @@ -79,7 +80,7 @@ resources: domain: splunk.com group: enterprise kind: Standalone - path: github.com/splunk/splunk-operator/api/v4 + path: github.com/splunk/splunk-operator/api/enterprise/v4 version: v4 - api: crdVersion: v1 @@ -87,7 +88,7 @@ resources: domain: splunk.com group: enterprise kind: MonitoringConsole - path: github.com/splunk/splunk-operator/api/v4 + path: github.com/splunk/splunk-operator/api/enterprise/v4 version: v4 - api: crdVersion: v1 @@ -95,7 +96,7 @@ resources: domain: splunk.com group: enterprise kind: SearchHeadCluster - path: github.com/splunk/splunk-operator/api/v4 + path: github.com/splunk/splunk-operator/api/enterprise/v4 version: v4 - api: crdVersion: v1 @@ -103,7 +104,7 @@ resources: domain: splunk.com group: enterprise kind: ClusterManager - path: github.com/splunk/splunk-operator/api/v4 + path: github.com/splunk/splunk-operator/api/enterprise/v4 version: v4 - api: crdVersion: v1 @@ -111,7 +112,7 @@ resources: domain: splunk.com group: enterprise kind: LicenseManager - path: github.com/splunk/splunk-operator/api/v4 + path: github.com/splunk/splunk-operator/api/enterprise/v4 version: v4 - api: crdVersion: v1 @@ -120,7 +121,7 @@ resources: domain: splunk.com group: enterprise kind: IngestorCluster - path: github.com/splunk/splunk-operator/api/v4 + path: github.com/splunk/splunk-operator/api/enterprise/v4 version: v4 - api: crdVersion: v1 @@ -129,7 +130,7 @@ resources: domain: splunk.com group: enterprise kind: Queue - path: github.com/splunk/splunk-operator/api/v4 + path: github.com/splunk/splunk-operator/api/enterprise/v4 version: v4 - api: crdVersion: v1 @@ -138,6 +139,6 @@ resources: domain: splunk.com group: enterprise kind: ObjectStorage - path: github.com/splunk/splunk-operator/api/v4 + path: github.com/splunk/splunk-operator/api/enterprise/v4 version: v4 version: "3" diff --git a/api/v1/doc.go b/api/enterprise/v1/doc.go similarity index 100% rename from api/v1/doc.go rename to api/enterprise/v1/doc.go diff --git a/api/v1/register.go b/api/enterprise/v1/register.go similarity index 100% rename from api/v1/register.go rename to api/enterprise/v1/register.go diff --git a/api/v1/zz_generated.deepcopy.go b/api/enterprise/v1/zz_generated.deepcopy.go similarity index 100% rename from api/v1/zz_generated.deepcopy.go rename to api/enterprise/v1/zz_generated.deepcopy.go diff --git a/api/v1alpha2/doc.go b/api/enterprise/v1alpha2/doc.go similarity index 100% rename from api/v1alpha2/doc.go rename to api/enterprise/v1alpha2/doc.go diff --git a/api/v1alpha2/register.go b/api/enterprise/v1alpha2/register.go similarity index 100% rename from api/v1alpha2/register.go rename to api/enterprise/v1alpha2/register.go diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/enterprise/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from api/v1alpha2/zz_generated.deepcopy.go rename to api/enterprise/v1alpha2/zz_generated.deepcopy.go diff --git a/api/v1alpha3/doc.go b/api/enterprise/v1alpha3/doc.go similarity index 100% rename from api/v1alpha3/doc.go rename to api/enterprise/v1alpha3/doc.go diff --git a/api/v1alpha3/register.go b/api/enterprise/v1alpha3/register.go similarity index 100% rename from api/v1alpha3/register.go rename to api/enterprise/v1alpha3/register.go diff --git a/api/v1alpha3/zz_generated.deepcopy.go b/api/enterprise/v1alpha3/zz_generated.deepcopy.go similarity index 100% rename from api/v1alpha3/zz_generated.deepcopy.go rename to api/enterprise/v1alpha3/zz_generated.deepcopy.go diff --git a/api/v1beta1/doc.go b/api/enterprise/v1beta1/doc.go similarity index 100% rename from api/v1beta1/doc.go rename to api/enterprise/v1beta1/doc.go diff --git a/api/v1beta1/register.go b/api/enterprise/v1beta1/register.go similarity index 100% rename from api/v1beta1/register.go rename to api/enterprise/v1beta1/register.go diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/enterprise/v1beta1/zz_generated.deepcopy.go similarity index 100% rename from api/v1beta1/zz_generated.deepcopy.go rename to api/enterprise/v1beta1/zz_generated.deepcopy.go diff --git a/api/v2/doc.go b/api/enterprise/v2/doc.go similarity index 100% rename from api/v2/doc.go rename to api/enterprise/v2/doc.go diff --git a/api/v2/register.go b/api/enterprise/v2/register.go similarity index 100% rename from api/v2/register.go rename to api/enterprise/v2/register.go diff --git a/api/v2/zz_generated.deepcopy.go b/api/enterprise/v2/zz_generated.deepcopy.go similarity index 100% rename from api/v2/zz_generated.deepcopy.go rename to api/enterprise/v2/zz_generated.deepcopy.go diff --git a/api/v3/clustermaster_types.go b/api/enterprise/v3/clustermaster_types.go similarity index 98% rename from api/v3/clustermaster_types.go rename to api/enterprise/v3/clustermaster_types.go index 6d027378b..66260fdd9 100644 --- a/api/v3/clustermaster_types.go +++ b/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" ) diff --git a/api/v3/groupversion_info.go b/api/enterprise/v3/groupversion_info.go similarity index 100% rename from api/v3/groupversion_info.go rename to api/enterprise/v3/groupversion_info.go diff --git a/api/v3/indexercluster_types.go b/api/enterprise/v3/indexercluster_types.go similarity index 98% rename from api/v3/indexercluster_types.go rename to api/enterprise/v3/indexercluster_types.go index fc5a29921..397e03cb4 100644 --- a/api/v3/indexercluster_types.go +++ b/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" ) diff --git a/api/v3/licensemaster_types.go b/api/enterprise/v3/licensemaster_types.go similarity index 98% rename from api/v3/licensemaster_types.go rename to api/enterprise/v3/licensemaster_types.go index 44aec2b5c..3b08727b8 100644 --- a/api/v3/licensemaster_types.go +++ b/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" ) diff --git a/api/v3/monitoringconsole_types.go b/api/enterprise/v3/monitoringconsole_types.go similarity index 98% rename from api/v3/monitoringconsole_types.go rename to api/enterprise/v3/monitoringconsole_types.go index a7fe624ca..a596a355e 100644 --- a/api/v3/monitoringconsole_types.go +++ b/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" ) diff --git a/api/v3/searchheadcluster_types.go b/api/enterprise/v3/searchheadcluster_types.go similarity index 99% rename from api/v3/searchheadcluster_types.go rename to api/enterprise/v3/searchheadcluster_types.go index 42f3e1233..0bef7806c 100644 --- a/api/v3/searchheadcluster_types.go +++ b/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" ) diff --git a/api/v3/standalone_types.go b/api/enterprise/v3/standalone_types.go similarity index 98% rename from api/v3/standalone_types.go rename to api/enterprise/v3/standalone_types.go index 18ff5aa88..798511982 100644 --- a/api/v3/standalone_types.go +++ b/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" ) diff --git a/api/v3/zz_generated.deepcopy.go b/api/enterprise/v3/zz_generated.deepcopy.go similarity index 100% rename from api/v3/zz_generated.deepcopy.go rename to api/enterprise/v3/zz_generated.deepcopy.go diff --git a/api/v4/clustermanager_types.go b/api/enterprise/v4/clustermanager_types.go similarity index 100% rename from api/v4/clustermanager_types.go rename to api/enterprise/v4/clustermanager_types.go diff --git a/api/v4/common_types.go b/api/enterprise/v4/common_types.go similarity index 100% rename from api/v4/common_types.go rename to api/enterprise/v4/common_types.go diff --git a/api/v4/groupversion_info.go b/api/enterprise/v4/groupversion_info.go similarity index 100% rename from api/v4/groupversion_info.go rename to api/enterprise/v4/groupversion_info.go diff --git a/api/v4/indexercluster_types.go b/api/enterprise/v4/indexercluster_types.go similarity index 100% rename from api/v4/indexercluster_types.go rename to api/enterprise/v4/indexercluster_types.go diff --git a/api/v4/ingestorcluster_types.go b/api/enterprise/v4/ingestorcluster_types.go similarity index 100% rename from api/v4/ingestorcluster_types.go rename to api/enterprise/v4/ingestorcluster_types.go diff --git a/api/v4/licensemanager_types.go b/api/enterprise/v4/licensemanager_types.go similarity index 100% rename from api/v4/licensemanager_types.go rename to api/enterprise/v4/licensemanager_types.go diff --git a/api/v4/monitoringconsole_types.go b/api/enterprise/v4/monitoringconsole_types.go similarity index 100% rename from api/v4/monitoringconsole_types.go rename to api/enterprise/v4/monitoringconsole_types.go diff --git a/api/v4/objectstorage_types.go b/api/enterprise/v4/objectstorage_types.go similarity index 100% rename from api/v4/objectstorage_types.go rename to api/enterprise/v4/objectstorage_types.go diff --git a/api/v4/queue_types.go b/api/enterprise/v4/queue_types.go similarity index 100% rename from api/v4/queue_types.go rename to api/enterprise/v4/queue_types.go diff --git a/api/v4/searchheadcluster_types.go b/api/enterprise/v4/searchheadcluster_types.go similarity index 100% rename from api/v4/searchheadcluster_types.go rename to api/enterprise/v4/searchheadcluster_types.go diff --git a/api/v4/standalone_types.go b/api/enterprise/v4/standalone_types.go similarity index 100% rename from api/v4/standalone_types.go rename to api/enterprise/v4/standalone_types.go diff --git a/api/v4/zz_generated.deepcopy.go b/api/enterprise/v4/zz_generated.deepcopy.go similarity index 100% rename from api/v4/zz_generated.deepcopy.go rename to api/enterprise/v4/zz_generated.deepcopy.go diff --git a/cmd/main.go b/cmd/main.go index b8188608d..be39b5fe4 100644 --- a/cmd/main.go +++ b/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,7 +207,7 @@ 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"), @@ -216,7 +215,7 @@ func main() { 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"), @@ -224,7 +223,7 @@ func main() { 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"), @@ -232,7 +231,7 @@ func main() { 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"), @@ -240,7 +239,7 @@ func main() { 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"), @@ -248,7 +247,7 @@ func main() { 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"), @@ -256,7 +255,7 @@ func main() { 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"), @@ -264,7 +263,7 @@ func main() { 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"), @@ -272,7 +271,7 @@ func main() { 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 { diff --git a/internal/controller/common/predicate.go b/internal/controller/common/predicate.go index 9ef3c2df2..814ed9531 100644 --- a/internal/controller/common/predicate.go +++ b/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" diff --git a/internal/controller/clustermanager_controller.go b/internal/controller/enterprise/clustermanager_controller.go similarity index 99% rename from internal/controller/clustermanager_controller.go rename to internal/controller/enterprise/clustermanager_controller.go index 2a844bd0a..d7f459fc9 100644 --- a/internal/controller/clustermanager_controller.go +++ b/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" diff --git a/internal/controller/clustermanager_controller_test.go b/internal/controller/enterprise/clustermanager_controller_test.go similarity index 99% rename from internal/controller/clustermanager_controller_test.go rename to internal/controller/enterprise/clustermanager_controller_test.go index 29152d7b1..a2c83909b 100644 --- a/internal/controller/clustermanager_controller_test.go +++ b/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" diff --git a/internal/controller/clustermaster_controller.go b/internal/controller/enterprise/clustermaster_controller.go similarity index 98% rename from internal/controller/clustermaster_controller.go rename to internal/controller/enterprise/clustermaster_controller.go index 4e2b5b94a..887a7f98e 100644 --- a/internal/controller/clustermaster_controller.go +++ b/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" diff --git a/internal/controller/clustermaster_controller_test.go b/internal/controller/enterprise/clustermaster_controller_test.go similarity index 98% rename from internal/controller/clustermaster_controller_test.go rename to internal/controller/enterprise/clustermaster_controller_test.go index 127c478df..960903e54 100644 --- a/internal/controller/clustermaster_controller_test.go +++ b/internal/controller/enterprise/clustermaster_controller_test.go @@ -5,9 +5,9 @@ import ( "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" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/internal/controller/indexercluster_controller.go b/internal/controller/enterprise/indexercluster_controller.go similarity index 98% rename from internal/controller/indexercluster_controller.go rename to internal/controller/enterprise/indexercluster_controller.go index ddc8b17c9..06af5e73a 100644 --- a/internal/controller/indexercluster_controller.go +++ b/internal/controller/enterprise/indexercluster_controller.go @@ -20,11 +20,11 @@ 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" "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" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" enterprise "github.com/splunk/splunk-operator/pkg/splunk/enterprise" diff --git a/internal/controller/indexercluster_controller_test.go b/internal/controller/enterprise/indexercluster_controller_test.go similarity index 99% rename from internal/controller/indexercluster_controller_test.go rename to internal/controller/enterprise/indexercluster_controller_test.go index fe221bbd5..75d2bfd2a 100644 --- a/internal/controller/indexercluster_controller_test.go +++ b/internal/controller/enterprise/indexercluster_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" "time" diff --git a/internal/controller/ingestorcluster_controller.go b/internal/controller/enterprise/ingestorcluster_controller.go similarity index 99% rename from internal/controller/ingestorcluster_controller.go rename to internal/controller/enterprise/ingestorcluster_controller.go index 2725d32a6..82adb60ea 100644 --- a/internal/controller/ingestorcluster_controller.go +++ b/internal/controller/enterprise/ingestorcluster_controller.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/pkg/errors" - 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" metrics "github.com/splunk/splunk-operator/pkg/splunk/client/metrics" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" diff --git a/internal/controller/ingestorcluster_controller_test.go b/internal/controller/enterprise/ingestorcluster_controller_test.go similarity index 99% rename from internal/controller/ingestorcluster_controller_test.go rename to internal/controller/enterprise/ingestorcluster_controller_test.go index 6caf99cb2..b132a0750 100644 --- a/internal/controller/ingestorcluster_controller_test.go +++ b/internal/controller/enterprise/ingestorcluster_controller_test.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/splunk/splunk-operator/internal/controller/testutils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/licensemanager_controller.go b/internal/controller/enterprise/licensemanager_controller.go similarity index 99% rename from internal/controller/licensemanager_controller.go rename to internal/controller/enterprise/licensemanager_controller.go index 27e39a7f5..6f2184a1e 100644 --- a/internal/controller/licensemanager_controller.go +++ b/internal/controller/enterprise/licensemanager_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" diff --git a/internal/controller/licensemanager_controller_test.go b/internal/controller/enterprise/licensemanager_controller_test.go similarity index 99% rename from internal/controller/licensemanager_controller_test.go rename to internal/controller/enterprise/licensemanager_controller_test.go index 734e2f932..028eb963d 100644 --- a/internal/controller/licensemanager_controller_test.go +++ b/internal/controller/enterprise/licensemanager_controller_test.go @@ -5,7 +5,7 @@ import ( "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" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/controller/licensemaster_controller.go b/internal/controller/enterprise/licensemaster_controller.go similarity index 98% rename from internal/controller/licensemaster_controller.go rename to internal/controller/enterprise/licensemaster_controller.go index c413cab50..d3c26f991 100644 --- a/internal/controller/licensemaster_controller.go +++ b/internal/controller/enterprise/licensemaster_controller.go @@ -24,8 +24,8 @@ import ( splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "github.com/pkg/errors" - 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" 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" diff --git a/internal/controller/licensemaster_controller_test.go b/internal/controller/enterprise/licensemaster_controller_test.go similarity index 98% rename from internal/controller/licensemaster_controller_test.go rename to internal/controller/enterprise/licensemaster_controller_test.go index 214a0710c..0f51feae5 100644 --- a/internal/controller/licensemaster_controller_test.go +++ b/internal/controller/enterprise/licensemaster_controller_test.go @@ -5,10 +5,10 @@ import ( "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" "sigs.k8s.io/controller-runtime/pkg/client/fake" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/internal/controller/monitoringconsole_controller.go b/internal/controller/enterprise/monitoringconsole_controller.go similarity index 98% rename from internal/controller/monitoringconsole_controller.go rename to internal/controller/enterprise/monitoringconsole_controller.go index 571e0f9f8..3bbe9fc9c 100644 --- a/internal/controller/monitoringconsole_controller.go +++ b/internal/controller/enterprise/monitoringconsole_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" diff --git a/internal/controller/monitoringconsole_controller_test.go b/internal/controller/enterprise/monitoringconsole_controller_test.go similarity index 99% rename from internal/controller/monitoringconsole_controller_test.go rename to internal/controller/enterprise/monitoringconsole_controller_test.go index 8159c15ae..f3851d3a8 100644 --- a/internal/controller/monitoringconsole_controller_test.go +++ b/internal/controller/enterprise/monitoringconsole_controller_test.go @@ -5,7 +5,7 @@ import ( "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" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/internal/controller/searchheadcluster_controller.go b/internal/controller/enterprise/searchheadcluster_controller.go similarity index 99% rename from internal/controller/searchheadcluster_controller.go rename to internal/controller/enterprise/searchheadcluster_controller.go index 9ff2eca36..a811c25fe 100644 --- a/internal/controller/searchheadcluster_controller.go +++ b/internal/controller/enterprise/searchheadcluster_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" diff --git a/internal/controller/searchheadcluster_controller_test.go b/internal/controller/enterprise/searchheadcluster_controller_test.go similarity index 99% rename from internal/controller/searchheadcluster_controller_test.go rename to internal/controller/enterprise/searchheadcluster_controller_test.go index fd15b22e1..7cff2582a 100644 --- a/internal/controller/searchheadcluster_controller_test.go +++ b/internal/controller/enterprise/searchheadcluster_controller_test.go @@ -5,7 +5,7 @@ import ( "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" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/internal/controller/standalone_controller.go b/internal/controller/enterprise/standalone_controller.go similarity index 99% rename from internal/controller/standalone_controller.go rename to internal/controller/enterprise/standalone_controller.go index bb7106f05..a0282ef74 100644 --- a/internal/controller/standalone_controller.go +++ b/internal/controller/enterprise/standalone_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" diff --git a/internal/controller/standalone_controller_test.go b/internal/controller/enterprise/standalone_controller_test.go similarity index 99% rename from internal/controller/standalone_controller_test.go rename to internal/controller/enterprise/standalone_controller_test.go index e4cf6923b..410a80512 100644 --- a/internal/controller/standalone_controller_test.go +++ b/internal/controller/enterprise/standalone_controller_test.go @@ -2,11 +2,12 @@ package controller import ( "context" - "time" "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" + + "time" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/internal/controller/suite_test.go b/internal/controller/enterprise/suite_test.go similarity index 95% rename from internal/controller/suite_test.go rename to internal/controller/enterprise/suite_test.go index 142a8720c..2cab182cc 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/enterprise/suite_test.go @@ -36,8 +36,8 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" - 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" //+kubebuilder:scaffold:imports ) @@ -62,7 +62,7 @@ var _ = BeforeSuite(func(ctx context.Context) { By("bootstrapping test environment") testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, ErrorIfCRDPathMissing: true, } diff --git a/internal/controller/telemetry_controller.go b/internal/controller/enterprise/telemetry_controller.go similarity index 100% rename from internal/controller/telemetry_controller.go rename to internal/controller/enterprise/telemetry_controller.go diff --git a/internal/controller/telemetry_controller_test.go b/internal/controller/enterprise/telemetry_controller_test.go similarity index 100% rename from internal/controller/telemetry_controller_test.go rename to internal/controller/enterprise/telemetry_controller_test.go diff --git a/internal/controller/testutils/new.go b/internal/controller/testutils/new.go index 4e657968f..047c0cf93 100644 --- a/internal/controller/testutils/new.go +++ b/internal/controller/testutils/new.go @@ -1,11 +1,11 @@ package testutils import ( - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" corev1 "k8s.io/api/core/v1" //"k8s.io/apimachinery/pkg/api/resource" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/splunk/client/awss3client_test.go b/pkg/splunk/client/awss3client_test.go index 5df04182c..91736f9cf 100644 --- a/pkg/splunk/client/awss3client_test.go +++ b/pkg/splunk/client/awss3client_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" spltest "github.com/splunk/splunk-operator/pkg/splunk/test" ) diff --git a/pkg/splunk/client/minioclient_test.go b/pkg/splunk/client/minioclient_test.go index e422904e0..4776f998f 100644 --- a/pkg/splunk/client/minioclient_test.go +++ b/pkg/splunk/client/minioclient_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" spltest "github.com/splunk/splunk-operator/pkg/splunk/test" ) diff --git a/pkg/splunk/client/util.go b/pkg/splunk/client/util.go index 9ceb5edda..87990e668 100644 --- a/pkg/splunk/client/util.go +++ b/pkg/splunk/client/util.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" spltest "github.com/splunk/splunk-operator/pkg/splunk/test" "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/pkg/splunk/client/util_test.go b/pkg/splunk/client/util_test.go index 44a94aedc..a16715aea 100644 --- a/pkg/splunk/client/util_test.go +++ b/pkg/splunk/client/util_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" spltest "github.com/splunk/splunk-operator/pkg/splunk/test" ) diff --git a/pkg/splunk/common/types.go b/pkg/splunk/common/types.go index 25b353276..3baddf518 100644 --- a/pkg/splunk/common/types.go +++ b/pkg/splunk/common/types.go @@ -18,7 +18,7 @@ package common import ( "context" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/splunk/enterprise/afwscheduler.go b/pkg/splunk/enterprise/afwscheduler.go index 699a59f3e..c5c0a9c0d 100644 --- a/pkg/splunk/enterprise/afwscheduler.go +++ b/pkg/splunk/enterprise/afwscheduler.go @@ -24,7 +24,7 @@ import ( "sync" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/pkg/errors" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" diff --git a/pkg/splunk/enterprise/afwscheduler_test.go b/pkg/splunk/enterprise/afwscheduler_test.go index b055e5f59..e7643a7c6 100644 --- a/pkg/splunk/enterprise/afwscheduler_test.go +++ b/pkg/splunk/enterprise/afwscheduler_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/clustermanager.go b/pkg/splunk/enterprise/clustermanager.go index 31835ee8e..2e4d71a62 100644 --- a/pkg/splunk/enterprise/clustermanager.go +++ b/pkg/splunk/enterprise/clustermanager.go @@ -21,7 +21,7 @@ import ( "reflect" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" rclient "sigs.k8s.io/controller-runtime/pkg/client" "github.com/go-logr/logr" diff --git a/pkg/splunk/enterprise/clustermanager_test.go b/pkg/splunk/enterprise/clustermanager_test.go index 4a71bf8be..e99da935b 100644 --- a/pkg/splunk/enterprise/clustermanager_test.go +++ b/pkg/splunk/enterprise/clustermanager_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "k8s.io/apimachinery/pkg/runtime/schema" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/splunk/enterprise/clustermaster.go b/pkg/splunk/enterprise/clustermaster.go index 9617233e1..699c38691 100644 --- a/pkg/splunk/enterprise/clustermaster.go +++ b/pkg/splunk/enterprise/clustermaster.go @@ -21,10 +21,10 @@ import ( "reflect" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/go-logr/logr" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/clustermaster_test.go b/pkg/splunk/enterprise/clustermaster_test.go index f9b49b496..6849228dc 100644 --- a/pkg/splunk/enterprise/clustermaster_test.go +++ b/pkg/splunk/enterprise/clustermaster_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -38,7 +38,7 @@ import ( runtime "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/configuration.go b/pkg/splunk/enterprise/configuration.go index 7f75bebe7..9a1eb5d15 100644 --- a/pkg/splunk/enterprise/configuration.go +++ b/pkg/splunk/enterprise/configuration.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - 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" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/configuration_test.go b/pkg/splunk/enterprise/configuration_test.go index 2c92e3ec4..8f3bfd0ae 100644 --- a/pkg/splunk/enterprise/configuration_test.go +++ b/pkg/splunk/enterprise/configuration_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/require" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" diff --git a/pkg/splunk/enterprise/events_test.go b/pkg/splunk/enterprise/events_test.go index bc2087407..9ca99c320 100644 --- a/pkg/splunk/enterprise/events_test.go +++ b/pkg/splunk/enterprise/events_test.go @@ -19,8 +19,8 @@ import ( "context" "testing" - 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" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "k8s.io/client-go/tools/record" ) diff --git a/pkg/splunk/enterprise/finalizers_test.go b/pkg/splunk/enterprise/finalizers_test.go index 369271200..481f8a429 100644 --- a/pkg/splunk/enterprise/finalizers_test.go +++ b/pkg/splunk/enterprise/finalizers_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" - 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" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" spltest "github.com/splunk/splunk-operator/pkg/splunk/test" diff --git a/pkg/splunk/enterprise/indexercluster.go b/pkg/splunk/enterprise/indexercluster.go index 1de6c7a54..f16cd16e8 100644 --- a/pkg/splunk/enterprise/indexercluster.go +++ b/pkg/splunk/enterprise/indexercluster.go @@ -25,10 +25,10 @@ import ( "strings" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/go-logr/logr" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/indexercluster_test.go b/pkg/splunk/enterprise/indexercluster_test.go index 83771c53d..326579094 100644 --- a/pkg/splunk/enterprise/indexercluster_test.go +++ b/pkg/splunk/enterprise/indexercluster_test.go @@ -28,8 +28,8 @@ import ( "time" "github.com/pkg/errors" - 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" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/splunk/enterprise/ingestorcluster.go b/pkg/splunk/enterprise/ingestorcluster.go index b0f866413..733b3811b 100644 --- a/pkg/splunk/enterprise/ingestorcluster.go +++ b/pkg/splunk/enterprise/ingestorcluster.go @@ -22,7 +22,7 @@ import ( "time" "github.com/go-logr/logr" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/ingestorcluster_test.go b/pkg/splunk/enterprise/ingestorcluster_test.go index 4cef74f2b..c00915cb5 100644 --- a/pkg/splunk/enterprise/ingestorcluster_test.go +++ b/pkg/splunk/enterprise/ingestorcluster_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/go-logr/logr" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" spltest "github.com/splunk/splunk-operator/pkg/splunk/test" diff --git a/pkg/splunk/enterprise/licensemanager.go b/pkg/splunk/enterprise/licensemanager.go index 49e01e0cc..4233c413b 100644 --- a/pkg/splunk/enterprise/licensemanager.go +++ b/pkg/splunk/enterprise/licensemanager.go @@ -21,7 +21,7 @@ import ( "reflect" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splutil "github.com/splunk/splunk-operator/pkg/splunk/util" diff --git a/pkg/splunk/enterprise/licensemanager_test.go b/pkg/splunk/enterprise/licensemanager_test.go index 8e2d8b358..806c5b1e4 100644 --- a/pkg/splunk/enterprise/licensemanager_test.go +++ b/pkg/splunk/enterprise/licensemanager_test.go @@ -26,7 +26,7 @@ import ( "time" "github.com/pkg/errors" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/splunk/enterprise/licensemaster.go b/pkg/splunk/enterprise/licensemaster.go index 00adcc9e0..c1211c85f 100644 --- a/pkg/splunk/enterprise/licensemaster.go +++ b/pkg/splunk/enterprise/licensemaster.go @@ -21,7 +21,7 @@ import ( "reflect" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" splutil "github.com/splunk/splunk-operator/pkg/splunk/util" diff --git a/pkg/splunk/enterprise/licensemaster_test.go b/pkg/splunk/enterprise/licensemaster_test.go index 467c561d0..edef5e4f1 100644 --- a/pkg/splunk/enterprise/licensemaster_test.go +++ b/pkg/splunk/enterprise/licensemaster_test.go @@ -36,8 +36,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "github.com/pkg/errors" - 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" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/monitoringconsole.go b/pkg/splunk/enterprise/monitoringconsole.go index 0bbc54047..bafcc7bf5 100644 --- a/pkg/splunk/enterprise/monitoringconsole.go +++ b/pkg/splunk/enterprise/monitoringconsole.go @@ -23,7 +23,7 @@ import ( "strings" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/monitoringconsole_test.go b/pkg/splunk/enterprise/monitoringconsole_test.go index af3eac5b4..a6b04a25f 100644 --- a/pkg/splunk/enterprise/monitoringconsole_test.go +++ b/pkg/splunk/enterprise/monitoringconsole_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" spltest "github.com/splunk/splunk-operator/pkg/splunk/test" diff --git a/pkg/splunk/enterprise/objectstorage.go b/pkg/splunk/enterprise/objectstorage.go index 52f3bfd4d..08e89bce7 100644 --- a/pkg/splunk/enterprise/objectstorage.go +++ b/pkg/splunk/enterprise/objectstorage.go @@ -18,7 +18,7 @@ import ( "context" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/splunk/enterprise/objectstorage_test.go b/pkg/splunk/enterprise/objectstorage_test.go index 632dc2390..cb55b24a1 100644 --- a/pkg/splunk/enterprise/objectstorage_test.go +++ b/pkg/splunk/enterprise/objectstorage_test.go @@ -20,7 +20,7 @@ import ( "path/filepath" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/splunk/enterprise/queue.go b/pkg/splunk/enterprise/queue.go index e10af1ca7..9d60ec250 100644 --- a/pkg/splunk/enterprise/queue.go +++ b/pkg/splunk/enterprise/queue.go @@ -18,7 +18,7 @@ import ( "context" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/splunk/enterprise/queue_test.go b/pkg/splunk/enterprise/queue_test.go index ae7c08cf7..080be9ea6 100644 --- a/pkg/splunk/enterprise/queue_test.go +++ b/pkg/splunk/enterprise/queue_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/splunk/enterprise/searchheadcluster.go b/pkg/splunk/enterprise/searchheadcluster.go index a32ea4746..d96466507 100644 --- a/pkg/splunk/enterprise/searchheadcluster.go +++ b/pkg/splunk/enterprise/searchheadcluster.go @@ -23,7 +23,7 @@ import ( "strings" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" diff --git a/pkg/splunk/enterprise/searchheadcluster_test.go b/pkg/splunk/enterprise/searchheadcluster_test.go index 5a272fbc9..b736b9827 100644 --- a/pkg/splunk/enterprise/searchheadcluster_test.go +++ b/pkg/splunk/enterprise/searchheadcluster_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/splunk/enterprise/searchheadclusterpodmanager.go b/pkg/splunk/enterprise/searchheadclusterpodmanager.go index 029f0ac04..e49e6fdd4 100644 --- a/pkg/splunk/enterprise/searchheadclusterpodmanager.go +++ b/pkg/splunk/enterprise/searchheadclusterpodmanager.go @@ -7,7 +7,7 @@ import ( "github.com/go-logr/logr" "github.com/prometheus/client_golang/prometheus" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" metrics "github.com/splunk/splunk-operator/pkg/splunk/client/metrics" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" diff --git a/pkg/splunk/enterprise/standalone.go b/pkg/splunk/enterprise/standalone.go index 00f7b9e56..5f27923be 100644 --- a/pkg/splunk/enterprise/standalone.go +++ b/pkg/splunk/enterprise/standalone.go @@ -21,7 +21,7 @@ import ( "reflect" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/standalone_test.go b/pkg/splunk/enterprise/standalone_test.go index f933ca08d..de0f0e1bb 100644 --- a/pkg/splunk/enterprise/standalone_test.go +++ b/pkg/splunk/enterprise/standalone_test.go @@ -24,7 +24,7 @@ import ( "time" "github.com/pkg/errors" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/splunk/enterprise/telemetry.go b/pkg/splunk/enterprise/telemetry.go index a095e1e6e..80118fc1b 100644 --- a/pkg/splunk/enterprise/telemetry.go +++ b/pkg/splunk/enterprise/telemetry.go @@ -5,15 +5,16 @@ import ( "encoding/json" "errors" "fmt" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + "time" + + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splutil "github.com/splunk/splunk-operator/pkg/splunk/util" "k8s.io/apimachinery/pkg/api/resource" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "time" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/splunk/enterprise/telemetry_test.go b/pkg/splunk/enterprise/telemetry_test.go index f6c623017..50b49b950 100644 --- a/pkg/splunk/enterprise/telemetry_test.go +++ b/pkg/splunk/enterprise/telemetry_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/splunk/splunk-operator/pkg/splunk/test" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/splunk/enterprise/types.go b/pkg/splunk/enterprise/types.go index 8d0c2dd9d..cbbba2db6 100644 --- a/pkg/splunk/enterprise/types.go +++ b/pkg/splunk/enterprise/types.go @@ -20,7 +20,7 @@ import ( "sync" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splutil "github.com/splunk/splunk-operator/pkg/splunk/util" diff --git a/pkg/splunk/enterprise/upgrade.go b/pkg/splunk/enterprise/upgrade.go index a62fe4f00..b95722be1 100644 --- a/pkg/splunk/enterprise/upgrade.go +++ b/pkg/splunk/enterprise/upgrade.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/splunk/enterprise/upgrade_test.go b/pkg/splunk/enterprise/upgrade_test.go index fc960e61e..0e16ce20c 100644 --- a/pkg/splunk/enterprise/upgrade_test.go +++ b/pkg/splunk/enterprise/upgrade_test.go @@ -7,7 +7,7 @@ import ( "runtime/debug" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" "github.com/splunk/splunk-operator/pkg/splunk/common" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" diff --git a/pkg/splunk/enterprise/util.go b/pkg/splunk/enterprise/util.go index 3c16f0d81..3bfd45ed7 100644 --- a/pkg/splunk/enterprise/util.go +++ b/pkg/splunk/enterprise/util.go @@ -37,7 +37,7 @@ import ( "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/sqs" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -49,7 +49,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/util_test.go b/pkg/splunk/enterprise/util_test.go index 9e1ce9d16..99e6b8edc 100644 --- a/pkg/splunk/enterprise/util_test.go +++ b/pkg/splunk/enterprise/util_test.go @@ -40,8 +40,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - 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" splclient "github.com/splunk/splunk-operator/pkg/splunk/client" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splctrl "github.com/splunk/splunk-operator/pkg/splunk/splkcontroller" diff --git a/pkg/splunk/enterprise/validation/clustermanager_validation.go b/pkg/splunk/enterprise/validation/clustermanager_validation.go index 958b0a9a7..686c35295 100644 --- a/pkg/splunk/enterprise/validation/clustermanager_validation.go +++ b/pkg/splunk/enterprise/validation/clustermanager_validation.go @@ -19,7 +19,7 @@ package validation import ( "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // ValidateClusterManagerCreate validates a ClusterManager on CREATE diff --git a/pkg/splunk/enterprise/validation/clustermanager_validation_test.go b/pkg/splunk/enterprise/validation/clustermanager_validation_test.go index 84f23724a..2f76e3164 100644 --- a/pkg/splunk/enterprise/validation/clustermanager_validation_test.go +++ b/pkg/splunk/enterprise/validation/clustermanager_validation_test.go @@ -19,7 +19,7 @@ package validation import ( "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/assert" ) diff --git a/pkg/splunk/enterprise/validation/common_validation.go b/pkg/splunk/enterprise/validation/common_validation.go index 78793b949..e51abb10b 100644 --- a/pkg/splunk/enterprise/validation/common_validation.go +++ b/pkg/splunk/enterprise/validation/common_validation.go @@ -23,7 +23,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // storageCapacityRegex validates storage capacity format (e.g., "10Gi", "100Gi") diff --git a/pkg/splunk/enterprise/validation/common_validation_test.go b/pkg/splunk/enterprise/validation/common_validation_test.go index f796dbb3b..7b4278dc7 100644 --- a/pkg/splunk/enterprise/validation/common_validation_test.go +++ b/pkg/splunk/enterprise/validation/common_validation_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) func TestValidateCommonSplunkSpec(t *testing.T) { diff --git a/pkg/splunk/enterprise/validation/indexercluster_validation.go b/pkg/splunk/enterprise/validation/indexercluster_validation.go index 66f06bd5b..b77cbff35 100644 --- a/pkg/splunk/enterprise/validation/indexercluster_validation.go +++ b/pkg/splunk/enterprise/validation/indexercluster_validation.go @@ -19,7 +19,7 @@ package validation import ( "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // ValidateIndexerClusterCreate validates an IndexerCluster on CREATE diff --git a/pkg/splunk/enterprise/validation/indexercluster_validation_test.go b/pkg/splunk/enterprise/validation/indexercluster_validation_test.go index 1a5a0b5cc..3958616ff 100644 --- a/pkg/splunk/enterprise/validation/indexercluster_validation_test.go +++ b/pkg/splunk/enterprise/validation/indexercluster_validation_test.go @@ -19,7 +19,7 @@ package validation import ( "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/assert" ) diff --git a/pkg/splunk/enterprise/validation/licensemanager_validation.go b/pkg/splunk/enterprise/validation/licensemanager_validation.go index 9a729dcab..bd295caf8 100644 --- a/pkg/splunk/enterprise/validation/licensemanager_validation.go +++ b/pkg/splunk/enterprise/validation/licensemanager_validation.go @@ -19,7 +19,7 @@ package validation import ( "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // ValidateLicenseManagerCreate validates a LicenseManager on CREATE diff --git a/pkg/splunk/enterprise/validation/licensemanager_validation_test.go b/pkg/splunk/enterprise/validation/licensemanager_validation_test.go index 6d111396a..cd5805745 100644 --- a/pkg/splunk/enterprise/validation/licensemanager_validation_test.go +++ b/pkg/splunk/enterprise/validation/licensemanager_validation_test.go @@ -19,7 +19,7 @@ package validation import ( "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/assert" ) diff --git a/pkg/splunk/enterprise/validation/monitoringconsole_validation.go b/pkg/splunk/enterprise/validation/monitoringconsole_validation.go index 9e2d5dfb1..a6868297d 100644 --- a/pkg/splunk/enterprise/validation/monitoringconsole_validation.go +++ b/pkg/splunk/enterprise/validation/monitoringconsole_validation.go @@ -19,7 +19,7 @@ package validation import ( "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // ValidateMonitoringConsoleCreate validates a MonitoringConsole on CREATE diff --git a/pkg/splunk/enterprise/validation/monitoringconsole_validation_test.go b/pkg/splunk/enterprise/validation/monitoringconsole_validation_test.go index 6a0fd9122..a4e91273d 100644 --- a/pkg/splunk/enterprise/validation/monitoringconsole_validation_test.go +++ b/pkg/splunk/enterprise/validation/monitoringconsole_validation_test.go @@ -19,7 +19,7 @@ package validation import ( "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/assert" ) diff --git a/pkg/splunk/enterprise/validation/registry.go b/pkg/splunk/enterprise/validation/registry.go index 98b386f18..5012c3c13 100644 --- a/pkg/splunk/enterprise/validation/registry.go +++ b/pkg/splunk/enterprise/validation/registry.go @@ -19,7 +19,7 @@ package validation import ( "k8s.io/apimachinery/pkg/runtime/schema" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // GVR constants for all Splunk Enterprise CRDs diff --git a/pkg/splunk/enterprise/validation/searchheadcluster_validation.go b/pkg/splunk/enterprise/validation/searchheadcluster_validation.go index 750c3feb3..86088f84b 100644 --- a/pkg/splunk/enterprise/validation/searchheadcluster_validation.go +++ b/pkg/splunk/enterprise/validation/searchheadcluster_validation.go @@ -19,7 +19,7 @@ package validation import ( "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // ValidateSearchHeadClusterCreate validates a SearchHeadCluster on CREATE diff --git a/pkg/splunk/enterprise/validation/searchheadcluster_validation_test.go b/pkg/splunk/enterprise/validation/searchheadcluster_validation_test.go index 3f1661b14..3e565a386 100644 --- a/pkg/splunk/enterprise/validation/searchheadcluster_validation_test.go +++ b/pkg/splunk/enterprise/validation/searchheadcluster_validation_test.go @@ -19,7 +19,7 @@ package validation import ( "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/assert" ) diff --git a/pkg/splunk/enterprise/validation/server_test.go b/pkg/splunk/enterprise/validation/server_test.go index 0b2543014..0460674e9 100644 --- a/pkg/splunk/enterprise/validation/server_test.go +++ b/pkg/splunk/enterprise/validation/server_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) func TestNewWebhookServer(t *testing.T) { diff --git a/pkg/splunk/enterprise/validation/standalone_validation.go b/pkg/splunk/enterprise/validation/standalone_validation.go index 7e9c904fb..e80971460 100644 --- a/pkg/splunk/enterprise/validation/standalone_validation.go +++ b/pkg/splunk/enterprise/validation/standalone_validation.go @@ -19,7 +19,7 @@ package validation import ( "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // ValidateStandaloneCreate validates a Standalone on CREATE diff --git a/pkg/splunk/enterprise/validation/standalone_validation_test.go b/pkg/splunk/enterprise/validation/standalone_validation_test.go index a2fb9bfd1..902cbabd5 100644 --- a/pkg/splunk/enterprise/validation/standalone_validation_test.go +++ b/pkg/splunk/enterprise/validation/standalone_validation_test.go @@ -19,7 +19,7 @@ package validation import ( "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/stretchr/testify/assert" ) diff --git a/pkg/splunk/enterprise/validation/validate.go b/pkg/splunk/enterprise/validation/validate.go index f49cbab3a..31da632ba 100644 --- a/pkg/splunk/enterprise/validation/validate.go +++ b/pkg/splunk/enterprise/validation/validate.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/controller-runtime/pkg/client" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) var ( diff --git a/pkg/splunk/enterprise/validation/validate_test.go b/pkg/splunk/enterprise/validation/validate_test.go index eeffaa452..a7e07cffd 100644 --- a/pkg/splunk/enterprise/validation/validate_test.go +++ b/pkg/splunk/enterprise/validation/validate_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) func createStandaloneJSON(name, namespace string, replicas int32) []byte { diff --git a/pkg/splunk/enterprise/validation/validator_test.go b/pkg/splunk/enterprise/validation/validator_test.go index d4ad55e90..0a1b26057 100644 --- a/pkg/splunk/enterprise/validation/validator_test.go +++ b/pkg/splunk/enterprise/validation/validator_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation/field" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) func TestGenericValidatorValidateCreate(t *testing.T) { diff --git a/pkg/splunk/splkcontroller/configmap_test.go b/pkg/splunk/splkcontroller/configmap_test.go index 9bb46845a..f192a6de2 100644 --- a/pkg/splunk/splkcontroller/configmap_test.go +++ b/pkg/splunk/splkcontroller/configmap_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/splunk/splkcontroller/deployment.go b/pkg/splunk/splkcontroller/deployment.go index aab96833a..ee7a0b8c1 100644 --- a/pkg/splunk/splkcontroller/deployment.go +++ b/pkg/splunk/splkcontroller/deployment.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/log" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // ApplyDeployment creates or updates a Kubernetes Deployment diff --git a/pkg/splunk/splkcontroller/deployment_test.go b/pkg/splunk/splkcontroller/deployment_test.go index 6c4277682..bdaa614d1 100644 --- a/pkg/splunk/splkcontroller/deployment_test.go +++ b/pkg/splunk/splkcontroller/deployment_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/splunk/splkcontroller/statefulset.go b/pkg/splunk/splkcontroller/statefulset.go index 3028efbdd..0a5350b67 100644 --- a/pkg/splunk/splkcontroller/statefulset.go +++ b/pkg/splunk/splkcontroller/statefulset.go @@ -20,7 +20,7 @@ import ( "fmt" "reflect" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" splutil "github.com/splunk/splunk-operator/pkg/splunk/util" diff --git a/pkg/splunk/splkcontroller/statefulset_test.go b/pkg/splunk/splkcontroller/statefulset_test.go index da38a38df..a0e68191b 100644 --- a/pkg/splunk/splkcontroller/statefulset_test.go +++ b/pkg/splunk/splkcontroller/statefulset_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/splunk/test/awss3client.go b/pkg/splunk/test/awss3client.go index da8fa670e..7c8085f23 100644 --- a/pkg/splunk/test/awss3client.go +++ b/pkg/splunk/test/awss3client.go @@ -24,7 +24,7 @@ import ( "os" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/aws/aws-sdk-go-v2/feature/s3/manager" "github.com/aws/aws-sdk-go-v2/service/s3" diff --git a/pkg/splunk/test/azureblobclient.go b/pkg/splunk/test/azureblobclient.go index cb3dc44cc..6ed602eb5 100644 --- a/pkg/splunk/test/azureblobclient.go +++ b/pkg/splunk/test/azureblobclient.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" ) // MockAzureBlobClient is used to store all the objects for an app source diff --git a/pkg/splunk/test/controller.go b/pkg/splunk/test/controller.go index 6d43fa149..33a20258b 100644 --- a/pkg/splunk/test/controller.go +++ b/pkg/splunk/test/controller.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - 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" diff --git a/pkg/splunk/test/minioclient.go b/pkg/splunk/test/minioclient.go index 1bee4a667..bb8731adf 100644 --- a/pkg/splunk/test/minioclient.go +++ b/pkg/splunk/test/minioclient.go @@ -20,7 +20,7 @@ import ( "net/http" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/minio/minio-go/v7" ) diff --git a/pkg/splunk/util/util.go b/pkg/splunk/util/util.go index df1252f25..a0d35a7f0 100644 --- a/pkg/splunk/util/util.go +++ b/pkg/splunk/util/util.go @@ -22,7 +22,7 @@ import ( "net/http" "strings" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" corev1 "k8s.io/api/core/v1" diff --git a/pkg/splunk/util/util_test.go b/pkg/splunk/util/util_test.go index 19c4b27df..4c7bd202c 100644 --- a/pkg/splunk/util/util_test.go +++ b/pkg/splunk/util/util_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" spltest "github.com/splunk/splunk-operator/pkg/splunk/test" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/appframework_aws/c3/appframework_aws_test.go b/test/appframework_aws/c3/appframework_aws_test.go index 857ba1742..f4659e7ef 100644 --- a/test/appframework_aws/c3/appframework_aws_test.go +++ b/test/appframework_aws/c3/appframework_aws_test.go @@ -21,8 +21,8 @@ import ( "strings" "time" - 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" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/appframework_aws/c3/manager_appframework_test.go b/test/appframework_aws/c3/manager_appframework_test.go index a49fd3eb4..a1602af32 100644 --- a/test/appframework_aws/c3/manager_appframework_test.go +++ b/test/appframework_aws/c3/manager_appframework_test.go @@ -25,7 +25,7 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "github.com/splunk/splunk-operator/pkg/splunk/enterprise" testenv "github.com/splunk/splunk-operator/test/testenv" diff --git a/test/appframework_aws/m4/appframework_aws_test.go b/test/appframework_aws/m4/appframework_aws_test.go index fca638acb..692a4ad5f 100644 --- a/test/appframework_aws/m4/appframework_aws_test.go +++ b/test/appframework_aws/m4/appframework_aws_test.go @@ -25,8 +25,8 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - 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" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "github.com/splunk/splunk-operator/pkg/splunk/enterprise" testenv "github.com/splunk/splunk-operator/test/testenv" diff --git a/test/appframework_aws/m4/manager_appframework_test.go b/test/appframework_aws/m4/manager_appframework_test.go index 03e41df85..9e4160ae9 100644 --- a/test/appframework_aws/m4/manager_appframework_test.go +++ b/test/appframework_aws/m4/manager_appframework_test.go @@ -25,7 +25,7 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "github.com/splunk/splunk-operator/pkg/splunk/enterprise" testenv "github.com/splunk/splunk-operator/test/testenv" diff --git a/test/appframework_aws/s1/appframework_aws_test.go b/test/appframework_aws/s1/appframework_aws_test.go index bf91e80ce..62e85fbd3 100644 --- a/test/appframework_aws/s1/appframework_aws_test.go +++ b/test/appframework_aws/s1/appframework_aws_test.go @@ -20,7 +20,7 @@ import ( "strings" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/appframework_az/c3/appframework_azure_test.go b/test/appframework_az/c3/appframework_azure_test.go index c4c6b4eff..a5e4d6aa8 100644 --- a/test/appframework_az/c3/appframework_azure_test.go +++ b/test/appframework_az/c3/appframework_azure_test.go @@ -24,8 +24,8 @@ import ( . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - 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" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" testenv "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" diff --git a/test/appframework_az/c3/manager_appframework_azure_test.go b/test/appframework_az/c3/manager_appframework_azure_test.go index 8a8a1ec5c..e80342461 100644 --- a/test/appframework_az/c3/manager_appframework_azure_test.go +++ b/test/appframework_az/c3/manager_appframework_azure_test.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" testenv "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" diff --git a/test/appframework_az/m4/appframework_azure_test.go b/test/appframework_az/m4/appframework_azure_test.go index ce5cba659..d7aa2f5c3 100644 --- a/test/appframework_az/m4/appframework_azure_test.go +++ b/test/appframework_az/m4/appframework_azure_test.go @@ -25,8 +25,8 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - 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" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" testenv "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" diff --git a/test/appframework_az/m4/manager_appframework_azure_test.go b/test/appframework_az/m4/manager_appframework_azure_test.go index 96d24efc2..d3bc821a2 100644 --- a/test/appframework_az/m4/manager_appframework_azure_test.go +++ b/test/appframework_az/m4/manager_appframework_azure_test.go @@ -25,7 +25,7 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" testenv "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" diff --git a/test/appframework_az/s1/appframework_azure_test.go b/test/appframework_az/s1/appframework_azure_test.go index 92736ef92..620e7d495 100644 --- a/test/appframework_az/s1/appframework_azure_test.go +++ b/test/appframework_az/s1/appframework_azure_test.go @@ -23,7 +23,7 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" testenv "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" diff --git a/test/appframework_gcp/c3/appframework_gcs_test.go b/test/appframework_gcp/c3/appframework_gcs_test.go index 3a189f7a0..7a92c4f0f 100644 --- a/test/appframework_gcp/c3/appframework_gcs_test.go +++ b/test/appframework_gcp/c3/appframework_gcs_test.go @@ -22,8 +22,8 @@ import ( //"strings" //"time" - //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" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/appframework_gcp/c3/manager_appframework_test.go b/test/appframework_gcp/c3/manager_appframework_test.go index 7c10a6b87..2fa3b3b6c 100644 --- a/test/appframework_gcp/c3/manager_appframework_test.go +++ b/test/appframework_gcp/c3/manager_appframework_test.go @@ -25,7 +25,7 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "github.com/splunk/splunk-operator/pkg/splunk/enterprise" testenv "github.com/splunk/splunk-operator/test/testenv" diff --git a/test/appframework_gcp/m4/appframework_gcs_test.go b/test/appframework_gcp/m4/appframework_gcs_test.go index 96759b180..1dee5edc0 100644 --- a/test/appframework_gcp/m4/appframework_gcs_test.go +++ b/test/appframework_gcp/m4/appframework_gcs_test.go @@ -25,8 +25,8 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - 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" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "github.com/splunk/splunk-operator/pkg/splunk/enterprise" testenv "github.com/splunk/splunk-operator/test/testenv" diff --git a/test/appframework_gcp/m4/manager_appframework_test.go b/test/appframework_gcp/m4/manager_appframework_test.go index bc6837431..8969cd625 100644 --- a/test/appframework_gcp/m4/manager_appframework_test.go +++ b/test/appframework_gcp/m4/manager_appframework_test.go @@ -25,7 +25,7 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "github.com/splunk/splunk-operator/pkg/splunk/enterprise" testenv "github.com/splunk/splunk-operator/test/testenv" diff --git a/test/appframework_gcp/s1/appframework_gcs_test.go b/test/appframework_gcp/s1/appframework_gcs_test.go index edfd8019f..4c3474e6a 100644 --- a/test/appframework_gcp/s1/appframework_gcs_test.go +++ b/test/appframework_gcp/s1/appframework_gcs_test.go @@ -20,7 +20,7 @@ import ( "strings" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/custom_resource_crud/custom_resource_crud_c3_test.go b/test/custom_resource_crud/custom_resource_crud_c3_test.go index 8c47e63b2..deb6b210f 100644 --- a/test/custom_resource_crud/custom_resource_crud_c3_test.go +++ b/test/custom_resource_crud/custom_resource_crud_c3_test.go @@ -21,8 +21,8 @@ import ( . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - 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" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" diff --git a/test/custom_resource_crud/custom_resource_crud_m4_test.go b/test/custom_resource_crud/custom_resource_crud_m4_test.go index 4c00a07dc..d99f60d09 100644 --- a/test/custom_resource_crud/custom_resource_crud_m4_test.go +++ b/test/custom_resource_crud/custom_resource_crud_m4_test.go @@ -17,7 +17,7 @@ import ( "context" "fmt" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/custom_resource_crud/custom_resource_crud_s1_test.go b/test/custom_resource_crud/custom_resource_crud_s1_test.go index deb487628..8e82a551c 100644 --- a/test/custom_resource_crud/custom_resource_crud_s1_test.go +++ b/test/custom_resource_crud/custom_resource_crud_s1_test.go @@ -17,7 +17,7 @@ import ( "context" "fmt" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/custom_resource_crud/manager_custom_resource_crud_c3_test.go b/test/custom_resource_crud/manager_custom_resource_crud_c3_test.go index 86bcea539..57818a3b1 100644 --- a/test/custom_resource_crud/manager_custom_resource_crud_c3_test.go +++ b/test/custom_resource_crud/manager_custom_resource_crud_c3_test.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/custom_resource_crud/manager_custom_resource_crud_m4_test.go b/test/custom_resource_crud/manager_custom_resource_crud_m4_test.go index 89fadcbb8..3d3ad5d17 100644 --- a/test/custom_resource_crud/manager_custom_resource_crud_m4_test.go +++ b/test/custom_resource_crud/manager_custom_resource_crud_m4_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/test/delete_cr/deletecr_test.go b/test/delete_cr/deletecr_test.go index 2f3667ba1..2f1e71f8f 100644 --- a/test/delete_cr/deletecr_test.go +++ b/test/delete_cr/deletecr_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" testenv "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" diff --git a/test/index_and_ingestion_separation/index_and_ingestion_separation_suite_test.go b/test/index_and_ingestion_separation/index_and_ingestion_separation_suite_test.go index d2c4be9f1..b48b7e176 100644 --- a/test/index_and_ingestion_separation/index_and_ingestion_separation_suite_test.go +++ b/test/index_and_ingestion_separation/index_and_ingestion_separation_suite_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/splunk/splunk-operator/test/testenv" ) diff --git a/test/index_and_ingestion_separation/index_and_ingestion_separation_test.go b/test/index_and_ingestion_separation/index_and_ingestion_separation_test.go index 9142c9882..448334d07 100644 --- a/test/index_and_ingestion_separation/index_and_ingestion_separation_test.go +++ b/test/index_and_ingestion_separation/index_and_ingestion_separation_test.go @@ -25,7 +25,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/splunk/splunk-operator/pkg/splunk/enterprise" "github.com/splunk/splunk-operator/test/testenv" diff --git a/test/ingest_search/ingest_search_test.go b/test/ingest_search/ingest_search_test.go index 090f034a9..d60f7dba9 100644 --- a/test/ingest_search/ingest_search_test.go +++ b/test/ingest_search/ingest_search_test.go @@ -23,7 +23,7 @@ import ( "strings" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/licensemanager/lm_test_shared.go b/test/licensemanager/lm_test_shared.go index 205fd2c74..271ad1cdb 100644 --- a/test/licensemanager/lm_test_shared.go +++ b/test/licensemanager/lm_test_shared.go @@ -20,8 +20,8 @@ import ( "path/filepath" "time" - 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" "github.com/splunk/splunk-operator/pkg/splunk/enterprise" "github.com/splunk/splunk-operator/test/testenv" diff --git a/test/monitoring_console/manager_monitoring_console_test.go b/test/monitoring_console/manager_monitoring_console_test.go index 1cc3b89f3..a289264a7 100644 --- a/test/monitoring_console/manager_monitoring_console_test.go +++ b/test/monitoring_console/manager_monitoring_console_test.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" . "github.com/onsi/ginkgo/v2" diff --git a/test/monitoring_console/monitoring_console_test.go b/test/monitoring_console/monitoring_console_test.go index 87605c825..34de6ee8f 100644 --- a/test/monitoring_console/monitoring_console_test.go +++ b/test/monitoring_console/monitoring_console_test.go @@ -22,8 +22,8 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - 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" "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" ) diff --git a/test/secret/manager_secret_c3_test.go b/test/secret/manager_secret_c3_test.go index 9c0c5c53e..3ab21fd13 100644 --- a/test/secret/manager_secret_c3_test.go +++ b/test/secret/manager_secret_c3_test.go @@ -17,7 +17,7 @@ import ( "context" "fmt" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/secret/manager_secret_m4_test.go b/test/secret/manager_secret_m4_test.go index 34b04e70f..f075763a5 100644 --- a/test/secret/manager_secret_m4_test.go +++ b/test/secret/manager_secret_m4_test.go @@ -21,7 +21,7 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" "github.com/splunk/splunk-operator/test/testenv" ) diff --git a/test/secret/manager_secret_s1_test.go b/test/secret/manager_secret_s1_test.go index 70f9e38b9..298abdc73 100644 --- a/test/secret/manager_secret_s1_test.go +++ b/test/secret/manager_secret_s1_test.go @@ -17,7 +17,7 @@ import ( "context" "fmt" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/secret/secret_c3_test.go b/test/secret/secret_c3_test.go index 47465c2d5..d770b568e 100644 --- a/test/secret/secret_c3_test.go +++ b/test/secret/secret_c3_test.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/secret/secret_m4_test.go b/test/secret/secret_m4_test.go index c92df3e9e..e39263b49 100644 --- a/test/secret/secret_m4_test.go +++ b/test/secret/secret_m4_test.go @@ -17,7 +17,7 @@ import ( "context" "fmt" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/secret/secret_s1_test.go b/test/secret/secret_s1_test.go index d1497a36c..843dfa734 100644 --- a/test/secret/secret_s1_test.go +++ b/test/secret/secret_s1_test.go @@ -17,7 +17,7 @@ import ( "context" "fmt" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/smartstore/manager_smartstore_test.go b/test/smartstore/manager_smartstore_test.go index f54a98da5..bf57862fd 100644 --- a/test/smartstore/manager_smartstore_test.go +++ b/test/smartstore/manager_smartstore_test.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" diff --git a/test/smartstore/smartstore_test.go b/test/smartstore/smartstore_test.go index bdd100f37..e21f1d074 100644 --- a/test/smartstore/smartstore_test.go +++ b/test/smartstore/smartstore_test.go @@ -9,8 +9,8 @@ import ( "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" - 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" "github.com/splunk/splunk-operator/test/testenv" corev1 "k8s.io/api/core/v1" ) diff --git a/test/smoke/smoke_test.go b/test/smoke/smoke_test.go index d6d969819..47aa5b2e4 100644 --- a/test/smoke/smoke_test.go +++ b/test/smoke/smoke_test.go @@ -23,7 +23,7 @@ import ( "github.com/splunk/splunk-operator/test/testenv" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" corev1 "k8s.io/api/core/v1" ) diff --git a/test/testenv/appframework_utils.go b/test/testenv/appframework_utils.go index a1806d657..84217ca15 100644 --- a/test/testenv/appframework_utils.go +++ b/test/testenv/appframework_utils.go @@ -15,8 +15,8 @@ import ( corev1 "k8s.io/api/core/v1" wait "k8s.io/apimachinery/pkg/util/wait" - 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" logf "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/test/testenv/deployment.go b/test/testenv/deployment.go index 395722983..18e2e71c4 100644 --- a/test/testenv/deployment.go +++ b/test/testenv/deployment.go @@ -38,8 +38,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/client/config" - 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" ) // Deployment simply represents the deployment (standalone, clustered,...etc) we create on the testenv diff --git a/test/testenv/remote_index_utils.go b/test/testenv/remote_index_utils.go index 551a377d0..291b0d487 100644 --- a/test/testenv/remote_index_utils.go +++ b/test/testenv/remote_index_utils.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" logf "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/test/testenv/testenv.go b/test/testenv/testenv.go index 83576beda..22e840ea6 100644 --- a/test/testenv/testenv.go +++ b/test/testenv/testenv.go @@ -22,8 +22,8 @@ import ( "os" "time" - 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" "github.com/go-logr/logr" "github.com/onsi/ginkgo/v2" diff --git a/test/testenv/util.go b/test/testenv/util.go index 0eec51ac5..67062f40e 100644 --- a/test/testenv/util.go +++ b/test/testenv/util.go @@ -28,12 +28,12 @@ import ( "strings" "time" - enterpriseApi "github.com/splunk/splunk-operator/api/v4" + enterpriseApi "github.com/splunk/splunk-operator/api/enterprise/v4" . "github.com/onsi/gomega" "github.com/onsi/ginkgo/v2" - enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3" + enterpriseApiV3 "github.com/splunk/splunk-operator/api/enterprise/v3" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" "go.uber.org/zap/zapcore" appsv1 "k8s.io/api/apps/v1" diff --git a/test/testenv/verificationutils.go b/test/testenv/verificationutils.go index 4b3bc1331..fe7691649 100644 --- a/test/testenv/verificationutils.go +++ b/test/testenv/verificationutils.go @@ -32,8 +32,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" wait "k8s.io/apimachinery/pkg/util/wait" - 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" splcommon "github.com/splunk/splunk-operator/pkg/splunk/common" ) diff --git a/test/testenv/watch_utils.go b/test/testenv/watch_utils.go index e9b455164..bb1a8f270 100644 --- a/test/testenv/watch_utils.go +++ b/test/testenv/watch_utils.go @@ -18,8 +18,8 @@ import ( "fmt" "time" - 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" corev1 "k8s.io/api/core/v1" wait "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client"