Repository: skupperproject/skupper
Pull request #1914 (2025-01-23 17:38:38)

Move more internal code out of pkg


Patch:
diff --git a/api/types/client.go b/api/types/client.go
index da940be7..18edc7b3 100644
--- a/api/types/client.go
+++ b/api/types/client.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/skupperproject/skupper/internal/network"
 	skupperclient "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned"
-	"github.com/skupperproject/skupper/pkg/network"
 
 	openshiftroute "github.com/openshift/client-go/route/clientset/versioned"
 	routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
index 43b1a3d9..9192ee18 100644
--- a/cmd/controller/main.go
+++ b/cmd/controller/main.go
@@ -12,7 +12,7 @@ import (
 
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
 	"github.com/skupperproject/skupper/internal/kube/controller"
-	"github.com/skupperproject/skupper/pkg/version"
+	"github.com/skupperproject/skupper/internal/version"
 )
 
 func describe(i interface{}) {
diff --git a/cmd/get/get.go b/cmd/get/get.go
index b0530e00..b8051899 100644
--- a/cmd/get/get.go
+++ b/cmd/get/get.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/cleanhttp"
-	"github.com/skupperproject/skupper/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/kube-adaptor/main.go b/cmd/kube-adaptor/main.go
index 7ba7b45e..1a05a672 100644
--- a/cmd/kube-adaptor/main.go
+++ b/cmd/kube-adaptor/main.go
@@ -15,7 +15,7 @@ import (
 	iflag "github.com/skupperproject/skupper/internal/flag"
 	"github.com/skupperproject/skupper/internal/kube/adaptor"
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
-	"github.com/skupperproject/skupper/pkg/version"
+	"github.com/skupperproject/skupper/internal/version"
 )
 
 var onlyOneSignalHandler = make(chan struct{})
diff --git a/cmd/network-observer/config.go b/cmd/network-observer/config.go
index 3d2baa92..554cdd33 100644
--- a/cmd/network-observer/config.go
+++ b/cmd/network-observer/config.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/skupperproject/skupper/pkg/utils/tlscfg"
+	"github.com/skupperproject/skupper/internal/utils/tlscfg"
 )
 
 type Config struct {
diff --git a/cmd/network-observer/main.go b/cmd/network-observer/main.go
index 43b68857..53cb0fd1 100755
--- a/cmd/network-observer/main.go
+++ b/cmd/network-observer/main.go
@@ -21,9 +21,9 @@ import (
 	"github.com/skupperproject/skupper/cmd/network-observer/internal/collector"
 	"github.com/skupperproject/skupper/cmd/network-observer/internal/flowlog"
 	"github.com/skupperproject/skupper/cmd/network-observer/internal/server"
+	"github.com/skupperproject/skupper/internal/version"
 	"github.com/skupperproject/skupper/pkg/vanflow"
 	"github.com/skupperproject/skupper/pkg/vanflow/session"
-	"github.com/skupperproject/skupper/pkg/version"
 )
 
 func run(cfg Config) error {
diff --git a/pkg/certs/certs.go b/internal/certs/certs.go
similarity index 100%
rename from pkg/certs/certs.go
rename to internal/certs/certs.go
diff --git a/internal/cmd/skupper/common/utils/spinner.go b/internal/cmd/skupper/common/utils/spinner.go
index 94a83ab0..30f67e80 100644
--- a/internal/cmd/skupper/common/utils/spinner.go
+++ b/internal/cmd/skupper/common/utils/spinner.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/briandowns/spinner"
-	"github.com/skupperproject/skupper/pkg/utils"
+	"github.com/skupperproject/skupper/internal/utils"
 )
 
 func NewSpinner(message string, maxRetries int, function func() error) error {
diff --git a/internal/cmd/skupper/connector/kube/connector_create.go b/internal/cmd/skupper/connector/kube/connector_create.go
index 72827154..eca7875a 100644
--- a/internal/cmd/skupper/connector/kube/connector_create.go
+++ b/internal/cmd/skupper/connector/kube/connector_create.go
@@ -11,10 +11,10 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	pkgUtils "github.com/skupperproject/skupper/internal/utils"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	pkgUtils "github.com/skupperproject/skupper/pkg/utils"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/cmd/skupper/connector/kube/connector_delete.go b/internal/cmd/skupper/connector/kube/connector_delete.go
index 527cd943..9c85297b 100644
--- a/internal/cmd/skupper/connector/kube/connector_delete.go
+++ b/internal/cmd/skupper/connector/kube/connector_delete.go
@@ -8,8 +8,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/cmd/skupper/connector/kube/connector_status.go b/internal/cmd/skupper/connector/kube/connector_status.go
index 2af6b6a3..534c51d0 100644
--- a/internal/cmd/skupper/connector/kube/connector_status.go
+++ b/internal/cmd/skupper/connector/kube/connector_status.go
@@ -10,8 +10,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/cmd/skupper/connector/kube/connector_update.go b/internal/cmd/skupper/connector/kube/connector_update.go
index 14d14f60..1132d2e6 100644
--- a/internal/cmd/skupper/connector/kube/connector_update.go
+++ b/internal/cmd/skupper/connector/kube/connector_update.go
@@ -10,10 +10,10 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	pkgUtils "github.com/skupperproject/skupper/internal/utils"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	pkgUtils "github.com/skupperproject/skupper/pkg/utils"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/cmd/skupper/connector/nonkube/connector_create.go b/internal/cmd/skupper/connector/nonkube/connector_create.go
index 2e3d2cab..0e2cd8f5 100644
--- a/internal/cmd/skupper/connector/nonkube/connector_create.go
+++ b/internal/cmd/skupper/connector/nonkube/connector_create.go
@@ -8,8 +8,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/cmd/skupper/connector/nonkube/connector_delete.go b/internal/cmd/skupper/connector/nonkube/connector_delete.go
index 43f9d808..2e5e619e 100644
--- a/internal/cmd/skupper/connector/nonkube/connector_delete.go
+++ b/internal/cmd/skupper/connector/nonkube/connector_delete.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cmd/skupper/connector/nonkube/connector_status.go b/internal/cmd/skupper/connector/nonkube/connector_status.go
index 014c1141..e6248954 100644
--- a/internal/cmd/skupper/connector/nonkube/connector_status.go
+++ b/internal/cmd/skupper/connector/nonkube/connector_status.go
@@ -8,7 +8,7 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cmd/skupper/connector/nonkube/connector_update.go b/internal/cmd/skupper/connector/nonkube/connector_update.go
index c291dc04..e52bd0ff 100644
--- a/internal/cmd/skupper/connector/nonkube/connector_update.go
+++ b/internal/cmd/skupper/connector/nonkube/connector_update.go
@@ -7,8 +7,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/cmd/skupper/link/kube/link_delete.go b/internal/cmd/skupper/link/kube/link_delete.go
index f722c676..90b967bb 100644
--- a/internal/cmd/skupper/link/kube/link_delete.go
+++ b/internal/cmd/skupper/link/kube/link_delete.go
@@ -6,8 +6,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"time"
diff --git a/internal/cmd/skupper/link/kube/link_generate.go b/internal/cmd/skupper/link/kube/link_generate.go
index 86a64cf5..ebe92e78 100644
--- a/internal/cmd/skupper/link/kube/link_generate.go
+++ b/internal/cmd/skupper/link/kube/link_generate.go
@@ -9,10 +9,10 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	commonutils "github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/kube/client"
+	pkgutils "github.com/skupperproject/skupper/internal/utils"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	pkgutils "github.com/skupperproject/skupper/pkg/utils"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/cmd/skupper/link/kube/link_status.go b/internal/cmd/skupper/link/kube/link_status.go
index d69f5535..7bc14bb7 100644
--- a/internal/cmd/skupper/link/kube/link_status.go
+++ b/internal/cmd/skupper/link/kube/link_status.go
@@ -6,9 +6,9 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"os"
diff --git a/internal/cmd/skupper/link/kube/link_update.go b/internal/cmd/skupper/link/kube/link_update.go
index 5da082f6..eda61288 100644
--- a/internal/cmd/skupper/link/kube/link_update.go
+++ b/internal/cmd/skupper/link/kube/link_update.go
@@ -9,9 +9,9 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/cmd/skupper/listener/kube/listener_create.go b/internal/cmd/skupper/listener/kube/listener_create.go
index c847be93..f2a76759 100644
--- a/internal/cmd/skupper/listener/kube/listener_create.go
+++ b/internal/cmd/skupper/listener/kube/listener_create.go
@@ -11,9 +11,9 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/cmd/skupper/listener/kube/listener_delete.go b/internal/cmd/skupper/listener/kube/listener_delete.go
index 38e8bfa1..7bc9c6aa 100644
--- a/internal/cmd/skupper/listener/kube/listener_delete.go
+++ b/internal/cmd/skupper/listener/kube/listener_delete.go
@@ -8,8 +8,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/cmd/skupper/listener/kube/listener_status.go b/internal/cmd/skupper/listener/kube/listener_status.go
index 4ad6a77c..6ea0b599 100644
--- a/internal/cmd/skupper/listener/kube/listener_status.go
+++ b/internal/cmd/skupper/listener/kube/listener_status.go
@@ -10,8 +10,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/cmd/skupper/listener/kube/listener_update.go b/internal/cmd/skupper/listener/kube/listener_update.go
index d6672644..5790c3e6 100644
--- a/internal/cmd/skupper/listener/kube/listener_update.go
+++ b/internal/cmd/skupper/listener/kube/listener_update.go
@@ -10,9 +10,9 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/cmd/skupper/listener/nonkube/listener_create.go b/internal/cmd/skupper/listener/nonkube/listener_create.go
index 70eec0fc..eca1861a 100644
--- a/internal/cmd/skupper/listener/nonkube/listener_create.go
+++ b/internal/cmd/skupper/listener/nonkube/listener_create.go
@@ -8,8 +8,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/cmd/skupper/listener/nonkube/listener_delete.go b/internal/cmd/skupper/listener/nonkube/listener_delete.go
index 52838264..1c719bf7 100644
--- a/internal/cmd/skupper/listener/nonkube/listener_delete.go
+++ b/internal/cmd/skupper/listener/nonkube/listener_delete.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cmd/skupper/listener/nonkube/listener_status.go b/internal/cmd/skupper/listener/nonkube/listener_status.go
index 4a9eb6cf..6ba8ad76 100644
--- a/internal/cmd/skupper/listener/nonkube/listener_status.go
+++ b/internal/cmd/skupper/listener/nonkube/listener_status.go
@@ -8,7 +8,7 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cmd/skupper/listener/nonkube/listener_update.go b/internal/cmd/skupper/listener/nonkube/listener_update.go
index dc75696b..88b71cb5 100644
--- a/internal/cmd/skupper/listener/nonkube/listener_update.go
+++ b/internal/cmd/skupper/listener/nonkube/listener_update.go
@@ -7,8 +7,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/cmd/skupper/site/kube/site_create.go b/internal/cmd/skupper/site/kube/site_create.go
index 4f995d6d..75250dfb 100644
--- a/internal/cmd/skupper/site/kube/site_create.go
+++ b/internal/cmd/skupper/site/kube/site_create.go
@@ -12,9 +12,9 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
diff --git a/internal/cmd/skupper/site/kube/site_delete.go b/internal/cmd/skupper/site/kube/site_delete.go
index e966541a..9d8ebc95 100644
--- a/internal/cmd/skupper/site/kube/site_delete.go
+++ b/internal/cmd/skupper/site/kube/site_delete.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
diff --git a/internal/cmd/skupper/site/kube/site_update.go b/internal/cmd/skupper/site/kube/site_update.go
index ab0a4bd3..3f44b5c3 100644
--- a/internal/cmd/skupper/site/kube/site_update.go
+++ b/internal/cmd/skupper/site/kube/site_update.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/cmd/skupper/site/nonkube/site_create.go b/internal/cmd/skupper/site/nonkube/site_create.go
index 701e8454..ad8be434 100644
--- a/internal/cmd/skupper/site/nonkube/site_create.go
+++ b/internal/cmd/skupper/site/nonkube/site_create.go
@@ -10,8 +10,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/cmd/skupper/site/nonkube/site_delete.go b/internal/cmd/skupper/site/nonkube/site_delete.go
index 7b32f8cb..d7ba614c 100644
--- a/internal/cmd/skupper/site/nonkube/site_delete.go
+++ b/internal/cmd/skupper/site/nonkube/site_delete.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cmd/skupper/site/nonkube/site_status.go b/internal/cmd/skupper/site/nonkube/site_status.go
index d7ec0b0a..36b931f3 100644
--- a/internal/cmd/skupper/site/nonkube/site_status.go
+++ b/internal/cmd/skupper/site/nonkube/site_status.go
@@ -8,7 +8,7 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cmd/skupper/site/nonkube/site_update.go b/internal/cmd/skupper/site/nonkube/site_update.go
index 08800783..e156bdcf 100644
--- a/internal/cmd/skupper/site/nonkube/site_update.go
+++ b/internal/cmd/skupper/site/nonkube/site_update.go
@@ -7,8 +7,8 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 	"github.com/skupperproject/skupper/internal/nonkube/client/fs"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/cmd/skupper/site/site.go b/internal/cmd/skupper/site/site.go
index 67984af8..949c20b1 100644
--- a/internal/cmd/skupper/site/site.go
+++ b/internal/cmd/skupper/site/site.go
@@ -53,7 +53,7 @@ There can be only one site definition per namespace.`,
 	cmd.Flags().StringVar(&cmdFlags.LinkAccessType, common.FlagNameLinkAccessType, "", common.FlagDescLinkAccessType)
 	cmd.Flags().StringVarP(&cmdFlags.Output, common.FlagNameOutput, "o", "", common.FlagDescOutput)
 	cmd.Flags().StringVar(&cmdFlags.ServiceAccount, common.FlagNameServiceAccount, "", common.FlagDescServiceAccount)
-	cmd.Flags().DurationVar(&cmdFlags.Timeout, common.FlagNameTimeout, 30*time.Second, common.FlagDescTimeout)
+	cmd.Flags().DurationVar(&cmdFlags.Timeout, common.FlagNameTimeout, 3*time.Minute, common.FlagDescTimeout)
 	cmd.Flags().StringVar(&cmdFlags.BindHost, common.FlagNameBindHost, "0.0.0.0", common.FlagDescBindHost)
 	cmd.Flags().StringSliceVar(&cmdFlags.SubjectAlternativeNames, common.FlagNameSubjectAlternativeNames, []string{}, common.FlagDescSubjectAlternativeNames)
 	cmd.Flags().StringVar(&cmdFlags.Wait, common.FlagNameWait, "ready", common.FlagDescWait)
diff --git a/internal/cmd/skupper/token/kube/token_issue.go b/internal/cmd/skupper/token/kube/token_issue.go
index a2538da1..1d327f51 100644
--- a/internal/cmd/skupper/token/kube/token_issue.go
+++ b/internal/cmd/skupper/token/kube/token_issue.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/cmd/skupper/token/kube/token_redeem.go b/internal/cmd/skupper/token/kube/token_redeem.go
index a99babae..8f152eb9 100644
--- a/internal/cmd/skupper/token/kube/token_redeem.go
+++ b/internal/cmd/skupper/token/kube/token_redeem.go
@@ -9,10 +9,10 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
 
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	"github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/scheme"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
diff --git a/internal/cmd/skupper/version/kube/version.go b/internal/cmd/skupper/version/kube/version.go
index 4af3f6f0..fd28a756 100644
--- a/internal/cmd/skupper/version/kube/version.go
+++ b/internal/cmd/skupper/version/kube/version.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
+	"github.com/skupperproject/skupper/internal/images"
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/configs"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/images"
-	"github.com/skupperproject/skupper/pkg/utils/configs"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/kubernetes"
 )
diff --git a/internal/cmd/skupper/version/nonkube/version.go b/internal/cmd/skupper/version/nonkube/version.go
index f67d2d78..c96bedd6 100644
--- a/internal/cmd/skupper/version/nonkube/version.go
+++ b/internal/cmd/skupper/version/nonkube/version.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
+	"github.com/skupperproject/skupper/internal/images"
 	"github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils/configs"
+	"github.com/skupperproject/skupper/internal/utils/validator"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/images"
-	"github.com/skupperproject/skupper/pkg/utils/configs"
-	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/kubernetes"
 )
diff --git a/internal/config/platform.go b/internal/config/platform.go
index 5417a680..b0c5b36d 100644
--- a/internal/config/platform.go
+++ b/internal/config/platform.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/skupperproject/skupper/api/types"
-	"github.com/skupperproject/skupper/pkg/utils"
+	"github.com/skupperproject/skupper/internal/utils"
 )
 
 var (
diff --git a/pkg/images/image_utils.go b/internal/images/image_utils.go
similarity index 100%
rename from pkg/images/image_utils.go
rename to internal/images/image_utils.go
diff --git a/pkg/images/images.go b/internal/images/images.go
similarity index 100%
rename from pkg/images/images.go
rename to internal/images/images.go
diff --git a/internal/kube/adaptor/collector.go b/internal/kube/adaptor/collector.go
index 268ca404..2c3a7b03 100644
--- a/internal/kube/adaptor/collector.go
+++ b/internal/kube/adaptor/collector.go
@@ -11,10 +11,10 @@ import (
 	"github.com/skupperproject/skupper/api/types"
 	"github.com/skupperproject/skupper/internal/config"
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
-	kubeflow "github.com/skupperproject/skupper/pkg/kube/flow"
+	kubeflow "github.com/skupperproject/skupper/internal/kube/flow"
+	"github.com/skupperproject/skupper/internal/version"
 	"github.com/skupperproject/skupper/pkg/vanflow"
 	"github.com/skupperproject/skupper/pkg/vanflow/session"
-	"github.com/skupperproject/skupper/pkg/version"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/kube/adaptor/config_init.go b/internal/kube/adaptor/config_init.go
index 53be7ee7..ec171ac6 100644
--- a/internal/kube/adaptor/config_init.go
+++ b/internal/kube/adaptor/config_init.go
@@ -9,7 +9,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/skupperproject/skupper/pkg/qdr"
+	"github.com/skupperproject/skupper/internal/qdr"
 )
 
 func InitialiseConfig(client kubernetes.Interface, namespace string, path string, routerConfigMap string) error {
diff --git a/internal/kube/adaptor/config_sync.go b/internal/kube/adaptor/config_sync.go
index 75c4f7ae..77a535f3 100644
--- a/internal/kube/adaptor/config_sync.go
+++ b/internal/kube/adaptor/config_sync.go
@@ -8,7 +8,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
-	"github.com/skupperproject/skupper/pkg/qdr"
+	"github.com/skupperproject/skupper/internal/qdr"
 )
 
 // Syncs the live router config with the configmap (bridge configuration,
diff --git a/internal/kube/certificates/mgr.go b/internal/kube/certificates/mgr.go
index 9d95c4ea..e4055d44 100644
--- a/internal/kube/certificates/mgr.go
+++ b/internal/kube/certificates/mgr.go
@@ -13,9 +13,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/skupperproject/skupper/internal/certs"
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/certs"
 )
 
 type CertificateManager interface {
diff --git a/internal/kube/client/pods.go b/internal/kube/client/pods.go
index 5377f9db..aa4db8cb 100644
--- a/internal/kube/client/pods.go
+++ b/internal/kube/client/pods.go
@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/skupperproject/skupper/pkg/utils"
+	"github.com/skupperproject/skupper/internal/utils"
 )
 
 func IsPodReady(pod *corev1.Pod) bool {
diff --git a/internal/kube/controller/controller.go b/internal/kube/controller/controller.go
index 2b821561..0f1de0e2 100644
--- a/internal/kube/controller/controller.go
+++ b/internal/kube/controller/controller.go
@@ -18,8 +18,8 @@ import (
 	"github.com/skupperproject/skupper/internal/kube/grants"
 	"github.com/skupperproject/skupper/internal/kube/securedaccess"
 	"github.com/skupperproject/skupper/internal/kube/site"
+	"github.com/skupperproject/skupper/internal/network"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/network"
 )
 
 type Controller struct {
diff --git a/pkg/kube/flow/controller.go b/internal/kube/flow/controller.go
similarity index 100%
rename from pkg/kube/flow/controller.go
rename to internal/kube/flow/controller.go
diff --git a/pkg/kube/flow/indexing.go b/internal/kube/flow/indexing.go
similarity index 100%
rename from pkg/kube/flow/indexing.go
rename to internal/kube/flow/indexing.go
diff --git a/pkg/kube/flow/process.go b/internal/kube/flow/process.go
similarity index 100%
rename from pkg/kube/flow/process.go
rename to internal/kube/flow/process.go
diff --git a/pkg/kube/flow/status.go b/internal/kube/flow/status.go
similarity index 99%
rename from pkg/kube/flow/status.go
rename to internal/kube/flow/status.go
index 3cfb80da..6a26991a 100644
--- a/pkg/kube/flow/status.go
+++ b/internal/kube/flow/status.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/skupperproject/skupper/pkg/network"
+	"github.com/skupperproject/skupper/internal/network"
 	"github.com/skupperproject/skupper/pkg/vanflow"
 	"github.com/skupperproject/skupper/pkg/vanflow/eventsource"
 	"github.com/skupperproject/skupper/pkg/vanflow/session"
diff --git a/internal/kube/grants/grants.go b/internal/kube/grants/grants.go
index 5251566c..b268735a 100644
--- a/internal/kube/grants/grants.go
+++ b/internal/kube/grants/grants.go
@@ -14,8 +14,8 @@ import (
 	kubetypes "k8s.io/apimachinery/pkg/types"
 
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/utils"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils"
 )
 
 type GrantResponse func(namespace string, name string, subject string, writer io.Writer) error
diff --git a/internal/kube/grants/server.go b/internal/kube/grants/server.go
index 6d8565a3..3b3d20e1 100644
--- a/internal/kube/grants/server.go
+++ b/internal/kube/grants/server.go
@@ -11,7 +11,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/skupperproject/skupper/pkg/utils/tlscfg"
+	"github.com/skupperproject/skupper/internal/utils/tlscfg"
 )
 
 type Server struct {
diff --git a/internal/kube/grants/tokens.go b/internal/kube/grants/tokens.go
index 262c5c4a..1afc7a5b 100644
--- a/internal/kube/grants/tokens.go
+++ b/internal/kube/grants/tokens.go
@@ -13,9 +13,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/client-go/kubernetes/scheme"
 
+	"github.com/skupperproject/skupper/internal/certs"
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/certs"
 )
 
 type CertToken struct {
diff --git a/internal/kube/qdr/update_config.go b/internal/kube/qdr/update_config.go
index f90d946c..20d28ba5 100644
--- a/internal/kube/qdr/update_config.go
+++ b/internal/kube/qdr/update_config.go
@@ -7,7 +7,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/util/retry"
 
-	"github.com/skupperproject/skupper/pkg/qdr"
+	"github.com/skupperproject/skupper/internal/qdr"
 )
 
 func UpdateRouterConfig(client kubernetes.Interface, name string, namespace string, ctxt context.Context, update qdr.ConfigUpdate) error {
diff --git a/internal/kube/site/attached_connector.go b/internal/kube/site/attached_connector.go
index 0d068ba5..7763511b 100644
--- a/internal/kube/site/attached_connector.go
+++ b/internal/kube/site/attached_connector.go
@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/skupperproject/skupper/internal/qdr"
+	"github.com/skupperproject/skupper/internal/site"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
-	"github.com/skupperproject/skupper/pkg/site"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/internal/kube/site/extended_bindings.go b/internal/kube/site/extended_bindings.go
index 7c46ccea..a6951eb7 100644
--- a/internal/kube/site/extended_bindings.go
+++ b/internal/kube/site/extended_bindings.go
@@ -5,9 +5,9 @@ import (
 	"log/slog"
 
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/qdr"
+	"github.com/skupperproject/skupper/internal/site"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
-	"github.com/skupperproject/skupper/pkg/site"
 )
 
 type ExtendedBindings struct {
diff --git a/internal/kube/site/per_target_listener.go b/internal/kube/site/per_target_listener.go
index c81bd500..57db491e 100644
--- a/internal/kube/site/per_target_listener.go
+++ b/internal/kube/site/per_target_listener.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 )
 
 type PerTargetListener struct {
diff --git a/internal/kube/site/resources/apply.go b/internal/kube/site/resources/apply.go
index f9794a6c..527bea3b 100644
--- a/internal/kube/site/resources/apply.go
+++ b/internal/kube/site/resources/apply.go
@@ -9,10 +9,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	skuppertypes "github.com/skupperproject/skupper/api/types"
+	"github.com/skupperproject/skupper/internal/images"
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
 	"github.com/skupperproject/skupper/internal/kube/resource"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/images"
 )
 
 //go:embed skupper-router-deployment.yaml
diff --git a/internal/kube/site/site.go b/internal/kube/site/site.go
index b52f966c..aebebab0 100644
--- a/internal/kube/site/site.go
+++ b/internal/kube/site/site.go
@@ -18,10 +18,10 @@ import (
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
 	kubeqdr "github.com/skupperproject/skupper/internal/kube/qdr"
 	"github.com/skupperproject/skupper/internal/kube/site/resources"
+	"github.com/skupperproject/skupper/internal/qdr"
+	"github.com/skupperproject/skupper/internal/site"
+	"github.com/skupperproject/skupper/internal/version"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
-	"github.com/skupperproject/skupper/pkg/site"
-	"github.com/skupperproject/skupper/pkg/version"
 )
 
 type SecuredAccessFactory interface {
diff --git a/pkg/messaging/messaging.go b/internal/messaging/messaging.go
similarity index 100%
rename from pkg/messaging/messaging.go
rename to internal/messaging/messaging.go
diff --git a/pkg/messaging/mock.go b/internal/messaging/mock.go
similarity index 100%
rename from pkg/messaging/mock.go
rename to internal/messaging/mock.go
diff --git a/pkg/network/network.go b/internal/network/network.go
similarity index 100%
rename from pkg/network/network.go
rename to internal/network/network.go
diff --git a/pkg/network/network_test.go b/internal/network/network_test.go
similarity index 100%
rename from pkg/network/network_test.go
rename to internal/network/network_test.go
diff --git a/pkg/network/types.go b/internal/network/types.go
similarity index 100%
rename from pkg/network/types.go
rename to internal/network/types.go
diff --git a/internal/nonkube/bundle/extract.go b/internal/nonkube/bundle/extract.go
index 570773cb..e49f48c8 100644
--- a/internal/nonkube/bundle/extract.go
+++ b/internal/nonkube/bundle/extract.go
@@ -9,8 +9,8 @@ import (
 	"text/template"
 
 	"github.com/skupperproject/skupper/internal/utils"
-	pkgutils "github.com/skupperproject/skupper/pkg/utils"
-	"github.com/skupperproject/skupper/pkg/version"
+	pkgutils "github.com/skupperproject/skupper/internal/utils"
+	"github.com/skupperproject/skupper/internal/version"
 )
 
 type SelfExtractingBundle struct {
diff --git a/internal/nonkube/bundle/tarball.go b/internal/nonkube/bundle/tarball.go
index 156bcb75..46283d49 100644
--- a/internal/nonkube/bundle/tarball.go
+++ b/internal/nonkube/bundle/tarball.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/skupperproject/skupper/internal/utils"
-	pkgutils "github.com/skupperproject/skupper/pkg/utils"
-	"github.com/skupperproject/skupper/pkg/version"
+	pkgutils "github.com/skupperproject/skupper/internal/utils"
+	"github.com/skupperproject/skupper/internal/version"
 )
 
 type TarballBundle struct {
diff --git a/internal/nonkube/client/compat/client.go b/internal/nonkube/client/compat/client.go
index 28179c5b..bf703ada 100644
--- a/internal/nonkube/client/compat/client.go
+++ b/internal/nonkube/client/compat/client.go
@@ -18,7 +18,7 @@ import (
 	runtimeclient "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
 	"github.com/skupperproject/skupper/api/types"
-	"github.com/skupperproject/skupper/pkg/utils"
+	"github.com/skupperproject/skupper/internal/utils"
 )
 
 const (
diff --git a/internal/nonkube/client/compat/network.go b/internal/nonkube/client/compat/network.go
index fd7b3066..21c35be0 100644
--- a/internal/nonkube/client/compat/network.go
+++ b/internal/nonkube/client/compat/network.go
@@ -9,8 +9,8 @@ import (
 	"github.com/skupperproject/skupper-libpod/v4/client/networks_compat"
 	"github.com/skupperproject/skupper-libpod/v4/models"
 	"github.com/skupperproject/skupper/api/types"
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/container"
-	"github.com/skupperproject/skupper/pkg/utils"
 )
 
 func (c *CompatClient) NetworkList() ([]*container.Network, error) {
diff --git a/internal/nonkube/client/compat/version.go b/internal/nonkube/client/compat/version.go
index d6839c53..4e1a27dd 100644
--- a/internal/nonkube/client/compat/version.go
+++ b/internal/nonkube/client/compat/version.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	system "github.com/skupperproject/skupper-libpod/v4/client/system_compat"
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/container"
-	"github.com/skupperproject/skupper/pkg/utils"
 )
 
 func (c *CompatClient) Version() (*container.Version, error) {
diff --git a/pkg/ports/ports.go b/internal/ports/ports.go
similarity index 100%
rename from pkg/ports/ports.go
rename to internal/ports/ports.go
diff --git a/pkg/ports/ports_test.go b/internal/ports/ports_test.go
similarity index 100%
rename from pkg/ports/ports_test.go
rename to internal/ports/ports_test.go
diff --git a/pkg/qdr/amqp_mgmt.go b/internal/qdr/amqp_mgmt.go
similarity index 99%
rename from pkg/qdr/amqp_mgmt.go
rename to internal/qdr/amqp_mgmt.go
index 61a8f95d..78b1d549 100644
--- a/pkg/qdr/amqp_mgmt.go
+++ b/internal/qdr/amqp_mgmt.go
@@ -13,7 +13,7 @@ import (
 	amqp "github.com/interconnectedcloud/go-amqp"
 	"github.com/skupperproject/skupper/api/types"
 	"github.com/skupperproject/skupper/internal/config"
-	"github.com/skupperproject/skupper/pkg/utils"
+	"github.com/skupperproject/skupper/internal/utils"
 )
 
 type RouterNode struct {
diff --git a/pkg/qdr/amqp_mgmt_mock_test.go b/internal/qdr/amqp_mgmt_mock_test.go
similarity index 100%
rename from pkg/qdr/amqp_mgmt_mock_test.go
rename to internal/qdr/amqp_mgmt_mock_test.go
diff --git a/pkg/qdr/messaging.go b/internal/qdr/messaging.go
similarity index 97%
rename from pkg/qdr/messaging.go
rename to internal/qdr/messaging.go
index df52e69a..2562b4d6 100644
--- a/pkg/qdr/messaging.go
+++ b/internal/qdr/messaging.go
@@ -6,7 +6,7 @@ import (
 
 	amqp "github.com/interconnectedcloud/go-amqp"
 
-	"github.com/skupperproject/skupper/pkg/messaging"
+	"github.com/skupperproject/skupper/internal/messaging"
 )
 
 type TlsConfigRetriever interface {
diff --git a/pkg/qdr/port_mapping.go b/internal/qdr/port_mapping.go
similarity index 96%
rename from pkg/qdr/port_mapping.go
rename to internal/qdr/port_mapping.go
index 83a3a822..85efdcbc 100644
--- a/pkg/qdr/port_mapping.go
+++ b/internal/qdr/port_mapping.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/skupperproject/skupper/pkg/ports"
+	"github.com/skupperproject/skupper/internal/ports"
 )
 
 type PortMapping struct {
diff --git a/pkg/qdr/request.go b/internal/qdr/request.go
similarity index 100%
rename from pkg/qdr/request.go
rename to internal/qdr/request.go
diff --git a/pkg/qdr/router_logging.go b/internal/qdr/router_logging.go
similarity index 100%
rename from pkg/qdr/router_logging.go
rename to internal/qdr/router_logging.go
diff --git a/pkg/qdr/router_logging_test.go b/internal/qdr/router_logging_test.go
similarity index 100%
rename from pkg/qdr/router_logging_test.go
rename to internal/qdr/router_logging_test.go
diff --git a/pkg/qdr/skmanage.go b/internal/qdr/skmanage.go
similarity index 100%
rename from pkg/qdr/skmanage.go
rename to internal/qdr/skmanage.go
diff --git a/pkg/site/bindings.go b/internal/site/bindings.go
similarity index 99%
rename from pkg/site/bindings.go
rename to internal/site/bindings.go
index a83ebdd4..a8b746e6 100644
--- a/pkg/site/bindings.go
+++ b/internal/site/bindings.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"reflect"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 )
 
 type ListenerConfiguration func(siteId string, listener *skupperv2alpha1.Listener, config *qdr.BridgeConfig)
diff --git a/pkg/site/connector.go b/internal/site/connector.go
similarity index 97%
rename from pkg/site/connector.go
rename to internal/site/connector.go
index be0cf040..857e52d1 100644
--- a/pkg/site/connector.go
+++ b/internal/site/connector.go
@@ -3,8 +3,8 @@ package site
 import (
 	"strconv"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 )
 
 func UpdateBridgeConfigForConnector(siteId string, connector *skupperv2alpha1.Connector, config *qdr.BridgeConfig) {
diff --git a/pkg/site/link.go b/internal/site/link.go
similarity index 97%
rename from pkg/site/link.go
rename to internal/site/link.go
index c2abacb1..f2a4353d 100644
--- a/pkg/site/link.go
+++ b/internal/site/link.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 )
 
 type Link struct {
diff --git a/pkg/site/listener.go b/internal/site/listener.go
similarity index 94%
rename from pkg/site/listener.go
rename to internal/site/listener.go
index 1a6ea656..48017402 100644
--- a/pkg/site/listener.go
+++ b/internal/site/listener.go
@@ -3,8 +3,8 @@ package site
 import (
 	"strconv"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 )
 
 func UpdateBridgeConfigForListener(siteId string, listener *skupperv2alpha1.Listener, config *qdr.BridgeConfig) {
diff --git a/pkg/site/routeraccess.go b/internal/site/routeraccess.go
similarity index 98%
rename from pkg/site/routeraccess.go
rename to internal/site/routeraccess.go
index f5dc78cf..7e962db9 100644
--- a/pkg/site/routeraccess.go
+++ b/internal/site/routeraccess.go
@@ -3,8 +3,8 @@ package site
 import (
 	"strconv"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 )
 
 type RouterAccessMap map[string]*skupperv2alpha1.RouterAccess
diff --git a/pkg/utils/configs/config.go b/internal/utils/configs/config.go
similarity index 100%
rename from pkg/utils/configs/config.go
rename to internal/utils/configs/config.go
diff --git a/pkg/utils/configs/manifest.go b/internal/utils/configs/manifest.go
similarity index 98%
rename from pkg/utils/configs/manifest.go
rename to internal/utils/configs/manifest.go
index ba255d00..f0d26b11 100644
--- a/pkg/utils/configs/manifest.go
+++ b/internal/utils/configs/manifest.go
@@ -3,7 +3,7 @@ package configs
 import (
 	"os"
 
-	"github.com/skupperproject/skupper/pkg/images"
+	"github.com/skupperproject/skupper/internal/images"
 )
 
 type SkupperManifest struct {
diff --git a/pkg/utils/formatter/list.go b/internal/utils/formatter/list.go
similarity index 100%
rename from pkg/utils/formatter/list.go
rename to internal/utils/formatter/list.go
diff --git a/pkg/utils/formatter/map.go b/internal/utils/formatter/map.go
similarity index 100%
rename from pkg/utils/formatter/map.go
rename to internal/utils/formatter/map.go
diff --git a/pkg/utils/formatter/status.go b/internal/utils/formatter/status.go
similarity index 99%
rename from pkg/utils/formatter/status.go
rename to internal/utils/formatter/status.go
index dd49e568..d9040c58 100644
--- a/pkg/utils/formatter/status.go
+++ b/internal/utils/formatter/status.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/skupperproject/skupper/pkg/network"
+	"github.com/skupperproject/skupper/internal/network"
 )
 
 type PlatformSupport struct {
diff --git a/pkg/nonkube/api/site_state.go b/pkg/nonkube/api/site_state.go
index 9a84f960..9dad6e8b 100644
--- a/pkg/nonkube/api/site_state.go
+++ b/pkg/nonkube/api/site_state.go
@@ -8,11 +8,11 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/skupperproject/skupper/internal/qdr"
+	"github.com/skupperproject/skupper/internal/site"
+	"github.com/skupperproject/skupper/internal/utils"
+	"github.com/skupperproject/skupper/internal/version"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
-	"github.com/skupperproject/skupper/pkg/site"
-	"github.com/skupperproject/skupper/pkg/utils"
-	"github.com/skupperproject/skupper/pkg/version"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/nonkube/api/token.go b/pkg/nonkube/api/token.go
index e9fda36a..f6791152 100644
--- a/pkg/nonkube/api/token.go
+++ b/pkg/nonkube/api/token.go
@@ -9,8 +9,8 @@ import (
 	"slices"
 	"strconv"
 
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/utils"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
diff --git a/pkg/nonkube/bootstrap/bootstrap.go b/pkg/nonkube/bootstrap/bootstrap.go
index 18bba171..004bb0ca 100644
--- a/pkg/nonkube/bootstrap/bootstrap.go
+++ b/pkg/nonkube/bootstrap/bootstrap.go
@@ -8,13 +8,13 @@ import (
 
 	"github.com/skupperproject/skupper/api/types"
 	internalbundle "github.com/skupperproject/skupper/internal/nonkube/bundle"
+	"github.com/skupperproject/skupper/internal/utils"
 	internalutils "github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
 	"github.com/skupperproject/skupper/pkg/nonkube/bundle"
 	"github.com/skupperproject/skupper/pkg/nonkube/common"
 	"github.com/skupperproject/skupper/pkg/nonkube/compat"
 	"github.com/skupperproject/skupper/pkg/nonkube/linux"
-	"github.com/skupperproject/skupper/pkg/utils"
 )
 
 type Config struct {
diff --git a/pkg/nonkube/bundle/site_state_renderer.go b/pkg/nonkube/bundle/site_state_renderer.go
index c3f8e728..8333b801 100644
--- a/pkg/nonkube/bundle/site_state_renderer.go
+++ b/pkg/nonkube/bundle/site_state_renderer.go
@@ -9,10 +9,10 @@ import (
 	"path"
 
 	"github.com/skupperproject/skupper/api/types"
+	"github.com/skupperproject/skupper/internal/images"
 	internalbundle "github.com/skupperproject/skupper/internal/nonkube/bundle"
 	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/container"
-	"github.com/skupperproject/skupper/pkg/images"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
 	"github.com/skupperproject/skupper/pkg/nonkube/common"
 )
diff --git a/pkg/nonkube/common/fs_config_renderer.go b/pkg/nonkube/common/fs_config_renderer.go
index 3990cd22..ba63de8a 100644
--- a/pkg/nonkube/common/fs_config_renderer.go
+++ b/pkg/nonkube/common/fs_config_renderer.go
@@ -10,11 +10,11 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/skupperproject/skupper/internal/certs"
+	"github.com/skupperproject/skupper/internal/qdr"
 	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/certs"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
-	"github.com/skupperproject/skupper/pkg/qdr"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/nonkube/common/site_state_loader.go b/pkg/nonkube/common/site_state_loader.go
index e2c658d0..90e43760 100644
--- a/pkg/nonkube/common/site_state_loader.go
+++ b/pkg/nonkube/common/site_state_loader.go
@@ -9,10 +9,10 @@ import (
 	"path"
 	"strings"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
-	"github.com/skupperproject/skupper/pkg/qdr"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/pkg/nonkube/common/site_state_renderer_common.go b/pkg/nonkube/common/site_state_renderer_common.go
index 543c407e..40b834c6 100644
--- a/pkg/nonkube/common/site_state_renderer_common.go
+++ b/pkg/nonkube/common/site_state_renderer_common.go
@@ -3,9 +3,9 @@ package common
 import (
 	"fmt"
 
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
-	"github.com/skupperproject/skupper/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
 )
 
diff --git a/pkg/nonkube/common/site_state_validator.go b/pkg/nonkube/common/site_state_validator.go
index 92980b31..0aa1d066 100644
--- a/pkg/nonkube/common/site_state_validator.go
+++ b/pkg/nonkube/common/site_state_validator.go
@@ -5,9 +5,9 @@ import (
 	"net"
 	"regexp"
 
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
-	"github.com/skupperproject/skupper/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
 )
 
diff --git a/pkg/nonkube/compat/site_state_renderer.go b/pkg/nonkube/compat/site_state_renderer.go
index f9cf3f28..60f30fff 100644
--- a/pkg/nonkube/compat/site_state_renderer.go
+++ b/pkg/nonkube/compat/site_state_renderer.go
@@ -10,12 +10,12 @@ import (
 	"time"
 
 	"github.com/skupperproject/skupper/api/types"
+	"github.com/skupperproject/skupper/internal/images"
 	internalclient "github.com/skupperproject/skupper/internal/nonkube/client/compat"
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/container"
-	"github.com/skupperproject/skupper/pkg/images"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
 	"github.com/skupperproject/skupper/pkg/nonkube/common"
-	"github.com/skupperproject/skupper/pkg/utils"
 )
 
 type SiteStateRenderer struct {
diff --git a/pkg/nonkube/linux/site_state_renderer.go b/pkg/nonkube/linux/site_state_renderer.go
index e33c4ef6..a91f2ddd 100644
--- a/pkg/nonkube/linux/site_state_renderer.go
+++ b/pkg/nonkube/linux/site_state_renderer.go
@@ -6,9 +6,9 @@ import (
 	"os"
 
 	"github.com/skupperproject/skupper/api/types"
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
 	"github.com/skupperproject/skupper/pkg/nonkube/common"
-	"github.com/skupperproject/skupper/pkg/utils"
 )
 
 type SiteStateRenderer struct {


Test patch:
diff --git a/internal/cmd/skupper/site/site_test.go b/internal/cmd/skupper/site/site_test.go
index f3b9f93a..1ba6c75f 100644
--- a/internal/cmd/skupper/site/site_test.go
+++ b/internal/cmd/skupper/site/site_test.go
@@ -26,7 +26,7 @@ func TestCmdSiteFactory(t *testing.T) {
 				common.FlagNameLinkAccessType:          "",
 				common.FlagNameServiceAccount:          "",
 				common.FlagNameOutput:                  "",
-				common.FlagNameTimeout:                 "30s",
+				common.FlagNameTimeout:                 "3m0s",
 				common.FlagNameBindHost:                "0.0.0.0",
 				common.FlagNameSubjectAlternativeNames: "[]",
 				common.FlagNameWait:                    "ready",
diff --git a/internal/cmd/skupper/version/kube/version_test.go b/internal/cmd/skupper/version/kube/version_test.go
index 88c7c96d..ebc2c455 100644
--- a/internal/cmd/skupper/version/kube/version_test.go
+++ b/internal/cmd/skupper/version/kube/version_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
-	"github.com/skupperproject/skupper/pkg/utils/configs"
+	"github.com/skupperproject/skupper/internal/utils/configs"
 	"gotest.tools/v3/assert"
 	"k8s.io/apimachinery/pkg/runtime"
 )
diff --git a/internal/cmd/skupper/version/nonkube/version_test.go b/internal/cmd/skupper/version/nonkube/version_test.go
index dc9f08ef..4f847e26 100644
--- a/internal/cmd/skupper/version/nonkube/version_test.go
+++ b/internal/cmd/skupper/version/nonkube/version_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common"
 	"github.com/skupperproject/skupper/internal/cmd/skupper/common/utils"
-	"github.com/skupperproject/skupper/pkg/utils/configs"
+	"github.com/skupperproject/skupper/internal/utils/configs"
 	"gotest.tools/v3/assert"
 	"k8s.io/apimachinery/pkg/runtime"
 )
diff --git a/internal/kube/controller/controller_test.go b/internal/kube/controller/controller_test.go
index 3ddc427c..74bc1aac 100644
--- a/internal/kube/controller/controller_test.go
+++ b/internal/kube/controller/controller_test.go
@@ -29,9 +29,9 @@ import (
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
 	fakeclient "github.com/skupperproject/skupper/internal/kube/client/fake"
 	"github.com/skupperproject/skupper/internal/kube/resource"
+	"github.com/skupperproject/skupper/internal/network"
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/network"
-	"github.com/skupperproject/skupper/pkg/qdr"
 )
 
 type WaitFunction func(t *testing.T, clients internalclient.Clients) bool
diff --git a/pkg/kube/flow/status_test.go b/internal/kube/flow/status_test.go
similarity index 99%
rename from pkg/kube/flow/status_test.go
rename to internal/kube/flow/status_test.go
index 86f020a5..647f050e 100644
--- a/pkg/kube/flow/status_test.go
+++ b/internal/kube/flow/status_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/skupperproject/skupper/pkg/network"
+	"github.com/skupperproject/skupper/internal/network"
 	"github.com/skupperproject/skupper/pkg/vanflow"
 	"github.com/skupperproject/skupper/pkg/vanflow/eventsource"
 	"github.com/skupperproject/skupper/pkg/vanflow/session"
diff --git a/internal/kube/grants/common_test.go b/internal/kube/grants/common_test.go
index 428e1ec1..99080281 100644
--- a/internal/kube/grants/common_test.go
+++ b/internal/kube/grants/common_test.go
@@ -10,8 +10,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/skupperproject/skupper/internal/certs"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/certs"
 )
 
 type FailingReader struct {
diff --git a/internal/kube/site/bindings_test.go b/internal/kube/site/bindings_test.go
index 3b874525..1d6ba2c4 100644
--- a/internal/kube/site/bindings_test.go
+++ b/internal/kube/site/bindings_test.go
@@ -3,8 +3,8 @@ package site
 import (
 	"testing"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 	"gotest.tools/v3/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/internal/kube/site/site_test.go b/internal/kube/site/site_test.go
index 5fadaa2c..e62f1b97 100644
--- a/internal/kube/site/site_test.go
+++ b/internal/kube/site/site_test.go
@@ -8,11 +8,11 @@ import (
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
 	fakeclient "github.com/skupperproject/skupper/internal/kube/client/fake"
 	"github.com/skupperproject/skupper/internal/kube/securedaccess"
+	"github.com/skupperproject/skupper/internal/qdr"
+	site1 "github.com/skupperproject/skupper/internal/site"
+	"github.com/skupperproject/skupper/internal/version"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
-	site1 "github.com/skupperproject/skupper/pkg/site"
-	"github.com/skupperproject/skupper/pkg/version"
 	"gotest.tools/v3/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/nonkube/client/compat/container_test.go b/internal/nonkube/client/compat/container_test.go
index ccc5e1ac..e0f4e3ec 100644
--- a/internal/nonkube/client/compat/container_test.go
+++ b/internal/nonkube/client/compat/container_test.go
@@ -15,9 +15,9 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/skupperproject/skupper-libpod/v4/client/containers_compat"
 	"github.com/skupperproject/skupper/api/types"
+	"github.com/skupperproject/skupper/internal/images"
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/container"
-	"github.com/skupperproject/skupper/pkg/images"
-	"github.com/skupperproject/skupper/pkg/utils"
 	"gotest.tools/v3/assert"
 	"k8s.io/apimachinery/pkg/util/rand"
 )
diff --git a/internal/nonkube/client/compat/rest_test.go b/internal/nonkube/client/compat/rest_test.go
index 73a51be4..7e5202d9 100644
--- a/internal/nonkube/client/compat/rest_test.go
+++ b/internal/nonkube/client/compat/rest_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/skupperproject/skupper/pkg/utils"
+	"github.com/skupperproject/skupper/internal/utils"
 	"gotest.tools/v3/assert"
 )
 
diff --git a/pkg/qdr/qdr.go b/internal/qdr/qdr.go
similarity index 100%
rename from pkg/qdr/qdr.go
rename to internal/qdr/qdr.go
diff --git a/pkg/qdr/qdr_test.go b/internal/qdr/qdr_test.go
similarity index 99%
rename from pkg/qdr/qdr_test.go
rename to internal/qdr/qdr_test.go
index 801b50c3..a998a8e8 100644
--- a/pkg/qdr/qdr_test.go
+++ b/internal/qdr/qdr_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/skupperproject/skupper/api/types"
-	"github.com/skupperproject/skupper/pkg/utils"
+	"github.com/skupperproject/skupper/internal/utils"
 	"gotest.tools/v3/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/site/bindings_test.go b/internal/site/bindings_test.go
similarity index 99%
rename from pkg/site/bindings_test.go
rename to internal/site/bindings_test.go
index f33f5562..fd4b75de 100644
--- a/pkg/site/bindings_test.go
+++ b/internal/site/bindings_test.go
@@ -3,8 +3,8 @@ package site
 import (
 	"testing"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 	"gotest.tools/v3/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/site/connector_test.go b/internal/site/connector_test.go
similarity index 97%
rename from pkg/site/connector_test.go
rename to internal/site/connector_test.go
index afa9000a..da323778 100644
--- a/pkg/site/connector_test.go
+++ b/internal/site/connector_test.go
@@ -3,8 +3,8 @@ package site
 import (
 	"testing"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 	"gotest.tools/v3/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/site/link_test.go b/internal/site/link_test.go
similarity index 99%
rename from pkg/site/link_test.go
rename to internal/site/link_test.go
index ecf0925c..959a7701 100644
--- a/pkg/site/link_test.go
+++ b/internal/site/link_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 	"gotest.tools/v3/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/site/listener_test.go b/internal/site/listener_test.go
similarity index 97%
rename from pkg/site/listener_test.go
rename to internal/site/listener_test.go
index e93aa872..56857f74 100644
--- a/pkg/site/listener_test.go
+++ b/internal/site/listener_test.go
@@ -3,8 +3,8 @@ package site
 import (
 	"testing"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 	"gotest.tools/v3/assert"
 
 	//	v1 "k8s.io/client-go/applyconfigurations/meta/v1"
diff --git a/pkg/site/routeraccess_test.go b/internal/site/routeraccess_test.go
similarity index 99%
rename from pkg/site/routeraccess_test.go
rename to internal/site/routeraccess_test.go
index b1143fba..bd708608 100644
--- a/pkg/site/routeraccess_test.go
+++ b/internal/site/routeraccess_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/skupperproject/skupper/internal/qdr"
 	skupperv2alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/qdr"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/pkg/utils/configs/manifest_test.go b/internal/utils/configs/manifest_test.go
similarity index 98%
rename from pkg/utils/configs/manifest_test.go
rename to internal/utils/configs/manifest_test.go
index db2d10d9..fabf30e2 100644
--- a/pkg/utils/configs/manifest_test.go
+++ b/internal/utils/configs/manifest_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/skupperproject/skupper/pkg/images"
+	"github.com/skupperproject/skupper/internal/images"
 	"gotest.tools/v3/assert"
 )
 
diff --git a/pkg/utils/retry.go b/internal/utils/retry.go
similarity index 100%
rename from pkg/utils/retry.go
rename to internal/utils/retry.go
diff --git a/pkg/utils/retry_test.go b/internal/utils/retry_test.go
similarity index 100%
rename from pkg/utils/retry_test.go
rename to internal/utils/retry_test.go
diff --git a/pkg/utils/tcp.go b/internal/utils/tcp.go
similarity index 100%
rename from pkg/utils/tcp.go
rename to internal/utils/tcp.go
diff --git a/pkg/utils/tcp_test.go b/internal/utils/tcp_test.go
similarity index 100%
rename from pkg/utils/tcp_test.go
rename to internal/utils/tcp_test.go
diff --git a/pkg/utils/tlscfg/tls.go b/internal/utils/tlscfg/tls.go
similarity index 100%
rename from pkg/utils/tlscfg/tls.go
rename to internal/utils/tlscfg/tls.go
diff --git a/pkg/utils/utils.go b/internal/utils/utils.go
similarity index 100%
rename from pkg/utils/utils.go
rename to internal/utils/utils.go
diff --git a/pkg/utils/utils_test.go b/internal/utils/utils_test.go
similarity index 100%
rename from pkg/utils/utils_test.go
rename to internal/utils/utils_test.go
diff --git a/pkg/utils/validator/simple_validator.go b/internal/utils/validator/simple_validator.go
similarity index 100%
rename from pkg/utils/validator/simple_validator.go
rename to internal/utils/validator/simple_validator.go
diff --git a/pkg/utils/validator/simple_validator_test.go b/internal/utils/validator/simple_validator_test.go
similarity index 100%
rename from pkg/utils/validator/simple_validator_test.go
rename to internal/utils/validator/simple_validator_test.go
diff --git a/pkg/utils/version.go b/internal/utils/version.go
similarity index 100%
rename from pkg/utils/version.go
rename to internal/utils/version.go
diff --git a/pkg/utils/version_test.go b/internal/utils/version_test.go
similarity index 100%
rename from pkg/utils/version_test.go
rename to internal/utils/version_test.go
diff --git a/pkg/version/version.go b/internal/version/version.go
similarity index 100%
rename from pkg/version/version.go
rename to internal/version/version.go
diff --git a/pkg/fs/watcher_test.go b/pkg/fs/watcher_test.go
index c0f7250e..e62e6aa5 100644
--- a/pkg/fs/watcher_test.go
+++ b/pkg/fs/watcher_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/skupperproject/skupper/pkg/utils"
+	"github.com/skupperproject/skupper/internal/utils"
 	"gotest.tools/v3/assert"
 )
 
diff --git a/pkg/nonkube/api/token_test.go b/pkg/nonkube/api/token_test.go
index fa371f5e..eb6e65fc 100644
--- a/pkg/nonkube/api/token_test.go
+++ b/pkg/nonkube/api/token_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/skupperproject/skupper/internal/certs"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/certs"
 	"gotest.tools/v3/assert"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/nonkube/common/fs_config_renderer_test.go b/pkg/nonkube/common/fs_config_renderer_test.go
index 3379e2a6..75fd7813 100644
--- a/pkg/nonkube/common/fs_config_renderer_test.go
+++ b/pkg/nonkube/common/fs_config_renderer_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/skupperproject/skupper/api/types"
+	"github.com/skupperproject/skupper/internal/certs"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v2alpha1"
-	"github.com/skupperproject/skupper/pkg/certs"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
 	"gotest.tools/v3/assert"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/nonkube/common/systemd_test.go b/pkg/nonkube/common/systemd_test.go
index 65c75d77..2fe5df1e 100644
--- a/pkg/nonkube/common/systemd_test.go
+++ b/pkg/nonkube/common/systemd_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/skupperproject/skupper/internal/utils"
 	"github.com/skupperproject/skupper/pkg/nonkube/api"
-	"github.com/skupperproject/skupper/pkg/utils"
 	"gotest.tools/v3/assert"
 )