remove all references to the internal directories

Signed-off-by: Luther Monson <[email protected]>
rancher · Dec 13, 2023 · 0159c9f · 0159c9f
1 parent e05b03e
commit 0159c9f
Show file tree

Hide file tree

Showing 22 changed files with 17 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -157,7 +157,7 @@ generate-manifests-rke2-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.g.
 	$(MAKE) clean-generated-yaml SRC_DIRS="./bootstrap/config/crd/bases"
 	$(CONTROLLER_GEN) \
 		paths=./bootstrap/api/... \
-		paths=./bootstrap/internal/controllers/... \
+		paths=./bootstrap/controllers/... \
 		crd:crdVersions=v1 \
 		rbac:roleName=manager-role \
 		output:crd:dir=./bootstrap/config/crd/bases \
@@ -170,8 +170,8 @@ generate-manifests-rke2-control-plane: $(CONTROLLER_GEN) ## Generate manifests e
 	$(MAKE) clean-generated-yaml SRC_DIRS="./controlplane/config/crd/bases"
 	$(CONTROLLER_GEN) \
 		paths=./controlplane/api/... \
-		paths=./controlplane/internal/controllers/... \
-		paths=./controlplane/internal/webhooks/... \
+		paths=./controlplane/controllers/... \
+		paths=./controlplane/webhooks/... \
 		crd:crdVersions=v1 \
 		rbac:roleName=manager-role \
 		output:crd:dir=./controlplane/config/crd/bases \

diff --git a/bootstrap/internal/cloudinit/cloudinit.go → bootstrap/cloudinit/cloudinit.go b/bootstrap/internal/cloudinit/cloudinit.go → bootstrap/cloudinit/cloudinit.go
diff --git a/...nternal/cloudinit/cloudinit_suite_test.go → bootstrap/cloudinit/cloudinit_suite_test.go b/...nternal/cloudinit/cloudinit_suite_test.go → bootstrap/cloudinit/cloudinit_suite_test.go
diff --git a/...trap/internal/cloudinit/cloudinit_test.go → bootstrap/cloudinit/cloudinit_test.go b/...trap/internal/cloudinit/cloudinit_test.go → bootstrap/cloudinit/cloudinit_test.go
diff --git a/...p/internal/cloudinit/controlplane_init.go → bootstrap/cloudinit/controlplane_init.go b/...p/internal/cloudinit/controlplane_init.go → bootstrap/cloudinit/controlplane_init.go
diff --git a/...p/internal/cloudinit/controlplane_join.go → bootstrap/cloudinit/controlplane_join.go b/...p/internal/cloudinit/controlplane_join.go → bootstrap/cloudinit/controlplane_join.go
diff --git a/bootstrap/internal/cloudinit/worker_join.go → bootstrap/cloudinit/worker_join.go b/bootstrap/internal/cloudinit/worker_join.go → bootstrap/cloudinit/worker_join.go
diff --git a/...rnal/controllers/rke2config_controller.go → ...trap/controllers/rke2config_controller.go b/...rnal/controllers/rke2config_controller.go → ...trap/controllers/rke2config_controller.go
@@ -42,8 +42,8 @@ import (
 	"sigs.k8s.io/cluster-api/util/patch"
 
 	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/ignition"
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/cloudinit"
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/ignition"
 	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/locking"

diff --git a/bootstrap/internal/controllers/suite_test.go → bootstrap/controllers/suite_test.go b/bootstrap/internal/controllers/suite_test.go → bootstrap/controllers/suite_test.go
diff --git a/bootstrap/internal/ignition/butane/butane.go → bootstrap/ignition/butane/butane.go b/bootstrap/internal/ignition/butane/butane.go → bootstrap/ignition/butane/butane.go
@@ -30,7 +30,7 @@ import (
 	"github.com/pkg/errors"
 
 	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/cloudinit"
 )
 
 // The template contains configurations for two main sections: systemd units and storage files.

diff --git a/...p/internal/ignition/butane/butane_test.go → bootstrap/ignition/butane/butane_test.go b/...p/internal/ignition/butane/butane_test.go → bootstrap/ignition/butane/butane_test.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/utils/pointer"
 
 	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/cloudinit"
 )
 
 func TestButane(t *testing.T) {

diff --git a/bootstrap/internal/ignition/ignition.go → bootstrap/ignition/ignition.go b/bootstrap/internal/ignition/ignition.go → bootstrap/ignition/ignition.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 
 	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/ignition/butane"
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/cloudinit"
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/ignition/butane"
 )
 
 const (

diff --git a/bootstrap/internal/ignition/ignition_test.go → bootstrap/ignition/ignition_test.go b/bootstrap/internal/ignition/ignition_test.go → bootstrap/ignition/ignition_test.go
@@ -24,7 +24,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/cloudinit"
 )
 
 func TestIgnition(t *testing.T) {

diff --git a/bootstrap/main.go b/bootstrap/main.go
@@ -43,7 +43,7 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
 	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/controllers"
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/controllers"
 	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
 )

diff --git a/controlplane/internal/controllers/const.go → controlplane/controllers/const.go b/controlplane/internal/controllers/const.go → controlplane/controllers/const.go
diff --git a/...ontrollers/rke2controlplane_controller.go → ...ontrollers/rke2controlplane_controller.go b/...ontrollers/rke2controlplane_controller.go → ...ontrollers/rke2controlplane_controller.go
diff --git a/...llers/rke2controlplane_controller_test.go → ...llers/rke2controlplane_controller_test.go b/...llers/rke2controlplane_controller_test.go → ...llers/rke2controlplane_controller_test.go
diff --git a/controlplane/internal/controllers/scale.go → controlplane/controllers/scale.go b/controlplane/internal/controllers/scale.go → controlplane/controllers/scale.go
diff --git a/...lplane/internal/controllers/suite_test.go → controlplane/controllers/suite_test.go b/...lplane/internal/controllers/suite_test.go → controlplane/controllers/suite_test.go
diff --git a/controlplane/main.go b/controlplane/main.go
@@ -45,7 +45,7 @@ import (
 
 	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
 	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/internal/controllers"
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/controllers"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
 )
 

diff --git a/controlplane/internal/webhooks/.gitkeep → controlplane/webhooks/.gitkeep b/controlplane/internal/webhooks/.gitkeep → controlplane/webhooks/.gitkeep
diff --git a/tilt-provider.json b/tilt-provider.json
@@ -9,7 +9,8 @@
           "go.mod",
           "go.sum",
           "api",
-          "internal",
+          "controllers",
+          "webhooks",
           "pkg",
           "../pkg"
         ],
@@ -27,7 +28,9 @@
             "go.mod",
             "go.sum",
             "api",
-            "internal",
+            "cloudinit",
+            "controllers",
+            "ignition",
             "pkg",
             "../pkg"
           ],