CR-6132-uninstall-force-flag (#125)

* force flag

* tested for unrecognized crd

* local mod

* making sure doesnt throw error with force flag

* removed redundnat

* tidy

* less dangerous error logs

* log suggestion in pre installation checks

* before updated autopilot

* missing codegen

* no local ap

* bump

* tidy - before merging ap

* codegen

* bin name

* with codegen

* log with bin name

Author: elad-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.119
+VERSION=v0.0.120
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/runtime.go

@@ -79,6 +79,8 @@ type (
 		CloneOpts   *git.CloneOptions
 		KubeFactory kube.Factory
 		SkipChecks  bool
+		Force       bool
+		FastExit    bool
 	}
 
 	RuntimeUpgradeOptions struct {
@@ -264,7 +266,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		RuntimeVersion: runtimeVersion,
 		IngressHost:    &opts.IngressHost,
 		ComponentNames: componentNames,
-		Repo: &opts.InsCloneOpts.Repo,
+		Repo:           &opts.InsCloneOpts.Repo,
 	})
 	if err != nil {
 		return fmt.Errorf("failed to create a new runtime: %w", err)
@@ -431,7 +433,7 @@ func checkRuntimeCollisions(ctx context.Context, runtime string, kube kube.Facto
 		return fmt.Errorf("failed to get deployment '%s': %w", store.Get().ArgoCDServerName, err)
 	}
 
-	return fmt.Errorf("argo-cd is already installed on this cluster in namespace '%s', you need to uninstall it first", subjNamespace)
+	return fmt.Errorf("argo-cd is already installed on this cluster in namespace '%s', you can uninstall it by running '%s runtime uninstall %s --skip-checks --force'", subjNamespace, store.Get().BinaryName, subjNamespace)
 }
 
 func checkExistingRuntimes(ctx context.Context, runtime string) error {
@@ -558,6 +560,8 @@ func NewRuntimeUninstallCommand() *cobra.Command {
 		skipChecks bool
 		f          kube.Factory
 		cloneOpts  *git.CloneOptions
+		force      bool
+		fastExit   bool
 	)
 
 	cmd := &cobra.Command{
@@ -597,12 +601,16 @@ func NewRuntimeUninstallCommand() *cobra.Command {
 				CloneOpts:   cloneOpts,
 				KubeFactory: f,
 				SkipChecks:  skipChecks,
+				Force:       force,
+				FastExit:    fastExit,
 			})
 		},
 	}
 
 	cmd.Flags().BoolVar(&skipChecks, "skip-checks", false, "If true, will not verify that runtime exists before uninstalling")
 	cmd.Flags().DurationVar(&store.Get().WaitTimeout, "wait-timeout", store.Get().WaitTimeout, "How long to wait for the runtime components to be deleted")
+	cmd.Flags().BoolVar(&force, "force", false, "If true, will guarantee the runtime is removed from the platform, even in case of errors while cleaning the repo and the cluster")
+	cmd.Flags().BoolVar(&fastExit, "fast-exit", false, "If true, will not wait for deletion of cluster resources. This means that full resource deletion will not be verified")
 
 	cloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{})
 	f = kube.AddFlags(cmd.Flags())
@@ -627,17 +635,32 @@ func RunRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 		Timeout:      opts.Timeout,
 		CloneOptions: opts.CloneOpts,
 		KubeFactory:  opts.KubeFactory,
+		Force:        opts.Force,
+		FastExit:     opts.FastExit,
 	}); err != nil {
-		return fmt.Errorf("failed uninstalling runtime: %w", err)
+		if !opts.Force {
+			log.G(ctx).Warn("you can attempt to uninstall again with the \"--force\" flag")
+			return err
+		}
 	}
 
