Skip to content

chore: cleanup default namespace deployment #7148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions integration/deploy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ func TestDeployTailDefaultNamespace(t *testing.T) {
// `--default-repo=` is used to cancel the default repo that is set by default.
out := skaffold.Deploy("--tail", "--images", "busybox:latest", "--default-repo=").InDir("testdata/deploy-hello-tail").RunLive(t)

defer skaffold.Delete().InDir("testdata/deploy-hello-tail").RunBackground(t)
WaitForLogs(t, out, "Hello world!")
}

Expand Down
2 changes: 1 addition & 1 deletion integration/dev_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func TestDevPortForwardDefaultNamespace(t *testing.T) {

rpcAddr := randomPort()
skaffold.Dev("--status-check=false", "--port-forward", "--rpc-port", rpcAddr).InDir("examples/microservices").RunBackground(t)

defer skaffold.Delete().InDir("examples/microservices").RunBackground(t)
_, entries := apiEvents(t, rpcAddr)

// No namespace was provided to `skaffold dev`, so we assume "default"
Expand Down
4 changes: 1 addition & 3 deletions integration/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,8 @@ func TestRunTailDefaultNamespace(t *testing.T) {

args := append(test.args, "--tail")
out := skaffold.Run(args...).InDir(test.dir).WithEnv(test.env).RunLive(t)

defer skaffold.Delete().InDir(test.dir).WithEnv(test.env).RunOrFail(t)
WaitForLogs(t, out, test.targetLog)

skaffold.Delete().InDir(test.dir).WithEnv(test.env).RunOrFail(t)
})
}
}
Expand Down
1 change: 1 addition & 0 deletions integration/sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ func TestDevSyncDefaultNamespace(t *testing.T) {
_, client := DefaultNamespace(t)

skaffold.Dev("--trigger", test.trigger).InDir("testdata/file-sync").WithConfig(test.config).RunBackground(t)
defer skaffold.Delete().InDir("testdata/file-sync").WithConfig(test.config).RunBackground(t)

client.WaitForPodsReady("test-file-sync")

Expand Down