Refactored cluster code

aerospike · Aug 13, 2024 · 07f1e54 · 07f1e54
1 parent c8095ff
commit 07f1e54
Show file tree

Hide file tree

Showing 25 changed files with 20 additions and 19 deletions.
diff --git a/controllers/access_control.go → controllers/cluster/access_control.go b/controllers/access_control.go → controllers/cluster/access_control.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 // Aerospike access control reconciliation of access control.
 

diff --git a/controllers/aero_info_calls.go → controllers/cluster/aero_info_calls.go b/controllers/aero_info_calls.go → controllers/cluster/aero_info_calls.go
@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/aerospikecluster_controller.go → ...rs/cluster/aerospikecluster_controller.go b/controllers/aerospikecluster_controller.go → ...rs/cluster/aerospikecluster_controller.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/client_policy.go → controllers/cluster/client_policy.go b/controllers/client_policy.go → controllers/cluster/client_policy.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/configmap.go → controllers/cluster/configmap.go b/controllers/configmap.go → controllers/cluster/configmap.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"bytes"

diff --git a/controllers/pod.go → controllers/cluster/pod.go b/controllers/pod.go → controllers/cluster/pod.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/poddistruptionbudget.go → controllers/cluster/poddistruptionbudget.go b/controllers/poddistruptionbudget.go → controllers/cluster/poddistruptionbudget.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/pvc.go → controllers/cluster/pvc.go b/controllers/pvc.go → controllers/cluster/pvc.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/rack.go → controllers/cluster/rack.go b/controllers/rack.go → controllers/cluster/rack.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/reconciler.go → controllers/cluster/reconciler.go b/controllers/reconciler.go → controllers/cluster/reconciler.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/scripts/common-env.sh → controllers/cluster/scripts/common-env.sh b/controllers/scripts/common-env.sh → controllers/cluster/scripts/common-env.sh
diff --git a/controllers/scripts/copy-templates.sh → ...rollers/cluster/scripts/copy-templates.sh b/controllers/scripts/copy-templates.sh → ...rollers/cluster/scripts/copy-templates.sh
diff --git a/controllers/scripts/create-aerospike-conf.sh → .../cluster/scripts/create-aerospike-conf.sh b/controllers/scripts/create-aerospike-conf.sh → .../cluster/scripts/create-aerospike-conf.sh
diff --git a/...ollers/scripts/create_pod_status_patch.py → ...luster/scripts/create_pod_status_patch.py b/...ollers/scripts/create_pod_status_patch.py → ...luster/scripts/create_pod_status_patch.py
diff --git a/controllers/scripts/initialize.sh → controllers/cluster/scripts/initialize.sh b/controllers/scripts/initialize.sh → controllers/cluster/scripts/initialize.sh
diff --git a/...llers/scripts/refresh-cmap-restart-asd.sh → ...uster/scripts/refresh-cmap-restart-asd.sh b/...llers/scripts/refresh-cmap-restart-asd.sh → ...uster/scripts/refresh-cmap-restart-asd.sh
diff --git a/controllers/scripts/restart-asd.sh → controllers/cluster/scripts/restart-asd.sh b/controllers/scripts/restart-asd.sh → controllers/cluster/scripts/restart-asd.sh
diff --git a/controllers/scripts/update-pod-status.sh → ...lers/cluster/scripts/update-pod-status.sh b/controllers/scripts/update-pod-status.sh → ...lers/cluster/scripts/update-pod-status.sh
diff --git a/controllers/service.go → controllers/cluster/service.go b/controllers/service.go → controllers/cluster/service.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/statefulset.go → controllers/cluster/statefulset.go b/controllers/statefulset.go → controllers/cluster/statefulset.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	"context"

diff --git a/controllers/strong_consistency.go → controllers/cluster/strong_consistency.go b/controllers/strong_consistency.go → controllers/cluster/strong_consistency.go
@@ -1,4 +1,4 @@
-package controllers
+package cluster
 
 import (
 	gosets "github.com/deckarep/golang-set/v2"

diff --git a/main.go b/main.go
@@ -23,11 +23,12 @@ import (
 	"github.com/aerospike/aerospike-management-lib/asconfig"
 
 	asdbv1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1"
-	// +kubebuilder:scaffold:imports
 	asdbv1beta1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1beta1"
-	aerospikecluster "github.com/aerospike/aerospike-kubernetes-operator/controllers"
 	"github.com/aerospike/aerospike-kubernetes-operator/controllers/backup"
 	backupservice "github.com/aerospike/aerospike-kubernetes-operator/controllers/backup-service"
+
+	// +kubebuilder:scaffold:imports
+	"github.com/aerospike/aerospike-kubernetes-operator/controllers/cluster"
 	"github.com/aerospike/aerospike-kubernetes-operator/controllers/restore"
 	"github.com/aerospike/aerospike-kubernetes-operator/pkg/configschema"
 )
@@ -137,7 +138,7 @@ func main() {
 	eventBroadcaster.StartStructuredLogging(0)
 	eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
 
-	if err = (&aerospikecluster.AerospikeClusterReconciler{
+	if err = (&cluster.AerospikeClusterReconciler{
 		Client:     client,
 		KubeClient: kubeClient,
 		KubeConfig: kubeConfig,

diff --git a/test/cluster/access_control_test.go b/test/cluster/access_control_test.go
@@ -20,7 +20,7 @@ import (
 
 	as "github.com/aerospike/aerospike-client-go/v7"
 	asdbv1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1"
-	aerospikecluster "github.com/aerospike/aerospike-kubernetes-operator/controllers"
+	aerospikecluster "github.com/aerospike/aerospike-kubernetes-operator/controllers/cluster"
 	"github.com/aerospike/aerospike-kubernetes-operator/test"
 )
 

diff --git a/test/cluster/network_policy_test.go b/test/cluster/network_policy_test.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	asdbv1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1"
-	aerospikecluster "github.com/aerospike/aerospike-kubernetes-operator/controllers"
+	aerospikecluster "github.com/aerospike/aerospike-kubernetes-operator/controllers/cluster"
 	"github.com/aerospike/aerospike-kubernetes-operator/test"
 	"github.com/aerospike/aerospike-management-lib/deployment"
 )

diff --git a/test/cluster/test_client.go b/test/cluster/test_client.go
@@ -21,7 +21,7 @@ import (
 
 	as "github.com/aerospike/aerospike-client-go/v7"
 	asdbv1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1"
-	aerospikecluster "github.com/aerospike/aerospike-kubernetes-operator/controllers"
+	aerospikecluster "github.com/aerospike/aerospike-kubernetes-operator/controllers/cluster"
 )
 
 // FromSecretPasswordProvider provides user password from the secret provided in AerospikeUserSpec.