Add admonition type to shortcode (#9482)

* Change existing admon blocks

* Fix includes issue
This commit is contained in:
Luc Perkins
2018-11-06 11:33:04 -08:00
committed by k8s-ci-robot
parent e839031292
commit d65e1790ff
192 changed files with 673 additions and 543 deletions
@@ -60,7 +60,7 @@ annotation on each object. The annotation contains the contents of the object
configuration file that was used to create the object.
{{< note >}}
**Note:** Add the `-R` flag to recursively process directories.
Add the `-R` flag to recursively process directories.
{{< /note >}}
Here's an example of an object configuration file:
@@ -134,7 +134,7 @@ kubectl apply -f <directory>/
```
{{< note >}}
**Note:** Add the `-R` flag to recursively process directories.
Add the `-R` flag to recursively process directories.
{{< /note >}}
Here's an example configuration file:
@@ -148,7 +148,7 @@ kubectl apply -f https://k8s.io/examples/application/simple_deployment.yaml
```
{{< note >}}
**Note:** For purposes of illustration, the preceding command refers to a single
For purposes of illustration, the preceding command refers to a single
configuration file instead of a directory.
{{< /note >}}
@@ -322,7 +322,7 @@ spec:
```
{{< warning >}}
**Warning:** Mixing `kubectl apply` with the imperative object configuration commands
Mixing `kubectl apply` with the imperative object configuration commands
`create` and `replace` is not supported. This is because `create`
and `replace` do not retain the `kubectl.kubernetes.io/last-applied-configuration`
that `kubectl apply` uses to compute updates.
@@ -347,12 +347,12 @@ kubectl delete -f <filename>
Only use this if you know what you are doing.
{{< warning >}}
**Warning:** `kubectl apply --prune` is in alpha, and backwards incompatible
`kubectl apply --prune` is in alpha, and backwards incompatible
changes might be introduced in subsequent releases.
{{< /warning >}}
{{< warning >}}
**Warning:** You must be careful when using this command, so that you
You must be careful when using this command, so that you
do not delete objects unintentionally.
{{< /warning >}}
@@ -373,7 +373,7 @@ kubectl apply -f <directory/> --prune -l <labels>
```
{{< warning >}}
**Warning:** Apply with prune should only be run against the root directory
Apply with prune should only be run against the root directory
containing the object configuration files. Running against sub-directories
can cause objects to be unintentionally deleted if they are returned
by the label selector query specified with `-l <labels>` and
@@ -391,10 +391,9 @@ kubectl get -f <filename|url> -o yaml
## How apply calculates differences and merges changes
{{< caution >}}
**Caution:** A *patch* is an update operation that is scoped to specific
fields of an object instead of the entire object.
This enables updating only a specific set of fields on an object without
reading the object first.
A *patch* is an update operation that is scoped to specific fields of an object
instead of the entire object. This enables updating only a specific set of fields
on an object without reading the object first.
{{< /caution >}}
When `kubectl apply` updates the live configuration for an object,
@@ -546,7 +545,7 @@ and merged.
Primitive fields are replaced or cleared.
{{< note >}}
**Note:** '-' is used for "not applicable" because the value is not used.
`-` is used for "not applicable" because the value is not used.
{{< /note >}}
| Field in object configuration file | Field in live object configuration | Field in last-applied-configuration | Action |
@@ -561,7 +560,7 @@ Primitive fields are replaced or cleared.
Fields that represent maps are merged by comparing each of the subfields or elements of the map:
{{< note >}}
**Note:** '-' is used for "not applicable" because the value is not used.
`-` is used for "not applicable" because the value is not used.
{{< /note >}}
| Key in object configuration file | Key in live object configuration | Field in last-applied-configuration | Action |
@@ -689,7 +688,7 @@ by `name`.
As of Kubernetes 1.5, merging lists of primitive elements is not supported.
{{< note >}}
**Note:** Which of the above strategies is chosen for a given field is controlled by
Which of the above strategies is chosen for a given field is controlled by
the `patchStrategy` tag in [types.go](https://git.k8s.io/api/core/v1/types.go#L2565)
If no `patchStrategy` is specified for a field of type list, then
the list is replaced.
@@ -900,7 +899,7 @@ Kubernetes objects should be managed using only one method at a time.
Switching from one method to another is possible, but is a manual process.
{{< note >}}
**Note:** It is OK to use imperative deletion with declarative management.
It is OK to use imperative deletion with declarative management.
{{< /note >}}
{{< comment >}}
@@ -924,8 +923,10 @@ configuration involves several manual steps:
1. Manually remove the `status` field from the configuration file.
{{< note >}}**Note:** This step is optional, as `kubectl apply` does not update the status field
even if it is present in the configuration file.{{< /note >}}
{{< note >}}
This step is optional, as `kubectl apply` does not update the status field
even if it is present in the configuration file.
{{< /note >}}
1. Set the `kubectl.kubernetes.io/last-applied-configuration` annotation on the object:
@@ -952,7 +953,7 @@ TODO(pwittrock): Why doesn't export remove the status field? Seems like it shou
## Defining controller selectors and PodTemplate labels
{{< warning >}}
**Warning:** Updating selectors on controllers is strongly discouraged.
Updating selectors on controllers is strongly discouraged.
{{< /warning >}}
The recommended approach is to define a single, immutable PodTemplate label