fixes #2495. Work around for #2496

GoogleContainerTools · Jul 18, 2019 · b44b88f · b44b88f
1 parent f988df5
commit b44b88f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/skaffold/app/cmd/flags.go b/cmd/skaffold/app/cmd/flags.go
@@ -66,7 +66,7 @@ var FlagRegistry = []Flag{
 		Shorthand:     "n",
 		Usage:         "Run deployments in the specified namespace",
 		Value:         &opts.Namespace,
-		DefValue:      "",
+		DefValue:      "default",
 		FlagAddMethod: "StringVar",
 		DefinedOn:     []string{"all"},
 	},
@@ -224,7 +224,7 @@ var FlagRegistry = []Flag{
 		Name:          "status-check",
 		Usage:         "Wait for deployed resources to stabilize",
 		Value:         &opts.StatusCheck,
-		DefValue:      true,
+		DefValue:      false,
 		FlagAddMethod: "BoolVar",
 		DefinedOn:     []string{"dev", "debug", "deploy", "run"},
 	},

diff --git a/integration/deploy_test.go b/integration/deploy_test.go
@@ -109,7 +109,7 @@ func TestDeployWithInCorrectConfig(t *testing.T) {
 	ns, _, deleteNs := SetupNamespace(t)
 	defer deleteNs()
 
-	err := skaffold.Deploy().InDir("testdata/unstable-deployment").InNs(ns.Name).Run(t)
+	err := skaffold.Deploy("--status-check=true").InDir("testdata/unstable-deployment").InNs(ns.Name).Run(t)
 	if err == nil {
 		t.Error("expected an error to see since the deployment is not stable. However deploy returned success")
 	}
@@ -128,7 +128,7 @@ func TestDeployWithInCorrectConfigWithNoStatusCheck(t *testing.T) {
 	ns, _, deleteNs := SetupNamespace(t)
 	defer deleteNs()
 
-	skaffold.Deploy("--status-check=false").InDir("testdata/unstable-deployment").InNs(ns.Name).RunOrFailOutput(t)
+	skaffold.Deploy().InDir("testdata/unstable-deployment").InNs(ns.Name).RunOrFailOutput(t)
 
 	skaffold.Delete().InDir("testdata/unstable-deployment").InNs(ns.Name).RunOrFail(t)
 }