Adjust the project's directory structure

yunionio · May 22, 2020 · 958333e · 958333e
1 parent 8abac21
commit 958333e
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 5 deletions.
diff --git a/controllers/ansibleplaybook_controller.go b/controllers/ansibleplaybook_controller.go
@@ -35,7 +35,7 @@ import (
 	"yunion.io/x/pkg/utils"
 
 	onecloudv1 "yunion.io/x/onecloud-service-operator/api/v1"
-	"yunion.io/x/onecloud-service-operator/provider"
+	"yunion.io/x/onecloud-service-operator/pkg/provider"
 )
 
 const (
@@ -48,6 +48,8 @@ type AnsiblePlaybookReconciler struct {
 	client.Client
 	Log    logr.Logger
 	Scheme *runtime.Scheme
+	// Enable intensive information collection during the reconcile process
+	Dense bool
 }
 
 // +kubebuilder:rbac:groups=onecloud.yunion.io,resources=ansibleplaybooks,verbs=get;list;watch;create;update;patch;delete

diff --git a/controllers/common.go b/controllers/common.go
@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	onecloudv1 "yunion.io/x/onecloud-service-operator/api/v1"
-	"yunion.io/x/onecloud-service-operator/provider"
+	"yunion.io/x/onecloud-service-operator/pkg/provider"
 )
 
 func dealErr(ctx context.Context, logger logr.Logger, sclient client.StatusClient, re onecloudv1.IResource,

diff --git a/controllers/virtualmachine_controller.go b/controllers/virtualmachine_controller.go
@@ -29,8 +29,8 @@ import (
 	"yunion.io/x/pkg/utils"
 
 	onecloudv1 "yunion.io/x/onecloud-service-operator/api/v1"
-	"yunion.io/x/onecloud-service-operator/provider"
-	"yunion.io/x/onecloud-service-operator/util"
+	"yunion.io/x/onecloud-service-operator/pkg/provider"
+	"yunion.io/x/onecloud-service-operator/pkg/util"
 )
 
 // VirtualMachineReconciler reconciles a VirtualMachine object

diff --git a/provider/ansibleplaybook.go → pkg/provider/ansibleplaybook.go b/provider/ansibleplaybook.go → pkg/provider/ansibleplaybook.go
diff --git a/provider/onecloud_auth.go → pkg/provider/onecloud_auth.go b/provider/onecloud_auth.go → pkg/provider/onecloud_auth.go
diff --git a/provider/onecloud_convert.go → pkg/provider/onecloud_convert.go b/provider/onecloud_convert.go → pkg/provider/onecloud_convert.go
diff --git a/provider/provider.go → pkg/provider/provider.go b/provider/provider.go → pkg/provider/provider.go
diff --git a/provider/virtualmachine.go → pkg/provider/virtualmachine.go b/provider/virtualmachine.go → pkg/provider/virtualmachine.go
@@ -29,7 +29,7 @@ import (
 	onecloudutils "yunion.io/x/pkg/utils"
 
 	onecloudv1 "yunion.io/x/onecloud-service-operator/api/v1"
-	"yunion.io/x/onecloud-service-operator/util"
+	"yunion.io/x/onecloud-service-operator/pkg/util"
 )
 
 func (oc OnecloudProvider) VMCreate(ctx context.Context, vm *onecloudv1.VirtualMachine) (onecloudv1.ExternalInfoBase, error) {

diff --git a/util/stringslice.go → pkg/util/stringslice.go b/util/stringslice.go → pkg/util/stringslice.go