Skip to content

Commit 9e3a540

Browse files
committed
rename resize to scale
1 parent d4a47bd commit 9e3a540

39 files changed

+391
-382
lines changed

contrib/completions/bash/kubectl

+3-3
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,9 @@ _kubectl_rolling-update()
442442
must_have_one_noun=()
443443
}
444444

445-
_kubectl_resize()
445+
_kubectl_scale()
446446
{
447-
last_command="kubectl_resize"
447+
last_command="kubectl_scale"
448448
commands=()
449449

450450
flags=()
@@ -897,7 +897,7 @@ _kubectl()
897897
commands+=("namespace")
898898
commands+=("logs")
899899
commands+=("rolling-update")
900-
commands+=("resize")
900+
commands+=("scale")
901901
commands+=("exec")
902902
commands+=("port-forward")
903903
commands+=("proxy")

docs/.files_generated

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ kubectl_logs.md
2020
kubectl_namespace.md
2121
kubectl_port-forward.md
2222
kubectl_proxy.md
23-
kubectl_resize.md
2423
kubectl_rolling-update.md
2524
kubectl_run.md
25+
kubectl_scale.md
2626
kubectl_stop.md
2727
kubectl_update.md
2828
kubectl_version.md

docs/api-conventions.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ These are verbs which change the fundamental type of data returned (watch return
189189
190190
Two additional verbs `redirect` and `proxy` provide access to cluster resources as described in [accessing-the-cluster.md](accessing-the-cluster.md).
191191

192-
When resources wish to expose alternative actions that are closely coupled to a single resource, they should do so using new sub-resources. An example is allowing automated processes to update the "status" field of a Pod. The `/pods` endpoint only allows updates to "metadata" and "spec", since those reflect end-user intent. An automated process should be able to modify status for users to see by sending an updated Pod kind to the server to the "/pods/<name>/status" endpoint - the alternate endpoint allows different rules to be applied to the update, and access to be appropriately restricted. Likewise, some actions like "stop" or "resize" are best represented as REST sub-resources that are POSTed to. The POST action may require a simple kind to be provided if the action requires parameters, or function without a request body.
192+
When resources wish to expose alternative actions that are closely coupled to a single resource, they should do so using new sub-resources. An example is allowing automated processes to update the "status" field of a Pod. The `/pods` endpoint only allows updates to "metadata" and "spec", since those reflect end-user intent. An automated process should be able to modify status for users to see by sending an updated Pod kind to the server to the "/pods/<name>/status" endpoint - the alternate endpoint allows different rules to be applied to the update, and access to be appropriately restricted. Likewise, some actions like "stop" or "scale" are best represented as REST sub-resources that are POSTed to. The POST action may require a simple kind to be provided if the action requires parameters, or function without a request body.
193193

194194
TODO: more documentation of Watch
195195

docs/devel/developer-guides/vagrant.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,10 @@ myNginx nginx name=my-nginx 3
243243

244244
We did not start any services, hence there are none listed. But we see three replicas displayed properly.
245245
Check the [guestbook](../../examples/guestbook/README.md) application to learn how to create a service.
246-
You can already play with resizing the replicas with:
246+
You can already play with scaling the replicas with:
247247

248248
```sh
249-
$ ./cluster/kubectl.sh resize rc my-nginx --replicas=2
249+
$ ./cluster/kubectl.sh scale rc my-nginx --replicas=2
250250
$ ./cluster/kubectl.sh get pods
251251
NAME IMAGE(S) HOST LABELS STATUS
252252
7813c8bd-3ffe-11e4-9036-0800279696e1 nginx 10.245.2.2/10.245.2.2 name=myNginx Running

docs/getting-started-guides/coreos/azure/README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,17 @@ redis-slave-controller-gziey 10.2.1.4 slave brendanburns/redis
8888

8989
## Scaling
9090

91-
Two single-core minions are certainly not enough for a production system of today, and, as you can see, there is one _unassigned_ pod. Let's resize the cluster by adding a couple of bigger nodes.
91+
Two single-core minions are certainly not enough for a production system of today, and, as you can see, there is one _unassigned_ pod. Let's scale the cluster by adding a couple of bigger nodes.
9292

9393
You will need to open another terminal window on your machine and go to the same working directory (e.g. `~/Workspace/weave-demos/coreos-azure`).
9494

9595
First, lets set the size of new VMs:
9696
```
9797
export AZ_VM_SIZE=Large
9898
```
99-
Now, run resize script with state file of the previous deployment and number of minions to add:
99+
Now, run scale script with state file of the previous deployment and number of minions to add:
100100
```
101-
./resize-kubernetes-cluster.js ./output/kubernetes_1c1496016083b4_deployment.yml 2
101+
./scale-kubernetes-cluster.js ./output/kubernetes_1c1496016083b4_deployment.yml 2
102102
...
103103
azure_wrapper/info: Saved SSH config, you can use it like so: `ssh -F ./output/kubernetes_8f984af944f572_ssh_conf <hostname>`
104104
azure_wrapper/info: The hosts in this deployment are:
@@ -124,7 +124,7 @@ kube-03 environment=production Ready
124124
kube-04 environment=production Ready
125125
```
126126

127-
You can see that two more minions joined happily. Let's resize the number of Guestbook instances now.
127+
You can see that two more minions joined happily. Let's scale the number of Guestbook instances now.
128128

129129
First, double-check how many replication controllers there are:
130130

@@ -134,12 +134,12 @@ CONTROLLER CONTAINER(S) IMAGE(S)
134134
frontend-controller php-redis kubernetes/example-guestbook-php-redis name=frontend 3
135135
redis-slave-controller slave brendanburns/redis-slave name=redisslave 2
136136
```
137-
As there are 4 minions, let's resize proportionally:
137+
As there are 4 minions, let's scale proportionally:
138138
```
139-
core@kube-00 ~ $ kubectl resize --replicas=4 rc redis-slave-controller
140-
resized
141-
core@kube-00 ~ $ kubectl resize --replicas=4 rc frontend-controller
142-
resized
139+
core@kube-00 ~ $ kubectl scale --replicas=4 rc redis-slave-controller
140+
scaled
141+
core@kube-00 ~ $ kubectl scale --replicas=4 rc frontend-controller
142+
scaled
143143
```
144144
Check what you have now:
145145
```
@@ -182,7 +182,7 @@ If you don't wish care about the Azure bill, you can tear down the cluster. It's
182182
./destroy-cluster.js ./output/kubernetes_8f984af944f572_deployment.yml
183183
```
184184

185-
> Note: make sure to use the _latest state file_, as after resizing there is a new one.
185+
> Note: make sure to use the _latest state file_, as after scaling there is a new one.
186186
187187
By the way, with the scripts shown, you can deploy multiple clusters, if you like :)
188188

docs/getting-started-guides/docker-multinode/testing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Note that you will need run this curl command on your boot2docker VM if you are
4646
Now try to scale up the nginx you created before:
4747

4848
```sh
49-
kubectl resize rc nginx --replicas=3
49+
kubectl scale rc nginx --replicas=3
5050
```
5151

5252
And list the pods

docs/getting-started-guides/vagrant.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ myNginx nginx name=my-nginx 3
219219
220220
We did not start any services, hence there are none listed. But we see three replicas displayed properly.
221221
Check the [guestbook](../../examples/guestbook/README.md) application to learn how to create a service.
222-
You can already play with resizing the replicas with:
222+
You can already play with scaling the replicas with:
223223
224224
```sh
225-
$ ./cluster/kubectl.sh resize rc my-nginx --replicas=2
225+
$ ./cluster/kubectl.sh scale rc my-nginx --replicas=2
226226
$ ./cluster/kubectl.sh get pods
227227
NAME IMAGE(S) HOST LABELS STATUS
228228
7813c8bd-3ffe-11e4-9036-0800279696e1 nginx 10.245.2.2/10.245.2.2 name=myNginx Running

docs/kubectl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ kubectl
5858
* [kubectl namespace](kubectl_namespace.md) - SUPERCEDED: Set and view the current Kubernetes namespace
5959
* [kubectl port-forward](kubectl_port-forward.md) - Forward one or more local ports to a pod.
6060
* [kubectl proxy](kubectl_proxy.md) - Run a proxy to the Kubernetes API server
61-
* [kubectl resize](kubectl_resize.md) - Set a new size for a Replication Controller.
6261
* [kubectl rolling-update](kubectl_rolling-update.md) - Perform a rolling update of the given ReplicationController.
6362
* [kubectl run](kubectl_run.md) - Run a particular image on the cluster.
63+
* [kubectl scale](kubectl_scale.md) - Set a new size for a Replication Controller.
6464
* [kubectl stop](kubectl_stop.md) - Gracefully shut down a resource by id or filename.
6565
* [kubectl update](kubectl_update.md) - Update a resource by filename or stdin.
6666
* [kubectl version](kubectl_version.md) - Print the client and server version information.

docs/kubectl_resize.md renamed to docs/kubectl_scale.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## kubectl resize
1+
## kubectl scale
22

33
Set a new size for a Replication Controller.
44

@@ -7,32 +7,32 @@ Set a new size for a Replication Controller.
77

88
Set a new size for a Replication Controller.
99

10-
Resize also allows users to specify one or more preconditions for the resize action.
10+
Scale also allows users to specify one or more preconditions for the scale action.
1111
If --current-replicas or --resource-version is specified, it is validated before the
12-
resize is attempted, and it is guaranteed that the precondition holds true when the
13-
resize is sent to the server.
12+
scale is attempted, and it is guaranteed that the precondition holds true when the
13+
scale is sent to the server.
1414

1515
```
16-
kubectl resize [--resource-version=version] [--current-replicas=count] --replicas=COUNT RESOURCE ID
16+
kubectl scale [--resource-version=version] [--current-replicas=count] --replicas=COUNT RESOURCE ID
1717
```
1818

1919
### Examples
2020

2121
```
22-
// Resize replication controller named 'foo' to 3.
23-
$ kubectl resize --replicas=3 replicationcontrollers foo
22+
// Scale replication controller named 'foo' to 3.
23+
$ kubectl scale --replicas=3 replicationcontrollers foo
2424
25-
// If the replication controller named foo's current size is 2, resize foo to 3.
26-
$ kubectl resize --current-replicas=2 --replicas=3 replicationcontrollers foo
25+
// If the replication controller named foo's current size is 2, scale foo to 3.
26+
$ kubectl scale --current-replicas=2 --replicas=3 replicationcontrollers foo
2727
```
2828

2929
### Options
3030

3131
```
32-
--current-replicas=-1: Precondition for current size. Requires that the current size of the replication controller match this value in order to resize.
33-
-h, --help=false: help for resize
32+
--current-replicas=-1: Precondition for current size. Requires that the current size of the replication controller match this value in order to scale.
33+
-h, --help=false: help for scale
3434
--replicas=-1: The new desired number of replicas. Required.
35-
--resource-version="": Precondition for resource version. Requires that the current resource version match this value in order to resize.
35+
--resource-version="": Precondition for resource version. Requires that the current resource version match this value in order to scale.
3636
```
3737

3838
### Options inherited from parent commands
@@ -69,4 +69,4 @@ $ kubectl resize --current-replicas=2 --replicas=3 replicationcontrollers foo
6969

7070
###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.185268791 +0000 UTC
7171

72-
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_resize.md?pixel)]()
72+
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_scale.md?pixel)]()

docs/kubectl_stop.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Gracefully shut down a resource by id or filename.
88
Gracefully shut down a resource by id or filename.
99

1010
Attempts to shut down and delete a resource that supports graceful termination.
11-
If the resource is resizable it will be resized to 0 before deletion.
11+
If the resource is scalable it will be scaled to 0 before deletion.
1212

1313
```
1414
kubectl stop (-f FILENAME | RESOURCE (ID | -l label | --all))

docs/man/man1/.files_generated

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ kubectl-logs.1
1919
kubectl-namespace.1
2020
kubectl-port-forward.1
2121
kubectl-proxy.1
22-
kubectl-resize.1
2322
kubectl-rolling-update.1
2423
kubectl-run.1
24+
kubectl-scale.1
2525
kubectl-stop.1
2626
kubectl-update.1
2727
kubectl-version.1

docs/man/man1/kubectl-resize.1 renamed to docs/man/man1/kubectl-scale.1

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@
33

44
.SH NAME
55
.PP
6-
kubectl resize \- Set a new size for a Replication Controller.
6+
kubectl scale \- Set a new size for a Replication Controller.
77

88

99
.SH SYNOPSIS
1010
.PP
11-
\fBkubectl resize\fP [OPTIONS]
11+
\fBkubectl scale\fP [OPTIONS]
1212

1313

1414
.SH DESCRIPTION
1515
.PP
1616
Set a new size for a Replication Controller.
1717

1818
.PP
19-
Resize also allows users to specify one or more preconditions for the resize action.
19+
Scale also allows users to specify one or more preconditions for the scale action.
2020
If \-\-current\-replicas or \-\-resource\-version is specified, it is validated before the
21-
resize is attempted, and it is guaranteed that the precondition holds true when the
22-
resize is sent to the server.
21+
scale is attempted, and it is guaranteed that the precondition holds true when the
22+
scale is sent to the server.
2323

2424

2525
.SH OPTIONS
2626
.PP
2727
\fB\-\-current\-replicas\fP=\-1
28-
Precondition for current size. Requires that the current size of the replication controller match this value in order to resize.
28+
Precondition for current size. Requires that the current size of the replication controller match this value in order to scale.
2929

3030
.PP
3131
\fB\-h\fP, \fB\-\-help\fP=false
32-
help for resize
32+
help for scale
3333

3434
.PP
3535
\fB\-\-replicas\fP=\-1
3636
The new desired number of replicas. Required.
3737

3838
.PP
3939
\fB\-\-resource\-version\fP=""
40-
Precondition for resource version. Requires that the current resource version match this value in order to resize.
40+
Precondition for resource version. Requires that the current resource version match this value in order to scale.
4141

4242

4343
.SH OPTIONS INHERITED FROM PARENT COMMANDS
@@ -143,11 +143,11 @@ resize is sent to the server.
143143
.RS
144144

145145
.nf
146-
// Resize replication controller named 'foo' to 3.
147-
$ kubectl resize \-\-replicas=3 replicationcontrollers foo
146+
// Scale replication controller named 'foo' to 3.
147+
$ kubectl scale \-\-replicas=3 replicationcontrollers foo
148148

149-
// If the replication controller named foo's current size is 2, resize foo to 3.
150-
$ kubectl resize \-\-current\-replicas=2 \-\-replicas=3 replicationcontrollers foo
149+
// If the replication controller named foo's current size is 2, scale foo to 3.
150+
$ kubectl scale \-\-current\-replicas=2 \-\-replicas=3 replicationcontrollers foo
151151

152152
.fi
153153
.RE

docs/man/man1/kubectl-stop.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gracefully shut down a resource by id or filename.
1717

1818
.PP
1919
Attempts to shut down and delete a resource that supports graceful termination.
20-
If the resource is resizable it will be resized to 0 before deletion.
20+
If the resource is scalable it will be scaled to 0 before deletion.
2121

2222

2323
.SH OPTIONS

docs/man/man1/kubectl.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Find more information at
124124

125125
.SH SEE ALSO
126126
.PP
127-
\fBkubectl\-get(1)\fP, \fBkubectl\-describe(1)\fP, \fBkubectl\-create(1)\fP, \fBkubectl\-update(1)\fP, \fBkubectl\-delete(1)\fP, \fBkubectl\-namespace(1)\fP, \fBkubectl\-logs(1)\fP, \fBkubectl\-rolling\-update(1)\fP, \fBkubectl\-resize(1)\fP, \fBkubectl\-exec(1)\fP, \fBkubectl\-port\-forward(1)\fP, \fBkubectl\-proxy(1)\fP, \fBkubectl\-run(1)\fP, \fBkubectl\-stop(1)\fP, \fBkubectl\-expose(1)\fP, \fBkubectl\-label(1)\fP, \fBkubectl\-config(1)\fP, \fBkubectl\-cluster\-info(1)\fP, \fBkubectl\-api\-versions(1)\fP, \fBkubectl\-version(1)\fP,
127+
\fBkubectl\-get(1)\fP, \fBkubectl\-describe(1)\fP, \fBkubectl\-create(1)\fP, \fBkubectl\-update(1)\fP, \fBkubectl\-delete(1)\fP, \fBkubectl\-namespace(1)\fP, \fBkubectl\-logs(1)\fP, \fBkubectl\-rolling\-update(1)\fP, \fBkubectl\-scale(1)\fP, \fBkubectl\-exec(1)\fP, \fBkubectl\-port\-forward(1)\fP, \fBkubectl\-proxy(1)\fP, \fBkubectl\-run(1)\fP, \fBkubectl\-stop(1)\fP, \fBkubectl\-expose(1)\fP, \fBkubectl\-label(1)\fP, \fBkubectl\-config(1)\fP, \fBkubectl\-cluster\-info(1)\fP, \fBkubectl\-api\-versions(1)\fP, \fBkubectl\-version(1)\fP,
128128

129129

130130
.SH HISTORY

0 commit comments

Comments
 (0)