Merge pull request #20903 from irvifa/fix-notes

Fix note indentation since it's causing the CSS to break.
This commit is contained in:
Kubernetes Prow Robot
2020-05-12 09:24:22 -07:00
committed by GitHub
2 changed files with 10 additions and 16 deletions
@@ -134,10 +134,9 @@ path types:
to the list of labels in the path split by the `/` separator. A request is a to the list of labels in the path split by the `/` separator. A request is a
match for path _p_ if every _p_ is an element-wise prefix of _p_ of the match for path _p_ if every _p_ is an element-wise prefix of _p_ of the
request path. request path.
{{< note >}} {{< note >}}
If the last element of the path is a substring of the If the last element of the path is a substring of the last element in request path, it is not a match (for example: `/foo/bar` matches`/foo/bar/baz`, but does not match `/foo/barbaz`).
last element in request path, it is not a match (for example:
`/foo/bar` matches`/foo/bar/baz`, but does not match `/foo/barbaz`).
{{< /note >}} {{< /note >}}
#### Multiple Matches #### Multiple Matches
@@ -53,11 +53,9 @@ In this example:
In this case, you simply select a label that is defined in the Pod template (`app: nginx`). In this case, you simply select a label that is defined in the Pod template (`app: nginx`).
However, more sophisticated selection rules are possible, However, more sophisticated selection rules are possible,
as long as the Pod template itself satisfies the rule. as long as the Pod template itself satisfies the rule.
{{< note >}} {{< note >}}
The `.spec.selector.matchLabels` field is a map of {key,value} pairs. A single {key,value} in the `matchLabels` map The `.spec.selector.matchLabels` field is a map of {key,value} pairs. A single {key,value} in the `matchLabels` map is equivalent to an element of `matchExpressions`, whose key field is "key" the operator is "In", and the values array contains only "value". All of the requirements, from both `matchLabels` and `matchExpressions`, must be satisfied in order to match.
is equivalent to an element of `matchExpressions`, whose key field is "key" the operator is "In",
and the values array contains only "value".
All of the requirements, from both `matchLabels` and `matchExpressions`, must be satisfied in order to match.
{{< /note >}} {{< /note >}}
* The `template` field contains the following sub-fields: * The `template` field contains the following sub-fields:
@@ -74,8 +72,7 @@ In this example:
1. Create the Deployment by running the following command: 1. Create the Deployment by running the following command:
{{< note >}} {{< note >}}
You may specify the `--record` flag to write the command executed in the resource annotation `kubernetes.io/change-cause`. It is useful for future introspection. You may specify the `--record` flag to write the command executed in the resource annotation `kubernetes.io/change-cause`. It is useful for future introspection. For example, to see the commands executed in each Deployment revision.
For example, to see the commands executed in each Deployment revision.
{{< /note >}} {{< /note >}}
```shell ```shell
@@ -409,9 +406,7 @@ rolled back.
``` ```
{{< note >}} {{< note >}}
The Deployment controller stops the bad rollout automatically, and stops scaling up the new The Deployment controller stops the bad rollout automatically, and stops scaling up the new ReplicaSet. This depends on the rollingUpdate parameters (`maxUnavailable` specifically) that you have specified. sKubernetes by default sets the value to 25%.
ReplicaSet. This depends on the rollingUpdate parameters (`maxUnavailable` specifically) that you have specified.
Kubernetes by default sets the value to 25%.
{{< /note >}} {{< /note >}}
* Get the description of the Deployment: * Get the description of the Deployment: