From c37fe642adfccedc83d1a95bdb54a79bf50f11f1 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 18 Oct 2026 10:11:03 -0600 Subject: [PATCH] refactor(pro): split start command by concern --- cmd/pro/start.go | 185 +-------------------------------- cmd/pro/start_uninstall.go | 208 +++++++++++++++++++++++++++++++++++++ 2 files changed, 210 insertions(+), 183 deletions(-) create mode 100644 cmd/pro/start_uninstall.go diff --git a/cmd/pro/start.go b/cmd/pro/start.go index 40fdbf28c9..87a2f8cece 100644 --- a/cmd/pro/start.go +++ b/cmd/pro/start.go @@ -38,7 +38,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" "k8s.io/kubectl/pkg/util/term" ) @@ -154,8 +153,7 @@ func (cmd *StartCmd) prepareKubernetes(ctx context.Context) (bool, error) { ctx, cmd.KubeClient, cmd.RestConfig, - cmd.Context, - cmd.Namespace, + uninstallTarget{kubeContext: cmd.Context, namespace: cmd.Namespace}, ) if err != nil { return false, err @@ -576,8 +574,7 @@ func (cmd *StartCmd) prepareInstall(ctx context.Context) error { ctx, cmd.KubeClient, cmd.RestConfig, - cmd.Context, - cmd.Namespace, + uninstallTarget{kubeContext: cmd.Context, namespace: cmd.Namespace}, ) } @@ -1082,155 +1079,6 @@ func (cmd *StartCmd) isLoggedIn(url string) bool { ) } -func uninstall( - ctx context.Context, - kubeClient kubernetes.Interface, - restConfig *rest.Config, - kubeContext, namespace string, -) error { - if err := runHelmUninstall(ctx, kubeClient, kubeContext, namespace); err != nil { - return err - } - - if err := cleanupProResources(ctx, kubeClient, restConfig, namespace); err != nil { - return err - } - - fmt.Fprint(os.Stderr, "\n") - log.Info("uninstalled Devsy Pro") - fmt.Fprint(os.Stderr, "\n") - - return nil -} - -func runHelmUninstall( - ctx context.Context, - kubeClient kubernetes.Interface, - kubeContext, namespace string, -) error { - releaseName, err := resolveReleaseName(ctx, kubeClient, namespace) - if err != nil { - return err - } - - args := []string{ - "uninstall", - releaseName, - "--kube-context", - kubeContext, - "--namespace", - namespace, - } - log.Infof("Executing command: helm %s", strings.Join(args, " ")) - helmCmd := exec.CommandContext(ctx, "helm", args...) // #nosec G204 -- internally constructed - output, err := helmCmd.CombinedOutput() - if err != nil { - log.Errorf("error during helm command: %s (%v)", string(output), err) - } - - return nil -} - -func cleanupProResources( - ctx context.Context, - kubeClient kubernetes.Interface, - restConfig *rest.Config, - namespace string, -) error { - apiRegistrationClient, err := clientset.NewForConfig(restConfig) - if err != nil { - return err - } - - err = deleteIgnoreNotFound(func() error { - return apiRegistrationClient.ApiregistrationV1(). - APIServices(). - Delete(ctx, "v1.management.devsy.sh", metav1.DeleteOptions{}) - }) - if err != nil { - return err - } - - if err := deleteUser(ctx, restConfig, "admin"); err != nil { - return err - } - - return deleteRemainingAgentResources(ctx, kubeClient, apiRegistrationClient, namespace) -} - -func deleteRemainingAgentResources( - ctx context.Context, - kubeClient kubernetes.Interface, - apiRegistrationClient *clientset.Clientset, - namespace string, -) error { - return deleteIgnoreNotFound( - func() error { - return kubeClient.CoreV1(). - Secrets(namespace). - Delete(ctx, "loft-user-secret-admin", metav1.DeleteOptions{}) - }, - func() error { - return kubeClient.CoreV1(). - Secrets(namespace). - Delete(ctx, LoftRouterDomainSecret, metav1.DeleteOptions{}) - }, - func() error { - return kubeClient.AdmissionregistrationV1(). - ValidatingWebhookConfigurations(). - Delete(ctx, "loft-agent", metav1.DeleteOptions{}) - }, - func() error { - return apiRegistrationClient.ApiregistrationV1(). - APIServices(). - Delete(ctx, "v1alpha1.tenancy.kiosk.sh", metav1.DeleteOptions{}) - }, - func() error { - return apiRegistrationClient.ApiregistrationV1(). - APIServices(). - Delete(ctx, "v1.cluster.devsy.sh", metav1.DeleteOptions{}) - }, - func() error { - return kubeClient.CoreV1(). - ConfigMaps(namespace). - Delete(ctx, "loft-agent-controller", metav1.DeleteOptions{}) - }, - func() error { - return kubeClient.CoreV1(). - ConfigMaps(namespace). - Delete(ctx, "loft-applied-defaults", metav1.DeleteOptions{}) - }, - ) -} - -func resolveReleaseName( - ctx context.Context, - kubeClient kubernetes.Interface, - namespace string, -) (string, error) { - releaseName := config.ProReleaseName - deploy, err := kubeClient.AppsV1(). - Deployments(namespace). - Get(ctx, defaultDeploymentName, metav1.GetOptions{}) - if err != nil && !kerrors.IsNotFound(err) { - return "", err - } else if deploy != nil && deploy.Labels != nil && deploy.Labels["release"] != "" { - releaseName = deploy.Labels["release"] - } - - return releaseName, nil -} - -func deleteIgnoreNotFound(deletes ...func() error) error { - for _, del := range deletes { - if err := del(); err != nil && !kerrors.IsNotFound(err) { - return err - } - } - - return nil -} - func isAlreadyInstalled( ctx context.Context, kubeClient kubernetes.Interface, @@ -1428,35 +1276,6 @@ func labelIngressSecret( return nil } -func deleteUser(ctx context.Context, restConfig *rest.Config, name string) error { - loftClient, err := loftclientset.NewForConfig(restConfig) - if err != nil { - return err - } - - user, err := loftClient.StorageV1().Users().Get(ctx, name, metav1.GetOptions{}) - if err != nil { - return nil - } else if len(user.Finalizers) > 0 { - user.Finalizers = nil - _, err = loftClient.StorageV1().Users().Update(ctx, user, metav1.UpdateOptions{}) - if err != nil { - if kerrors.IsConflict(err) { - return deleteUser(ctx, restConfig, name) - } - - return err - } - } - - err = loftClient.StorageV1().Users().Delete(ctx, name, metav1.DeleteOptions{}) - if err != nil && !kerrors.IsNotFound(err) { - return err - } - - return nil -} - func ensureAdminPassword( ctx context.Context, kubeClient kubernetes.Interface, diff --git a/cmd/pro/start_uninstall.go b/cmd/pro/start_uninstall.go new file mode 100644 index 0000000000..11761fb52f --- /dev/null +++ b/cmd/pro/start_uninstall.go @@ -0,0 +1,208 @@ +package pro + +import ( + "context" + "fmt" + "os" + "os/exec" + "strings" + + loftclientset "github.com/devsy-org/api/pkg/clientset/versioned" + "github.com/devsy-org/devsy/pkg/config" + "github.com/devsy-org/devsy/pkg/log" + kerrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" +) + +// uninstallTarget identifies the kube context and namespace Devsy Pro is installed in. +type uninstallTarget struct { + kubeContext string + namespace string +} + +// Helm flags used when uninstalling Devsy Pro. +const ( + helmKubeContextFlag = "--kube-context" + helmNamespaceFlag = "--namespace" +) + +func uninstall( + ctx context.Context, + kubeClient kubernetes.Interface, + restConfig *rest.Config, + target uninstallTarget, +) error { + if err := runHelmUninstall(ctx, kubeClient, target.kubeContext, target.namespace); err != nil { + return err + } + + if err := cleanupProResources(ctx, kubeClient, restConfig, target.namespace); err != nil { + return err + } + + fmt.Fprint(os.Stderr, "\n") + log.Info("uninstalled Devsy Pro") + fmt.Fprint(os.Stderr, "\n") + + return nil +} + +func runHelmUninstall( + ctx context.Context, + kubeClient kubernetes.Interface, + kubeContext, namespace string, +) error { + releaseName, err := resolveReleaseName(ctx, kubeClient, namespace) + if err != nil { + return err + } + + args := []string{ + "uninstall", + releaseName, + helmKubeContextFlag, + kubeContext, + helmNamespaceFlag, + namespace, + } + log.Infof("Executing command: helm %s", strings.Join(args, " ")) + helmCmd := exec.CommandContext(ctx, "helm", args...) // #nosec G204 -- internally constructed + output, err := helmCmd.CombinedOutput() + if err != nil { + log.Errorf("error during helm command: %s (%v)", string(output), err) + } + + return nil +} + +func cleanupProResources( + ctx context.Context, + kubeClient kubernetes.Interface, + restConfig *rest.Config, + namespace string, +) error { + apiRegistrationClient, err := clientset.NewForConfig(restConfig) + if err != nil { + return err + } + + err = deleteIgnoreNotFound(func() error { + return apiRegistrationClient.ApiregistrationV1(). + APIServices(). + Delete(ctx, "v1.management.devsy.sh", metav1.DeleteOptions{}) + }) + if err != nil { + return err + } + + if err := deleteUser(ctx, restConfig, "admin"); err != nil { + return err + } + + return deleteRemainingAgentResources(ctx, kubeClient, apiRegistrationClient, namespace) +} + +func deleteRemainingAgentResources( + ctx context.Context, + kubeClient kubernetes.Interface, + apiRegistrationClient *clientset.Clientset, + namespace string, +) error { + return deleteIgnoreNotFound( + func() error { + return kubeClient.CoreV1(). + Secrets(namespace). + Delete(ctx, "loft-user-secret-admin", metav1.DeleteOptions{}) + }, + func() error { + return kubeClient.CoreV1(). + Secrets(namespace). + Delete(ctx, LoftRouterDomainSecret, metav1.DeleteOptions{}) + }, + func() error { + return kubeClient.AdmissionregistrationV1(). + ValidatingWebhookConfigurations(). + Delete(ctx, "loft-agent", metav1.DeleteOptions{}) + }, + func() error { + return apiRegistrationClient.ApiregistrationV1(). + APIServices(). + Delete(ctx, "v1alpha1.tenancy.kiosk.sh", metav1.DeleteOptions{}) + }, + func() error { + return apiRegistrationClient.ApiregistrationV1(). + APIServices(). + Delete(ctx, "v1.cluster.devsy.sh", metav1.DeleteOptions{}) + }, + func() error { + return kubeClient.CoreV1(). + ConfigMaps(namespace). + Delete(ctx, "loft-agent-controller", metav1.DeleteOptions{}) + }, + func() error { + return kubeClient.CoreV1(). + ConfigMaps(namespace). + Delete(ctx, "loft-applied-defaults", metav1.DeleteOptions{}) + }, + ) +} + +func resolveReleaseName( + ctx context.Context, + kubeClient kubernetes.Interface, + namespace string, +) (string, error) { + releaseName := config.ProReleaseName + deploy, err := kubeClient.AppsV1(). + Deployments(namespace). + Get(ctx, defaultDeploymentName, metav1.GetOptions{}) + if err != nil && !kerrors.IsNotFound(err) { + return "", err + } else if deploy != nil && deploy.Labels != nil && deploy.Labels["release"] != "" { + releaseName = deploy.Labels["release"] + } + + return releaseName, nil +} + +func deleteIgnoreNotFound(deletes ...func() error) error { + for _, del := range deletes { + if err := del(); err != nil && !kerrors.IsNotFound(err) { + return err + } + } + + return nil +} + +func deleteUser(ctx context.Context, restConfig *rest.Config, name string) error { + loftClient, err := loftclientset.NewForConfig(restConfig) + if err != nil { + return err + } + + user, err := loftClient.StorageV1().Users().Get(ctx, name, metav1.GetOptions{}) + if err != nil { + return nil + } else if len(user.Finalizers) > 0 { + user.Finalizers = nil + _, err = loftClient.StorageV1().Users().Update(ctx, user, metav1.UpdateOptions{}) + if err != nil { + if kerrors.IsConflict(err) { + return deleteUser(ctx, restConfig, name) + } + + return err + } + } + + err = loftClient.StorageV1().Users().Delete(ctx, name, metav1.DeleteOptions{}) + if err != nil && !kerrors.IsNotFound(err) { + return err + } + + return nil +}