Rename internal to pkg

Signed-off-by: kerthcet <[email protected]>
kubernetes-sigs · Mar 1, 2024 · 139e152 · 139e152
1 parent cce1166
commit 139e152
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,10 +14,10 @@ RUN go mod download
 # Copy the go source
 COPY cmd/main.go cmd/main.go
 COPY api/ api/
-COPY internal/controller/ internal/controller/
-COPY internal/cert/ internal/cert/
-COPY internal/webhook/ internal/webhook/
-COPY internal/commonutils internal/commonutils
+COPY pkg/controller/ pkg/controller/
+COPY pkg/cert/ pkg/cert/
+COPY pkg/webhook/ pkg/webhook/
+COPY pkg/commonutils pkg/commonutils
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command

diff --git a/cmd/main.go b/cmd/main.go
@@ -33,9 +33,9 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	leaderworkersetv1 "sigs.k8s.io/leader-worker-set/api/leaderworkerset/v1"
-	"sigs.k8s.io/leader-worker-set/internal/cert"
-	"sigs.k8s.io/leader-worker-set/internal/controller"
-	"sigs.k8s.io/leader-worker-set/internal/webhook"
+	"sigs.k8s.io/leader-worker-set/pkg/cert"
+	"sigs.k8s.io/leader-worker-set/pkg/controller"
+	"sigs.k8s.io/leader-worker-set/pkg/webhook"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/internal/cert/cert.go → pkg/cert/cert.go b/internal/cert/cert.go → pkg/cert/cert.go
diff --git a/internal/commonutils/statefulset_utils.go → pkg/commonutils/statefulset_utils.go b/internal/commonutils/statefulset_utils.go → pkg/commonutils/statefulset_utils.go
diff --git a/internal/commonutils/utils_test.go → pkg/commonutils/utils_test.go b/internal/commonutils/utils_test.go → pkg/commonutils/utils_test.go
diff --git a/internal/controller/controller_test.go → pkg/controller/controller_test.go b/internal/controller/controller_test.go → pkg/controller/controller_test.go
diff --git a/internal/controller/controller_utils.go → pkg/controller/controller_utils.go b/internal/controller/controller_utils.go → pkg/controller/controller_utils.go
diff --git a/.../controller/leaderworkerset_controller.go → pkg/controller/leaderworkerset_controller.go b/.../controller/leaderworkerset_controller.go → pkg/controller/leaderworkerset_controller.go
diff --git a/internal/controller/pod_controller.go → pkg/controller/pod_controller.go b/internal/controller/pod_controller.go → pkg/controller/pod_controller.go
@@ -35,7 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	leaderworkerset "sigs.k8s.io/leader-worker-set/api/leaderworkerset/v1"
-	"sigs.k8s.io/leader-worker-set/internal/commonutils"
+	"sigs.k8s.io/leader-worker-set/pkg/commonutils"
 )
 
 // PodReconciler reconciles a LeaderWorkerSet object

diff --git a/internal/webhook/pod_webhook.go → pkg/webhook/pod_webhook.go b/internal/webhook/pod_webhook.go → pkg/webhook/pod_webhook.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	leaderworkerset "sigs.k8s.io/leader-worker-set/api/leaderworkerset/v1"
-	"sigs.k8s.io/leader-worker-set/internal/commonutils"
+	"sigs.k8s.io/leader-worker-set/pkg/commonutils"
 )
 
 type PodWebhook struct {

diff --git a/internal/webhook/webhook_utils.go → pkg/webhook/webhook_utils.go b/internal/webhook/webhook_utils.go → pkg/webhook/webhook_utils.go
@@ -26,7 +26,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	leaderworkerset "sigs.k8s.io/leader-worker-set/api/leaderworkerset/v1"
-	commonutils "sigs.k8s.io/leader-worker-set/internal/commonutils"
+	commonutils "sigs.k8s.io/leader-worker-set/pkg/commonutils"
 )
 
 var (

diff --git a/...ertest/leaderworkerset_controller_test.go → ...roller/leaderworkerset_controller_test.go b/...ertest/leaderworkerset_controller_test.go → ...roller/leaderworkerset_controller_test.go
diff --git a/.../integration/controllertest/suite_test.go → test/integration/controller/suite_test.go b/.../integration/controllertest/suite_test.go → test/integration/controller/suite_test.go
@@ -35,7 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	leaderworkerset "sigs.k8s.io/leader-worker-set/api/leaderworkerset/v1"
-	controller "sigs.k8s.io/leader-worker-set/internal/controller"
+	controller "sigs.k8s.io/leader-worker-set/pkg/controller"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/...aderworkerset_webhook_integration_test.go → ...aderworkerset_webhook_integration_test.go b/...aderworkerset_webhook_integration_test.go → ...aderworkerset_webhook_integration_test.go
diff --git a/...bhooktest/pod_webhook_integration_test.go → ...n/webhook/pod_webhook_integration_test.go b/...bhooktest/pod_webhook_integration_test.go → ...n/webhook/pod_webhook_integration_test.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	leaderworkerset "sigs.k8s.io/leader-worker-set/api/leaderworkerset/v1"
-	podwebhook "sigs.k8s.io/leader-worker-set/internal/webhook"
+	podwebhook "sigs.k8s.io/leader-worker-set/pkg/webhook"
 	testutils "sigs.k8s.io/leader-worker-set/test/testutils"
 )
 

diff --git a/...gration/webhooktest/webhook_suite_test.go → ...integration/webhook/webhook_suite_test.go b/...gration/webhooktest/webhook_suite_test.go → ...integration/webhook/webhook_suite_test.go
@@ -45,7 +45,7 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	leaderworkerset "sigs.k8s.io/leader-worker-set/api/leaderworkerset/v1"
-	podwebhook "sigs.k8s.io/leader-worker-set/internal/webhook"
+	podwebhook "sigs.k8s.io/leader-worker-set/pkg/webhook"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to

diff --git a/test/testutils/util.go b/test/testutils/util.go
@@ -29,7 +29,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	leaderworkerset "sigs.k8s.io/leader-worker-set/api/leaderworkerset/v1"
-	podwebhook "sigs.k8s.io/leader-worker-set/internal/webhook"
+	podwebhook "sigs.k8s.io/leader-worker-set/pkg/webhook"
 )
 
 func CreateWorkerPodsForLeaderPod(ctx context.Context, leaderPod corev1.Pod, k8sClient client.Client, lws leaderworkerset.LeaderWorkerSet) {

diff --git a/test/testutils/validators.go b/test/testutils/validators.go
@@ -32,7 +32,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	leaderworkerset "sigs.k8s.io/leader-worker-set/api/leaderworkerset/v1"
-	"sigs.k8s.io/leader-worker-set/internal/commonutils"
+	"sigs.k8s.io/leader-worker-set/pkg/commonutils"
 )
 
 const (