liqoctl uninstall: add uninstallation check

Author: giorio94

cmd/liqoctl/cmd/peer.go

@@ -170,6 +170,7 @@ func newPeerInBandCommand(ctx context.Context, peerOptions *peer.Options) *cobra
 		Aliases: []string{"ib"},
 		Short:   "Enable an in-band peering towards a remote cluster",
 		Long:    WithTemplate(liqoctlPeerIBLongHelp),
+		Args:    cobra.NoArgs,
 
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			twoClustersPersistentPreRun(cmd, local, remote, factory.WithScopedPrinter)

cmd/liqoctl/cmd/uninstall.go

@@ -47,6 +47,7 @@ func newUninstallCommand(ctx context.Context, f *factory.Factory) *cobra.Command
 		Use:   "uninstall",
 		Short: "Uninstall Liqo from the selected cluster",
 		Long:  WithTemplate(liqoctlUninstallLongHelp),
+		Args:  cobra.NoArgs,
 
 		Run: func(cmd *cobra.Command, args []string) {
 			output.ExitOnErr(options.Run(ctx))

cmd/liqoctl/cmd/unpeer.go

@@ -139,6 +139,7 @@ func newUnpeerInBandCommand(ctx context.Context, unpeerOptions *unpeeroob.Option
 		Aliases: []string{"ib"},
 		Short:   "Disable an in-band peering towards a remote cluster",
 		Long:    WithTemplate(liqoctlUnpeerIBLongHelp),
+		Args:    cobra.NoArgs,
 
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			twoClustersPersistentPreRun(cmd, local, remote, factory.WithScopedPrinter)

pkg/liqoctl/uninstall/handler.go

@@ -22,6 +22,7 @@ import (
 
 	"helm.sh/helm/v3/pkg/storage/driver"
 	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -70,6 +71,13 @@ func (o *Options) Run(ctx context.Context) error {
 		s.Fail("Error uninstalling Liqo: ", output.PrettyErr(err))
 		return err
 	}
+
+	// Ensure liqo has been correctly uninstalled before continuing, to prevent leaving leftover resources behind.
+	if err := o.checkUninstalled(ctx); err != nil {
+		s.Fail("Error uninstalling Liqo: ", output.PrettyErr(err))
+		return err
+	}
+
 	s.Success("Liqo uninstalled")
 
 	if o.Purge {
@@ -92,6 +100,19 @@ func (o *Options) Run(ctx context.Context) error {
 	return nil
 }
 
+func (o *Options) checkUninstalled(ctx context.Context) error {
+	var clusterRoles rbacv1.ClusterRoleList
+	if err := o.CRClient.List(ctx, &clusterRoles, client.MatchingLabels{"app.kubernetes.io/part-of": install.LiqoReleaseName}); err != nil {
+		return fmt.Errorf("failed checking whether cluster-wide resources have been removed: %w", err)
+	}
+
+	if len(clusterRoles.Items) > 0 {
+		return errors.New("cluster-wide resources are still present - did you specify the right namespace?")
+	}
+
+	return nil
+}
+
 func (o *Options) purge(ctx context.Context) error {
 	for _, groupVersion := range liqoGroupVersions {
 		res, err := o.KubeClient.Discovery().ServerResourcesForGroupVersion(groupVersion.String())