kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103507 from CaoDonghui123/updateurl 

update  kubectl url

Kubernetes-commit: ec39cc2eafffa51b3267e3bd64fbd2598c0db94d
This commit is contained in:
Kubernetes Publisher 2021-07-06 23:56:43 -07:00
parent a8d330c2e8 b709633a6c
commit 193197bcab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cmd/apply/apply.go
View File

@ -460,7 +460,7 @@ are the ways you can resolve this warning:
* You may co-own fields by updating your manifest to match the existing * You may co-own fields by updating your manifest to match the existing
value; in this case, you'll become the manager if the other manager(s) value; in this case, you'll become the manager if the other manager(s)
stop managing the field (remove it from their configuration). stop managing the field (remove it from their configuration).
See http://k8s.io/docs/reference/using-api/server-side-apply/#conflicts`, err) See https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts`, err)
} }
return err return err
} }

2
pkg/cmd/get/get_flags.go
View File

@ -161,7 +161,7 @@ func (f *PrintFlags) AddFlags(cmd *cobra.Command) {
f.CustomColumnsFlags.AddFlags(cmd) f.CustomColumnsFlags.AddFlags(cmd)
if f.OutputFormat != nil { if f.OutputFormat != nil {
cmd.Flags().StringVarP(f.OutputFormat, "output", "o", *f.OutputFormat, fmt.Sprintf("Output format. One of: %s See custom columns [http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns], golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://kubernetes.io/docs/user-guide/jsonpath].", strings.Join(f.AllowedFormats(), "|"))) cmd.Flags().StringVarP(f.OutputFormat, "output", "o", *f.OutputFormat, fmt.Sprintf("Output format. One of: %s See custom columns [https://kubernetes.io/docs/reference/kubectl/overview/#custom-columns], golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [https://kubernetes.io/docs/reference/kubectl/jsonpath/].", strings.Join(f.AllowedFormats(), "|")))
} }
if f.NoHeaders != nil { if f.NoHeaders != nil {
cmd.Flags().BoolVar(f.NoHeaders, "no-headers", *f.NoHeaders, "When using the default or custom-column output format, don't print headers (default print headers).") cmd.Flags().BoolVar(f.NoHeaders, "no-headers", *f.NoHeaders, "When using the default or custom-column output format, don't print headers (default print headers).")