github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #47964 from hasanatkazmi/master 

Automatic merge from submit-queue (batch tested with PRs 47918, 47964, 48151, 47881, 48299)

removed 'Storage' option from 'kubectl top' like options

**What this PR does / why we need it**:
https://github.com/kubernetes/kubectl/issues/34

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
pull/6/head
Kubernetes Submit Queue 2017-06-30 18:42:37 -07:00 committed by GitHub
parent 57dddce815 b4c9314520
commit 9a303eae7b
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/generated/bindata.go
View File

@ -3075,18 +3075,18 @@ msgstr "Describe one or many contexts"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77
#: pkg/kubectl/cmd/top_node.go:78
msgid "Display Resource (CPU/Memory/Storage) usage of nodes"
msgstr "Display Resource (CPU/Memory/Storage) usage of nodes"
msgid "Display Resource (CPU/Memory) usage of nodes"
msgstr "Display Resource (CPU/Memory) usage of nodes"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_pod.go#L79
#: pkg/kubectl/cmd/top_pod.go:80
msgid "Display Resource (CPU/Memory/Storage) usage of pods"
msgstr "Display Resource (CPU/Memory/Storage) usage of pods"
msgid "Display Resource (CPU/Memory) usage of pods"
msgstr "Display Resource (CPU/Memory) usage of pods"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43
#: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage."
msgstr "Display Resource (CPU/Memory/Storage) usage."
msgid "Display Resource (CPU/Memory) usage."
msgstr "Display Resource (CPU/Memory) usage."
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49
#: pkg/kubectl/cmd/clusterinfo.go:51
@ -6551,18 +6551,18 @@ msgstr "Describe one or many contexts"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77
#: pkg/kubectl/cmd/top_node.go:78
msgid "Display Resource (CPU/Memory/Storage) usage of nodes"
msgstr "Display Resource (CPU/Memory/Storage) usage of nodes"
msgid "Display Resource (CPU/Memory) usage of nodes"
msgstr "Display Resource (CPU/Memory) usage of nodes"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_pod.go#L79
#: pkg/kubectl/cmd/top_pod.go:80
msgid "Display Resource (CPU/Memory/Storage) usage of pods"
msgstr "Display Resource (CPU/Memory/Storage) usage of pods"
msgid "Display Resource (CPU/Memory) usage of pods"
msgstr "Display Resource (CPU/Memory) usage of pods"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43
#: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage."
msgstr "Display Resource (CPU/Memory/Storage) usage."
msgid "Display Resource (CPU/Memory) usage."
msgstr "Display Resource (CPU/Memory) usage."
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49
#: pkg/kubectl/cmd/clusterinfo.go:51
@ -9105,15 +9105,15 @@ msgid "Describe one or many contexts"
msgstr ""
#: pkg/kubectl/cmd/top_node.go:78
msgid "Display Resource (CPU/Memory/Storage) usage of nodes"
msgid "Display Resource (CPU/Memory) usage of nodes"
msgstr ""
#: pkg/kubectl/cmd/top_pod.go:80
msgid "Display Resource (CPU/Memory/Storage) usage of pods"
msgid "Display Resource (CPU/Memory) usage of pods"
msgstr ""
#: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage."
msgid "Display Resource (CPU/Memory) usage."
msgstr ""
#: pkg/kubectl/cmd/clusterinfo.go:51

12
translations/kubectl/default/LC_MESSAGES/k8s.po
View File

@ -2850,18 +2850,18 @@ msgstr "Describe one or many contexts"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77
#: pkg/kubectl/cmd/top_node.go:78
msgid "Display Resource (CPU/Memory/Storage) usage of nodes"
msgstr "Display Resource (CPU/Memory/Storage) usage of nodes"
msgid "Display Resource (CPU/Memory) usage of nodes"
msgstr "Display Resource (CPU/Memory) usage of nodes"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_pod.go#L79
#: pkg/kubectl/cmd/top_pod.go:80
msgid "Display Resource (CPU/Memory/Storage) usage of pods"
msgstr "Display Resource (CPU/Memory/Storage) usage of pods"
msgid "Display Resource (CPU/Memory) usage of pods"
msgstr "Display Resource (CPU/Memory) usage of pods"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43
#: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage."
msgstr "Display Resource (CPU/Memory/Storage) usage."
msgid "Display Resource (CPU/Memory) usage."
msgstr "Display Resource (CPU/Memory) usage."
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49
#: pkg/kubectl/cmd/clusterinfo.go:51

12
translations/kubectl/en_US/LC_MESSAGES/k8s.po
View File

@ -2849,18 +2849,18 @@ msgstr "Describe one or many contexts"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77
#: pkg/kubectl/cmd/top_node.go:78
msgid "Display Resource (CPU/Memory/Storage) usage of nodes"
msgstr "Display Resource (CPU/Memory/Storage) usage of nodes"
msgid "Display Resource (CPU/Memory) usage of nodes"
msgstr "Display Resource (CPU/Memory) usage of nodes"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_pod.go#L79
#: pkg/kubectl/cmd/top_pod.go:80
msgid "Display Resource (CPU/Memory/Storage) usage of pods"
msgstr "Display Resource (CPU/Memory/Storage) usage of pods"
msgid "Display Resource (CPU/Memory) usage of pods"
msgstr "Display Resource (CPU/Memory) usage of pods"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43
#: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage."
msgstr "Display Resource (CPU/Memory/Storage) usage."
msgid "Display Resource (CPU/Memory) usage."
msgstr "Display Resource (CPU/Memory) usage."
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49
#: pkg/kubectl/cmd/clusterinfo.go:51

6
translations/kubectl/template.pot
View File

@ -1688,15 +1688,15 @@ msgid "Describe one or many contexts"
msgstr ""
#: pkg/kubectl/cmd/top_node.go:78
msgid "Display Resource (CPU/Memory/Storage) usage of nodes"
msgid "Display Resource (CPU/Memory) usage of nodes"
msgstr ""
#: pkg/kubectl/cmd/top_pod.go:80
msgid "Display Resource (CPU/Memory/Storage) usage of pods"
msgid "Display Resource (CPU/Memory) usage of pods"
msgstr ""
#: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage."
msgid "Display Resource (CPU/Memory) usage."
msgstr ""
#: pkg/kubectl/cmd/clusterinfo.go:51