From f2769066ca5270dac86367854e6ec3c041337992 Mon Sep 17 00:00:00 2001 From: Tuna Date: Fri, 19 Aug 2016 19:43:34 +0700 Subject: [PATCH] only print warning and keep deleting objects --- cli/app/app.go | 12 ---- cli/command/command.go | 5 -- pkg/transformer/kubernetes/kubernetes.go | 75 +++--------------------- 3 files changed, 8 insertions(+), 84 deletions(-) diff --git a/cli/app/app.go b/cli/app/app.go index b3eed701..a6426f26 100644 --- a/cli/app/app.go +++ b/cli/app/app.go @@ -239,18 +239,6 @@ func Down(c *cli.Context) { validateFlags(opt, false, dabFile, inputFile) - if c.BoolT("all") { - if len(file) > 0 && file != "docker-compose.yml" { - logrus.Fatalf("Error: --file/--bundle and --all cannot be specified at the same time") - } - fmt.Print("Are you sure? (yes/no): ") - if !askForConfirmation() { - return - } - kubernetes.DeleteAll(client) - return - } - // loader parses input from file into komposeObject. var l loader.Loader switch inputFormat { diff --git a/cli/command/command.go b/cli/command/command.go index 594a68fc..88b497e1 100644 --- a/cli/command/command.go +++ b/cli/command/command.go @@ -129,11 +129,6 @@ func DownCommand() cli.Command { Usage: "Specify a Distributed Application Bundle (DAB) file", EnvVar: "DAB_FILE", }, - cli.BoolFlag{ - Name: "all, a", - Usage: "Delete all resources in default namespace of the kubernetes cluster", - EnvVar: "DOWN_ALL", - }, }, } } diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 69009d53..d8e2abda 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -302,85 +302,26 @@ func DeleteObjects(client *client.Client, name string) { //delete svc rpService, err := kubectl.ReaperFor(api.Kind("Service"), client) if err != nil { - logrus.Fatalf("Error: '%v' while getting reaper for service", err) + logrus.Warningf("Can't get reaper for service due to '%v'", err) } //FIXME: timeout = 300s, gracePeriod is nil err = rpService.Stop(api.NamespaceDefault, name, 300*time.Second, nil) if err != nil { - logrus.Fatalf("Error: '%v' while deleting service: %s", err, name) + logrus.Warningf("Can't delete service: %s due to '%v'", name, err) + } else { + logrus.Infof("Successfully deleted service: %s", name) } - logrus.Infof("Successfully deleted service: %s", name) //delete deployment rpDeployment, err := kubectl.ReaperFor(extensions.Kind("Deployment"), client) if err != nil { - logrus.Fatalf("Error: '%v' while getting reaper for deployment", err) + logrus.Warningf("Can't get reaper for deployment due to '%v'", err) } //FIXME: timeout = 300s, gracePeriod is nil err = rpDeployment.Stop(api.NamespaceDefault, name, 300*time.Second, nil) if err != nil { - logrus.Fatalf("Error: '%v' while deleting deployment: %s", err, name) + logrus.Warningf("Can't delete deployment: %s due to '%v'", name, err) + } else { + logrus.Infof("Successfully deleted deployment: %s", name) } - logrus.Infof("Successfully deleted deployment: %s", name) -} - -func DeleteAll(client *client.Client) { - //delete all svc - rpService, err := kubectl.ReaperFor(api.Kind("Service"), client) - if err != nil { - logrus.Fatalf("Error: '%v' while getting reaper for service", err) - } - listOpts := api.ListOptions{} - svcs, err := client.Services(api.NamespaceDefault).List(listOpts) - if err != nil { - logrus.Fatalf("Error: '%v' while listing services in the cluster", err) - } - for _, svc := range svcs.Items { - if svc.Name == "kubernetes" { - continue - } - err = rpService.Stop(api.NamespaceDefault, svc.Name, 300*time.Second, nil) - if err != nil { - logrus.Fatalf("Error: '%v' while deleting service: %s", err, svc.Name) - } - logrus.Infof("Successfully deleted service: %s", svc.Name) - } - - //delete all deployment - rpDeployment, err := kubectl.ReaperFor(extensions.Kind("Deployment"), client) - if err != nil { - logrus.Fatalf("Error: '%v' while getting reaper for deployment", err) - } - deployments, err := client.Deployments(api.NamespaceDefault).List(listOpts) - if err != nil { - logrus.Fatalf("Error: '%v' while listing deployments in the cluster", err) - } - //FIXME: timeout = 300s, gracePeriod is nil - for _, deployment := range deployments.Items { - err = rpDeployment.Stop(api.NamespaceDefault, deployment.Name, 300*time.Second, nil) - if err != nil { - logrus.Fatalf("Error: '%v' while deleting deployment: %s", err, deployment.Name) - } - logrus.Infof("Successfully deleted deployment: %s", deployment.Name) - } - - //delete all daemonset - rpDaemonSet, err := kubectl.ReaperFor(extensions.Kind("DaemonSet"), client) - if err != nil { - logrus.Fatalf("Error: '%v' while getting reaper for daemonset", err) - } - daemonsets, err := client.DaemonSets(api.NamespaceDefault).List(listOpts) - if err != nil { - logrus.Fatalf("Error: '%v' while listing daemonsets in the cluster", err) - } - //FIXME: timeout = 300s, gracePeriod is nil - for _, daemonset := range daemonsets.Items { - err = rpDaemonSet.Stop(api.NamespaceDefault, daemonset.Name, 300*time.Second, nil) - if err != nil { - logrus.Fatalf("Error: '%v' while deleting daemonset: %s", err, daemonset.Name) - } - logrus.Infof("Successfully deleted daemonset: %s", daemonset.Name) - } - - //TODO: delete all jobs }