Skip to content
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.

Sign up for GitHub

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

feat(k8s): flag to delete block and pvc with kapsule #1020

Merged
merged 1 commit into from
May 20, 2020
Merged

feat(k8s): flag to delete block and pvc with kapsule #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions cmd/scw/testdata/test-all-usage-k8s-cluster-delete-usage.stderr.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ EXAMPLES:
scw k8s cluster delete 11111111-1111-1111-111111111111

ARGS:
cluster-id The ID of the cluster to delete
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)
cluster-id The ID of the cluster to delete
[with-additional-resources] Set true if you want to delete all volumes (including retain volume type) and loadbalancers whose name start with cluster ID
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par)

FLAGS:
-h, --help help for delete
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-k8s-version-usage.stderr.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
A version is a vanilla Kubernetes version like `x.y.z`.
A version is a vanilla Kubernetes version like `x.y.z`.
It is composed of a major version x, a minor version y and a patch version z.
Scaleway's managed Kubernetes, Kapsule, will at least support the last patch version for the last three minor release.

Expand Down
8 changes: 7 additions & 1 deletion internal/namespaces/k8s/v1/k8s_cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Please note that Kubernetes nodes cannot be accessed with ssh.
func k8sVersion() *core.Command {
return &core.Command{
Short: `A version is a Kubernetes version`,
Long: `A version is a vanilla Kubernetes version like ` + "`" + `x.y.z` + "`" + `.
Long: `A version is a vanilla Kubernetes version like ` + "`" + `x.y.z` + "`" + `.
It is composed of a major version x, a minor version y and a patch version z.
Scaleway's managed Kubernetes, Kapsule, will at least support the last patch version for the last three minor release.

Expand Down Expand Up @@ -625,6 +625,12 @@ func k8sClusterDelete() *core.Command {
Required: true,
Positional: true,
},
{
Name: "with-additional-resources",
Short: `Set true if you want to delete all volumes (including retain volume type) and loadbalancers whose name start with cluster ID`,
Required: false,
Positional: false,
},
core.RegionArgSpec(scw.RegionFrPar),
},
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
Expand Down