Fix uninstall + remove left over resources after test failure #3605
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,57 +19,126 @@ package uninstall | |
| import ( | ||
| "context" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "github.com/spf13/cobra" | ||
| corev1 "k8s.io/api/core/v1" | ||
|
|
||
| // apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" | ||
| apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" | ||
| apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/labels" | ||
| kubeerrs "k8s.io/apimachinery/pkg/util/errors" | ||
| "k8s.io/apimachinery/pkg/util/wait" | ||
| "k8s.io/client-go/kubernetes" | ||
| kbclient "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
|
||
| "github.com/vmware-tanzu/velero/pkg/client" | ||
| "github.com/vmware-tanzu/velero/pkg/cmd" | ||
| "github.com/vmware-tanzu/velero/pkg/cmd/cli" | ||
| "github.com/vmware-tanzu/velero/pkg/cmd/util/output" | ||
| "github.com/vmware-tanzu/velero/pkg/install" | ||
| ) | ||
|
|
||
| // NewCommand creates a cobra command. | ||
| func NewCommand(f client.Factory) *cobra.Command { | ||
| c := &cobra.Command{ | ||
| Use: "uninstall", | ||
| Short: "Uninstall Velero", | ||
| Long: `Uninstall Velero along with the CRDs. | ||
|
|
||
| The '--namespace' flag can be used to specify the namespace where velero is installed (default: velero). | ||
| `, | ||
| Example: `# velero uninstall -n backup`, | ||
| Run: func(c *cobra.Command, args []string) { | ||
|
|
||
| if !cli.GetConfirmation() { | ||
| // Don't do anything unless we get confirmation | ||
| return | ||
| } | ||
|
|
||
| kbClient, err := f.KubebuilderClient() | ||
| cmd.CheckError(err) | ||
| cmd.CheckError(Run(kbClient, f.Namespace())) | ||
| }, | ||
| } | ||
|
|
||
| output.BindFlags(c.Flags()) | ||
| output.ClearOutputFlagDefault(c) | ||
| return c | ||
| } | ||
|
|
||
| // Run removes all components that were deployed using the Velero install command | ||
| func Run(kbClient kbclient.Client, namespace string) error { | ||
| var errs []error | ||
|
|
||
| // namespace | ||
| ns := &corev1.Namespace{} | ||
| key := kbclient.ObjectKey{Name: namespace} | ||
| if err := kbClient.Get(context.Background(), key, ns); err != nil { | ||
| if apierrors.IsNotFound(err) { | ||
| fmt.Printf("Velero installation namespace %q does not exist, skipping.\n", namespace) | ||
| } else { | ||
| errs = append(errs, errors.WithStack(err)) | ||
| } | ||
| } else { | ||
| if ns.Status.Phase == corev1.NamespaceTerminating { | ||
| fmt.Printf("Velero installation namespace %q is terminating.\n", namespace) | ||
| } else { | ||
| if err := kbClient.Delete(context.Background(), ns); err != nil { | ||
| errs = append(errs, errors.WithStack(err)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| time.Sleep(time.Second * 60) | ||
|
There was a problem hiding this comment. Using magic periods of sleep makes this very brittle. Suggest calling There was a problem hiding this comment. Yes, I not at all had the intention to leave this here :) - it needs to be user configurable. |
||
|
|
||
| // rolebinding | ||
| crb := install.ClusterRoleBinding(namespace) | ||
| key = kbclient.ObjectKey{Name: crb.Name, Namespace: namespace} | ||
| if err := kbClient.Get(context.Background(), key, crb); err != nil { | ||
| if apierrors.IsNotFound(err) { | ||
| fmt.Printf("Velero installation rolebinding %q does not exist, skipping.\n", crb.Name) | ||
| } else { | ||
| errs = append(errs, errors.WithStack(err)) | ||
| } | ||
| } else { | ||
| if err := kbClient.Delete(context.Background(), crb); err != nil { | ||
| errs = append(errs, errors.WithStack(err)) | ||
| } | ||
|
Comment on lines
+99
to
+110
There was a problem hiding this comment. Looks like we hard code the name of the cluster rolebinding to Why not simplify this to delete using the kubernetes API for cluster rolebinding instead of using the generic |
||
| } | ||
|
|
||
| // CRDs | ||
| veleroLabels := labels.FormatLabels(install.Labels()) | ||
| crdList := apiextv1beta1.CustomResourceDefinitionList{} | ||
| opts := kbclient.ListOptions{ | ||
| Namespace: namespace, | ||
| Raw: &metav1.ListOptions{ | ||
| LabelSelector: veleroLabels, | ||
| }, | ||
| } | ||
| if err := kbClient.List(context.Background(), &crdList, &opts); err != nil { | ||
| errs = append(errs, errors.WithStack(err)) | ||
| } else { | ||
| if len(crdList.Items) == 0 { | ||
| fmt.Print("Velero CRDs do not exist, skipping.\n") | ||
| } else { | ||
| for _, crd := range crdList.Items { | ||
| if err := kbClient.Delete(context.Background(), &crd); err != nil { | ||
| errs = append(errs, errors.WithStack(err)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if kubeerrs.NewAggregate(errs) != nil { | ||
| fmt.Printf("Errors while attempting to uninstall Velero: %q", kubeerrs.NewAggregate(errs)) | ||
| return kubeerrs.NewAggregate(errs) | ||
| } | ||
|
|
||
| fmt.Println("Velero uninstalled ⛵") | ||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -89,26 +158,3 @@ func DeleteNamespace(ctx context.Context, client *kubernetes.Clientset, namespac | |
| return false, nil | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This simply presents the user with
I would suggest printing a message describing the action we are attempting before calling
cli.GetConfirmationThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add a --quiet or --force option so this is scriptable
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good call, thanks.