Skip to content

Commit 7b7d274

Browse files
authored
fix: respect namespace set by user (#613)
1 parent 5de2a8d commit 7b7d274

File tree

5 files changed

+65
-159
lines changed

5 files changed

+65
-159
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
################################################################################
1717

1818
APP_NAME = kbcli
19-
VERSION ?= 0.9.0-alpha.0
19+
VERSION ?= 1.0.1-beta.0
2020
GITHUB_PROXY ?=
2121
GIT_COMMIT = $(shell git rev-list -1 HEAD)
2222
GIT_VERSION = $(shell git describe --always --abbrev=0 --tag)

docs/user_docs/cli/kbcli_cluster_create_oriol.md

Lines changed: 0 additions & 79 deletions
This file was deleted.

docs/user_docs/cli/kbcli_cluster_create_tidb.md

Lines changed: 0 additions & 75 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
title: kbcli cluster upgrade-to-v1
3+
---
4+
5+
upgrade cluster to v1 api version.
6+
7+
```
8+
kbcli cluster upgrade-to-v1 [NAME] [flags]
9+
```
10+
11+
### Examples
12+
13+
```
14+
# upgrade a v1alpha1 cluster to v1 cluster
15+
kbcli cluster upgrade-to-v1 mycluster
16+
17+
# upgrade a v1alpha1 cluster with --dry-run
18+
kbcli cluster upgrade-to-v1 mycluster --dry-run
19+
```
20+
21+
### Options
22+
23+
```
24+
--dry-run dry run mode
25+
-h, --help help for upgrade-to-v1
26+
--no-diff only print the new cluster yaml
27+
```
28+
29+
### Options inherited from parent commands
30+
31+
```
32+
--as string Username to impersonate for the operation. User could be a regular user or a service account in a namespace.
33+
--as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups.
34+
--as-uid string UID to impersonate for the operation.
35+
--cache-dir string Default cache directory (default "$HOME/.kube/cache")
36+
--certificate-authority string Path to a cert file for the certificate authority
37+
--client-certificate string Path to a client certificate file for TLS
38+
--client-key string Path to a client key file for TLS
39+
--cluster string The name of the kubeconfig cluster to use
40+
--context string The name of the kubeconfig context to use
41+
--disable-compression If true, opt-out of response compression for all requests to the server
42+
--insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
43+
--kubeconfig string Path to the kubeconfig file to use for CLI requests.
44+
--match-server-version Require server version to match client version
45+
-n, --namespace string If present, the namespace scope for this CLI request
46+
--request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0")
47+
-s, --server string The address and port of the Kubernetes API server
48+
--tls-server-name string Server name to use for server certificate validation. If it is not provided, the hostname used to contact the server is used
49+
--token string Bearer token for authentication to the API server
50+
--user string The name of the kubeconfig user to use
51+
```
52+
53+
### SEE ALSO
54+
55+
* [kbcli cluster](kbcli_cluster.md) - Cluster command.
56+
57+
#### Go Back to [CLI Overview](cli.md) Homepage.
58+

pkg/cmd/report/report.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,10 +437,12 @@ func (o *reportClusterOptions) complete(f cmdutil.Factory) error {
437437
if err := o.reportOptions.complete(f); err != nil {
438438
return err
439439
}
440-
// update namespace
441-
o.namespace, _, err = f.ToRawKubeConfigLoader().Namespace()
442-
if err != nil {
443-
return err
440+
// update namespace if not specified
441+
if o.namespace == "" {
442+
o.namespace, _, err = f.ToRawKubeConfigLoader().Namespace()
443+
if err != nil {
444+
return err
445+
}
444446
}
445447
// complete file name
446448

0 commit comments

Comments
 (0)