Skip to content

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

Merge pull request #54987 from tengqm/scale-help

Automatic merge from submit-queue (batch tested with PRs 54987, 55221, 54099, 55144, 54215). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Scale help **What this PR does / why we need it**: The `kubectl autoscale --help` says this: ``` # Auto scale a deployment "foo", with the number of pods between 2 and 10, target CPU utilization specified so a default autoscaling policy will be used: kubectl autoscale deployment foo --min=2 --max=10 ``` This is incorrect. A default autoscaling policy will be used because *no* target CPU utilization has been specified. **Which issue(s) this PR fixes**: **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 7c8596a9 d7720ea1
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
pkg/generated/bindata.go
View file @ fc61d9bc
...@@ -383,8 +383,8 @@ msgstr "" ...@@ -383,8 +383,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
...@@ -3606,8 +3606,8 @@ msgstr "" ...@@ -3606,8 +3606,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
...@@ -3616,8 +3616,8 @@ msgid "" ...@@ -3616,8 +3616,8 @@ msgid ""
msgstr "" msgstr ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
...@@ -7083,8 +7083,8 @@ msgstr "" ...@@ -7083,8 +7083,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
...@@ -7093,8 +7093,8 @@ msgid "" ...@@ -7093,8 +7093,8 @@ msgid ""
msgstr "" msgstr ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
...@@ -10690,8 +10690,8 @@ msgstr "" ...@@ -10690,8 +10690,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
...@@ -14096,8 +14096,8 @@ msgstr "" ...@@ -14096,8 +14096,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
pkg/kubectl/cmd/autoscale.go
View file @ fc61d9bc
...@@ -38,7 +38,7 @@ var ( ...@@ -38,7 +38,7 @@ var (
An autoscaler can automatically increase or decrease number of pods deployed within the system as needed.`)) An autoscaler can automatically increase or decrease number of pods deployed within the system as needed.`))
autoscaleExample = templates.Examples(i18n.T(` autoscaleExample = templates.Examples(i18n.T(`
# Auto scale a deployment "foo", with the number of pods between 2 and 10, target CPU utilization specified so a default autoscaling policy will be used: # Auto scale a deployment "foo", with the number of pods between 2 and 10, no target CPU utilization specified so a default autoscaling policy will be used:
kubectl autoscale deployment foo --min=2 --max=10 kubectl autoscale deployment foo --min=2 --max=10
# Auto scale a replication controller "foo", with the number of pods between 1 and 5, target CPU utilization at 80%: # Auto scale a replication controller "foo", with the number of pods between 1 and 5, target CPU utilization at 80%:
......
translations/kubectl/de_DE/LC_MESSAGES/k8s.po
View file @ fc61d9bc
...@@ -154,8 +154,8 @@ msgstr "" ...@@ -154,8 +154,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
......
translations/kubectl/default/LC_MESSAGES/k8s.po
View file @ fc61d9bc
...@@ -152,8 +152,8 @@ msgstr "" ...@@ -152,8 +152,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
...@@ -162,8 +162,8 @@ msgid "" ...@@ -162,8 +162,8 @@ msgid ""
msgstr "" msgstr ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
......
translations/kubectl/en_US/LC_MESSAGES/k8s.po
View file @ fc61d9bc
...@@ -152,8 +152,8 @@ msgstr "" ...@@ -152,8 +152,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
...@@ -162,8 +162,8 @@ msgid "" ...@@ -162,8 +162,8 @@ msgid ""
msgstr "" msgstr ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
......
translations/kubectl/it_IT/LC_MESSAGES/k8s.po
View file @ fc61d9bc
...@@ -153,8 +153,8 @@ msgstr "" ...@@ -153,8 +153,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
......
translations/kubectl/template.pot
View file @ fc61d9bc
...@@ -98,8 +98,8 @@ msgstr "" ...@@ -98,8 +98,8 @@ msgstr ""
msgid "" msgid ""
"\n" "\n"
"\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and " "\t\t# Auto scale a deployment \"foo\", with the number of pods between 2 and "
"10, target CPU utilization specified so a default autoscaling policy will be " "10, no target CPU utilization specified so a default autoscaling policy will "
"used:\n" "be used:\n"
"\t\tkubectl autoscale deployment foo --min=2 --max=10\n" "\t\tkubectl autoscale deployment foo --min=2 --max=10\n"
"\n" "\n"
"\t\t# Auto scale a replication controller \"foo\", with the number of pods " "\t\t# Auto scale a replication controller \"foo\", with the number of pods "
......
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