From 9dc072d0080010e8e10be10a44539d9b2925c7a1 Mon Sep 17 00:00:00 2001 From: Eitan Yarmush Date: Sun, 8 Nov 2026 13:59:17 +0000 Subject: [PATCH] Move the installer to pkg/kagent/install kagent imports the installer, so it can't stay under cmd/kubectl-ate/internal. microvmassets moves with it. Fork-only packages live under pkg/kagent so upstream can't add a package at the same path. Signed-off-by: Eitan Yarmush --- cmd/kubectl-ate/internal/cmd/install.go | 4 ++-- manifests/ate-install/sandboxconfig-microvm.yaml.tmpl | 2 +- {cmd/kubectl-ate/internal => pkg/kagent}/install/bootstrap.go | 0 {cmd/kubectl-ate/internal => pkg/kagent}/install/config.go | 0 .../internal => pkg/kagent}/install/config_test.go | 0 {cmd/kubectl-ate/internal => pkg/kagent}/install/helm.go | 0 .../internal => pkg/kagent}/install/install_test.go | 0 {cmd/kubectl-ate/internal => pkg/kagent}/install/installer.go | 0 {cmd/kubectl-ate/internal => pkg/kagent}/install/microvm.go | 2 +- {cmd/kubectl-ate/internal => pkg/kagent}/install/postgres.go | 0 {cmd/kubectl-ate/internal => pkg/kagent}/install/report.go | 0 {cmd/kubectl-ate/internal => pkg/kagent}/install/status.go | 0 {cmd/kubectl-ate/internal => pkg/kagent}/install/steps.go | 0 {cmd/kubectl-ate/internal => pkg/kagent}/install/tui/tui.go | 2 +- .../internal => pkg/kagent}/install/tui/tui_test.go | 2 +- .../kubectl-ate/internal => pkg/kagent}/install/tui/wizard.go | 2 +- {cmd/kubectl-ate/internal => pkg/kagent}/install/uninstall.go | 0 .../internal => pkg/kagent}/install/uninstall_test.go | 0 {cmd/kubectl-ate/internal => pkg/kagent}/install/upgrade.go | 0 .../internal => pkg/kagent}/install/upgrade_test.go | 0 .../internal => pkg/kagent}/microvmassets/microvmassets.go | 0 .../kagent}/microvmassets/microvmassets_test.go | 0 22 files changed, 7 insertions(+), 7 deletions(-) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/bootstrap.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/config.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/config_test.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/helm.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/install_test.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/installer.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/microvm.go (99%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/postgres.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/report.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/status.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/steps.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/tui/tui.go (99%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/tui/tui_test.go (98%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/tui/wizard.go (98%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/uninstall.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/uninstall_test.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/upgrade.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/install/upgrade_test.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/microvmassets/microvmassets.go (100%) rename {cmd/kubectl-ate/internal => pkg/kagent}/microvmassets/microvmassets_test.go (100%) diff --git a/cmd/kubectl-ate/internal/cmd/install.go b/cmd/kubectl-ate/internal/cmd/install.go index 50a4739750..2b21932eec 100644 --- a/cmd/kubectl-ate/internal/cmd/install.go +++ b/cmd/kubectl-ate/internal/cmd/install.go @@ -28,8 +28,8 @@ import ( "github.com/spf13/cobra" "golang.org/x/term" - "go.ate.dev/substrate/cmd/kubectl-ate/internal/install" - "go.ate.dev/substrate/cmd/kubectl-ate/internal/install/tui" + "go.ate.dev/substrate/pkg/kagent/install" + "go.ate.dev/substrate/pkg/kagent/install/tui" ) var ( diff --git a/manifests/ate-install/sandboxconfig-microvm.yaml.tmpl b/manifests/ate-install/sandboxconfig-microvm.yaml.tmpl index f2986910c3..7361c398a5 100644 --- a/manifests/ate-install/sandboxconfig-microvm.yaml.tmpl +++ b/manifests/ate-install/sandboxconfig-microvm.yaml.tmpl @@ -32,7 +32,7 @@ # (virtio-fs RO lower + guest-tmpfs upper), so it fetches virtiofsd too. # # cmd/ate-setup/internal/steps/microvm.go and -# cmd/kubectl-ate/internal/microvmassets read the per-arch sha256 values +# pkg/kagent/microvmassets read the per-arch sha256 values # below to verify the assembled binaries and stages them at these digest-keyed # paths so newer releases do not overwrite kept versions. diff --git a/cmd/kubectl-ate/internal/install/bootstrap.go b/pkg/kagent/install/bootstrap.go similarity index 100% rename from cmd/kubectl-ate/internal/install/bootstrap.go rename to pkg/kagent/install/bootstrap.go diff --git a/cmd/kubectl-ate/internal/install/config.go b/pkg/kagent/install/config.go similarity index 100% rename from cmd/kubectl-ate/internal/install/config.go rename to pkg/kagent/install/config.go diff --git a/cmd/kubectl-ate/internal/install/config_test.go b/pkg/kagent/install/config_test.go similarity index 100% rename from cmd/kubectl-ate/internal/install/config_test.go rename to pkg/kagent/install/config_test.go diff --git a/cmd/kubectl-ate/internal/install/helm.go b/pkg/kagent/install/helm.go similarity index 100% rename from cmd/kubectl-ate/internal/install/helm.go rename to pkg/kagent/install/helm.go diff --git a/cmd/kubectl-ate/internal/install/install_test.go b/pkg/kagent/install/install_test.go similarity index 100% rename from cmd/kubectl-ate/internal/install/install_test.go rename to pkg/kagent/install/install_test.go diff --git a/cmd/kubectl-ate/internal/install/installer.go b/pkg/kagent/install/installer.go similarity index 100% rename from cmd/kubectl-ate/internal/install/installer.go rename to pkg/kagent/install/installer.go diff --git a/cmd/kubectl-ate/internal/install/microvm.go b/pkg/kagent/install/microvm.go similarity index 99% rename from cmd/kubectl-ate/internal/install/microvm.go rename to pkg/kagent/install/microvm.go index d86e68aa3d..b4d13dc24c 100644 --- a/cmd/kubectl-ate/internal/install/microvm.go +++ b/pkg/kagent/install/microvm.go @@ -37,9 +37,9 @@ import ( "sigs.k8s.io/yaml" atev1 "go.ate.dev/substrate/api/infra/k8s/ate/v1" - "go.ate.dev/substrate/cmd/kubectl-ate/internal/microvmassets" "go.ate.dev/substrate/internal/portforward" ateinstall "go.ate.dev/substrate/manifests/ate-install" + "go.ate.dev/substrate/pkg/kagent/microvmassets" "go.ate.dev/substrate/pkg/objectstorage" ) diff --git a/cmd/kubectl-ate/internal/install/postgres.go b/pkg/kagent/install/postgres.go similarity index 100% rename from cmd/kubectl-ate/internal/install/postgres.go rename to pkg/kagent/install/postgres.go diff --git a/cmd/kubectl-ate/internal/install/report.go b/pkg/kagent/install/report.go similarity index 100% rename from cmd/kubectl-ate/internal/install/report.go rename to pkg/kagent/install/report.go diff --git a/cmd/kubectl-ate/internal/install/status.go b/pkg/kagent/install/status.go similarity index 100% rename from cmd/kubectl-ate/internal/install/status.go rename to pkg/kagent/install/status.go diff --git a/cmd/kubectl-ate/internal/install/steps.go b/pkg/kagent/install/steps.go similarity index 100% rename from cmd/kubectl-ate/internal/install/steps.go rename to pkg/kagent/install/steps.go diff --git a/cmd/kubectl-ate/internal/install/tui/tui.go b/pkg/kagent/install/tui/tui.go similarity index 99% rename from cmd/kubectl-ate/internal/install/tui/tui.go rename to pkg/kagent/install/tui/tui.go index adebb80721..6ea4c79810 100644 --- a/cmd/kubectl-ate/internal/install/tui/tui.go +++ b/pkg/kagent/install/tui/tui.go @@ -25,7 +25,7 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "go.ate.dev/substrate/cmd/kubectl-ate/internal/install" + "go.ate.dev/substrate/pkg/kagent/install" ) // progressLines is how many of a running step's latest progress lines show. diff --git a/cmd/kubectl-ate/internal/install/tui/tui_test.go b/pkg/kagent/install/tui/tui_test.go similarity index 98% rename from cmd/kubectl-ate/internal/install/tui/tui_test.go rename to pkg/kagent/install/tui/tui_test.go index d0274ccf5f..84ca770fdd 100644 --- a/cmd/kubectl-ate/internal/install/tui/tui_test.go +++ b/pkg/kagent/install/tui/tui_test.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-cmp/cmp" - "go.ate.dev/substrate/cmd/kubectl-ate/internal/install" + "go.ate.dev/substrate/pkg/kagent/install" ) func TestView(t *testing.T) { diff --git a/cmd/kubectl-ate/internal/install/tui/wizard.go b/pkg/kagent/install/tui/wizard.go similarity index 98% rename from cmd/kubectl-ate/internal/install/tui/wizard.go rename to pkg/kagent/install/tui/wizard.go index f49da0995e..d169513f73 100644 --- a/cmd/kubectl-ate/internal/install/tui/wizard.go +++ b/pkg/kagent/install/tui/wizard.go @@ -23,7 +23,7 @@ import ( "github.com/charmbracelet/huh" "sigs.k8s.io/yaml" - "go.ate.dev/substrate/cmd/kubectl-ate/internal/install" + "go.ate.dev/substrate/pkg/kagent/install" ) // Wizard asks for the install choices, stores them in cfg, and prints the diff --git a/cmd/kubectl-ate/internal/install/uninstall.go b/pkg/kagent/install/uninstall.go similarity index 100% rename from cmd/kubectl-ate/internal/install/uninstall.go rename to pkg/kagent/install/uninstall.go diff --git a/cmd/kubectl-ate/internal/install/uninstall_test.go b/pkg/kagent/install/uninstall_test.go similarity index 100% rename from cmd/kubectl-ate/internal/install/uninstall_test.go rename to pkg/kagent/install/uninstall_test.go diff --git a/cmd/kubectl-ate/internal/install/upgrade.go b/pkg/kagent/install/upgrade.go similarity index 100% rename from cmd/kubectl-ate/internal/install/upgrade.go rename to pkg/kagent/install/upgrade.go diff --git a/cmd/kubectl-ate/internal/install/upgrade_test.go b/pkg/kagent/install/upgrade_test.go similarity index 100% rename from cmd/kubectl-ate/internal/install/upgrade_test.go rename to pkg/kagent/install/upgrade_test.go diff --git a/cmd/kubectl-ate/internal/microvmassets/microvmassets.go b/pkg/kagent/microvmassets/microvmassets.go similarity index 100% rename from cmd/kubectl-ate/internal/microvmassets/microvmassets.go rename to pkg/kagent/microvmassets/microvmassets.go diff --git a/cmd/kubectl-ate/internal/microvmassets/microvmassets_test.go b/pkg/kagent/microvmassets/microvmassets_test.go similarity index 100% rename from cmd/kubectl-ate/internal/microvmassets/microvmassets_test.go rename to pkg/kagent/microvmassets/microvmassets_test.go