Skip to content

Commit 9073cba

Browse files
committed
Implement #136, #219
1 parent 5ac4ba8 commit 9073cba

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

cmd/enter.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ func (cmd *EnterCmd) Run(cobraCmd *cobra.Command, args []string) {
6868
}
6969

7070
// Check if we find a running release pod
71+
log.StartWait("Find a running devspace pod")
7172
pod, err := getRunningDevSpacePod(cmd.helm, cmd.kubectl)
73+
log.StopWait()
7274
if err != nil {
7375
log.Fatal("Cannot find a running devspace pod")
7476
}

cmd/reset.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,15 @@ func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
7373
if cmd.kubectl == nil || cmd.helm == nil {
7474
cmd.kubectl, err = kubectl.NewClient()
7575
if err != nil {
76-
log.Failf("Failed to initialize kubectl client: ", err.Error())
76+
log.Failf("Failed to initialize kubectl client: %v", err)
7777
}
7878
}
7979
cmd.determineResetExtent()
8080

8181
if cmd.flags.deleteRelease {
82+
log.StartWait("Deleting devspace release")
8283
err = cmd.deleteRelease()
84+
log.StopWait()
8385

8486
if err != nil {
8587
log.Failf("Error deleting release: %s", err.Error())
@@ -89,7 +91,9 @@ func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
8991
}
9092

9193
if cmd.flags.deleteRegistry {
94+
log.StartWait("Deleting docker registry")
9295
err = cmd.deleteRegistry()
96+
log.StopWait()
9397

9498
if err != nil {
9599
log.Failf("Error deleting docker registry: %s", err.Error())
@@ -103,7 +107,9 @@ func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
103107
}
104108

105109
if cmd.flags.deleteTiller {
110+
log.StartWait("Deleting tiller")
106111
err = cmd.deleteTiller()
112+
log.StopWait()
107113

108114
if err != nil {
109115
log.Failf("Error deleting tiller: %s", err.Error())
@@ -148,7 +154,7 @@ func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
148154
err = cmd.deleteDevspaceFolder()
149155

150156
if err != nil {
151-
log.Failf("Error deleting .devspace folder: ", err.Error())
157+
log.Failf("Error deleting .devspace folder: %v", err)
152158

153159
if cmd.shouldContinue() == false {
154160
return
@@ -159,9 +165,12 @@ func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
159165
}
160166

161167
if cmd.flags.deleteClusterRoleBinding {
168+
log.StartWait("Deleting cluster role bindings")
162169
err = cmd.kubectl.RbacV1beta1().ClusterRoleBindings().Delete(clusterRoleBindingName, &metav1.DeleteOptions{})
170+
log.StopWait()
171+
163172
if err != nil {
164-
log.Failf("Failed to remove ClusterRoleBinding: ", err.Error())
173+
log.Failf("Failed to remove ClusterRoleBinding: %v", err)
165174
} else {
166175
log.Done("Successfully deleted ClusterRoleBinding '" + clusterRoleBindingName + "'")
167176
}

0 commit comments

Comments
 (0)