Skip to content

K
k3s
Commit 9a303eae authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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 ```
parents 57dddce8 b4c93145
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
pkg/generated/bindata.go
View file @ 9a303eae
...@@ -3075,18 +3075,18 @@ msgstr "Describe one or many contexts" ...@@ -3075,18 +3075,18 @@ msgstr "Describe one or many contexts"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77
#: pkg/kubectl/cmd/top_node.go:78 #: 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 "Display Resource (CPU/Memory/Storage) 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 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_pod.go#L79
#: pkg/kubectl/cmd/top_pod.go:80 #: 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 "Display Resource (CPU/Memory/Storage) usage of pods" msgstr "Display Resource (CPU/Memory) usage of pods"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43
#: pkg/kubectl/cmd/top.go:44 #: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage." msgid "Display Resource (CPU/Memory) usage."
msgstr "Display Resource (CPU/Memory/Storage) usage." msgstr "Display Resource (CPU/Memory) usage."
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49
#: pkg/kubectl/cmd/clusterinfo.go:51 #: pkg/kubectl/cmd/clusterinfo.go:51
...@@ -6551,18 +6551,18 @@ msgstr "Describe one or many contexts" ...@@ -6551,18 +6551,18 @@ msgstr "Describe one or many contexts"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77
#: pkg/kubectl/cmd/top_node.go:78 #: 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 "Display Resource (CPU/Memory/Storage) 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 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_pod.go#L79
#: pkg/kubectl/cmd/top_pod.go:80 #: 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 "Display Resource (CPU/Memory/Storage) usage of pods" msgstr "Display Resource (CPU/Memory) usage of pods"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43
#: pkg/kubectl/cmd/top.go:44 #: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage." msgid "Display Resource (CPU/Memory) usage."
msgstr "Display Resource (CPU/Memory/Storage) usage." msgstr "Display Resource (CPU/Memory) usage."
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49
#: pkg/kubectl/cmd/clusterinfo.go:51 #: pkg/kubectl/cmd/clusterinfo.go:51
...@@ -9105,15 +9105,15 @@ msgid "Describe one or many contexts" ...@@ -9105,15 +9105,15 @@ msgid "Describe one or many contexts"
msgstr "" msgstr ""
#: pkg/kubectl/cmd/top_node.go:78 #: 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 "" msgstr ""
#: pkg/kubectl/cmd/top_pod.go:80 #: 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 "" msgstr ""
#: pkg/kubectl/cmd/top.go:44 #: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage." msgid "Display Resource (CPU/Memory) usage."
msgstr "" msgstr ""
#: pkg/kubectl/cmd/clusterinfo.go:51 #: pkg/kubectl/cmd/clusterinfo.go:51
......
translations/kubectl/default/LC_MESSAGES/k8s.po
View file @ 9a303eae
...@@ -2850,18 +2850,18 @@ msgstr "Describe one or many contexts" ...@@ -2850,18 +2850,18 @@ msgstr "Describe one or many contexts"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77
#: pkg/kubectl/cmd/top_node.go:78 #: 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 "Display Resource (CPU/Memory/Storage) 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 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_pod.go#L79
#: pkg/kubectl/cmd/top_pod.go:80 #: 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 "Display Resource (CPU/Memory/Storage) usage of pods" msgstr "Display Resource (CPU/Memory) usage of pods"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43
#: pkg/kubectl/cmd/top.go:44 #: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage." msgid "Display Resource (CPU/Memory) usage."
msgstr "Display Resource (CPU/Memory/Storage) usage." msgstr "Display Resource (CPU/Memory) usage."
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49
#: pkg/kubectl/cmd/clusterinfo.go:51 #: pkg/kubectl/cmd/clusterinfo.go:51
......
translations/kubectl/en_US/LC_MESSAGES/k8s.po
View file @ 9a303eae
...@@ -2849,18 +2849,18 @@ msgstr "Describe one or many contexts" ...@@ -2849,18 +2849,18 @@ msgstr "Describe one or many contexts"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_node.go#L77
#: pkg/kubectl/cmd/top_node.go:78 #: 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 "Display Resource (CPU/Memory/Storage) 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 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top_pod.go#L79
#: pkg/kubectl/cmd/top_pod.go:80 #: 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 "Display Resource (CPU/Memory/Storage) usage of pods" msgstr "Display Resource (CPU/Memory) usage of pods"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/top.go#L43
#: pkg/kubectl/cmd/top.go:44 #: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage." msgid "Display Resource (CPU/Memory) usage."
msgstr "Display Resource (CPU/Memory/Storage) usage." msgstr "Display Resource (CPU/Memory) usage."
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49 # https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/clusterinfo.go#L49
#: pkg/kubectl/cmd/clusterinfo.go:51 #: pkg/kubectl/cmd/clusterinfo.go:51
......
translations/kubectl/template.pot
View file @ 9a303eae
...@@ -1688,15 +1688,15 @@ msgid "Describe one or many contexts" ...@@ -1688,15 +1688,15 @@ msgid "Describe one or many contexts"
msgstr "" msgstr ""
#: pkg/kubectl/cmd/top_node.go:78 #: 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 "" msgstr ""
#: pkg/kubectl/cmd/top_pod.go:80 #: 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 "" msgstr ""
#: pkg/kubectl/cmd/top.go:44 #: pkg/kubectl/cmd/top.go:44
msgid "Display Resource (CPU/Memory/Storage) usage." msgid "Display Resource (CPU/Memory) usage."
msgstr "" msgstr ""
#: pkg/kubectl/cmd/clusterinfo.go:51 #: pkg/kubectl/cmd/clusterinfo.go:51
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment