Merge branch 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

* 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io:
  Updated spec.schedulername to spec.schedulerName.
This commit is contained in:
Andrew Chen
2017-03-06 11:28:26 -08:00
3 changed files with 7 additions and 7 deletions
+3 -3
View File
@@ -61,7 +61,7 @@ config. Save it as `my-scheduler.yaml`:
{% include code.html language="yaml" file="multiple-schedulers/my-scheduler.yaml" ghlink="/docs/admin/multiple-schedulers/my-scheduler.yaml" %}
An important thing to note here is that the name of the scheduler specified as an
argument to the scheduler command in the container spec should be unique. This is the name that is matched against the value of the optional `spec.schedulername` on pods, to determine whether this scheduler is responsible for scheduling a particular pod.
argument to the scheduler command in the container spec should be unique. This is the name that is matched against the value of the optional `spec.schedulerName` on pods, to determine whether this scheduler is responsible for scheduling a particular pod.
Please see the
[kube-scheduler documentation](/docs/admin/kube-scheduler/) for
@@ -112,7 +112,7 @@ scheduler in that pod spec. Let's look at three examples.
{% include code.html language="yaml" file="multiple-schedulers/pod2.yaml" ghlink="/docs/admin/multiple-schedulers/pod2.yaml" %}
A scheduler is specified by supplying the scheduler name as a value to `spec.schedulername`. In this case, we supply the name of the
A scheduler is specified by supplying the scheduler name as a value to `spec.schedulerName`. In this case, we supply the name of the
default scheduler which is `default-scheduler`.
Save this file as `pod2.yaml` and submit it to the Kubernetes cluster.
@@ -126,7 +126,7 @@ scheduler in that pod spec. Let's look at three examples.
{% include code.html language="yaml" file="multiple-schedulers/pod3.yaml" ghlink="/docs/admin/multiple-schedulers/pod3.yaml" %}
In this case, we specify that this pod should be scheduled using the scheduler that we
deployed - `my-scheduler`. Note that the value of `spec.schedulername` should match the name supplied to the scheduler
deployed - `my-scheduler`. Note that the value of `spec.schedulerName` should match the name supplied to the scheduler
command as an argument in the deployment config for the scheduler.
Save this file as `pod3.yaml` and submit it to the Kubernetes cluster.
+2 -2
View File
@@ -5,7 +5,7 @@ metadata:
labels:
name: multischeduler-example
spec:
schedulername: default-scheduler
schedulerName: default-scheduler
containers:
- name: pod-with-default-annotation-container
image: gcr.io/google_containers/pause:2.0
image: gcr.io/google_containers/pause:2.0
+2 -2
View File
@@ -5,7 +5,7 @@ metadata:
labels:
name: multischeduler-example
spec:
schedulername: my-scheduler
schedulerName: my-scheduler
containers:
- name: pod-with-second-annotation-container
image: gcr.io/google_containers/pause:2.0
image: gcr.io/google_containers/pause:2.0