-	log.G(ctx).Infof("Deleting runtime '%s' from the platform", opts.RuntimeName)
-
-	if _, err := cfConfig.NewClient().V2().Runtime().Delete(ctx, opts.RuntimeName); err != nil {
+	err := deleteRuntimeFromPlatform(ctx, opts)
+	if err != nil {
 		return fmt.Errorf("failed to delete runtime from the platform: %w", err)
 	}
-
 	log.G(ctx).Infof("Done uninstalling runtime '%s'", opts.RuntimeName)
+
+	return nil
+}
+
+func deleteRuntimeFromPlatform(ctx context.Context, opts *RuntimeUninstallOptions) error {
+	log.G(ctx).Infof("Deleting runtime '%s' from the platform", opts.RuntimeName)
+	_, err := cfConfig.NewClient().V2().Runtime().Delete(ctx, opts.RuntimeName)
+	if err != nil {
+		return err
+	}
+
+	log.G(ctx).Infof("Successfully deleted runtime '%s' from the platform", opts.RuntimeName)
 	return nil
 }
 

docs/commands/cli-v2_runtime_uninstall.md

@@ -28,6 +28,8 @@ cli-v2 runtime uninstall [runtime_name] [flags]
 ### Options
 
 ```
+      --fast-exit               If true, will not wait for deletion of cluster resources. This means that full resource deletion will not be verified
+      --force                   If true, will guarantee the runtime is removed from the platform, even in case of errors while cleaning the repo and the cluster
   -t, --git-token string        Your git provider api token [GIT_TOKEN]
   -u, --git-user string         Your git provider user name [GIT_USER] (not required in GitHub)
   -h, --help                    help for uninstall

docs/releases/release_notes.md

@@ -20,7 +20,7 @@ cf version
 ### Linux
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.119/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.120/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -32,7 +32,7 @@ cf version
 ### Mac
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.119/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.120/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

go.mod

@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/argoproj-labs/applicationset v0.2.0
-	github.com/argoproj-labs/argocd-autopilot v0.2.21
+	github.com/argoproj-labs/argocd-autopilot v0.2.22
 	github.com/argoproj/argo-cd/v2 v2.1.2
 	github.com/argoproj/argo-events v1.4.0
 	github.com/argoproj/argo-workflows/v3 v3.1.6

go.sum

@@ -172,8 +172,8 @@ github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAF
 github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk=
 github.com/argoproj-labs/applicationset v0.2.0 h1:yq3u88VtH9bXAl8DkIzBi0Q5FCe/ExZHlnGHDxxsyY4=
 github.com/argoproj-labs/applicationset v0.2.0/go.mod h1:vElTdgajynEAIRuQMqQwYWSWTbdgrQPW6zDsxNPs+NE=
-github.com/argoproj-labs/argocd-autopilot v0.2.21 h1:zMYftMCDZnmRtNmOvjUQCL2Hyfehn9KnWwB31ZoHIko=
-github.com/argoproj-labs/argocd-autopilot v0.2.21/go.mod h1:YKl9+scJtfTi4418Z4AbQrCL5FXvMByDuDNLyV4axa0=
+github.com/argoproj-labs/argocd-autopilot v0.2.22 h1:lStk1nwElB1T8YaCZm42QGmsR5eIbcGTdAzxeMzhfew=
+github.com/argoproj-labs/argocd-autopilot v0.2.22/go.mod h1:YKl9+scJtfTi4418Z4AbQrCL5FXvMByDuDNLyV4axa0=
 github.com/argoproj/argo-cd/v2 v2.1.0-rc2/go.mod h1:a21F1IEszRrCLvXXYc1sML3mjlMN3pp6rpDxy+7E0os=
 github.com/argoproj/argo-cd/v2 v2.1.0/go.mod h1:/e8fSyHanaAHLR5YsIIWfCGujTN452K6L7DaYep5KRU=
 github.com/argoproj/argo-cd/v2 v2.1.2 h1:Ls+nJQJ7HWHeg9AKtFeeUCQTsSFvzDpbZq+ALxHL680=

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.0
-  version: 0.0.119
+  version: 0.0.120
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events