Skip to content

Commit 6989773

Browse files
authored
Merge pull request #20946 from irvifa/fix-templating-to-hugo-0.70
Change notes templating to be able to comply with Hugo 0.70.
2 parents 73335b0 + e852b9b commit 6989773

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

content/en/docs/concepts/workloads/controllers/deployment.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ In this example:
5555
as long as the Pod template itself satisfies the rule.
5656

5757
{{< note >}}
58-
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.
58+
The `.spec.selector.matchLabels` field is a map of {key,value} pairs.
59+
A single {key,value} in the `matchLabels` map is equivalent to an element of `matchExpressions`,
60+
whose key field is "key" the operator is "In", and the values array contains only "value".
61+
All of the requirements, from both `matchLabels` and `matchExpressions`, must be satisfied in order to match.
5962
{{< /note >}}
6063

6164
* The `template` field contains the following sub-fields:
@@ -75,9 +78,10 @@ Follow the steps given below to create the above Deployment:
7578
kubectl apply -f https://k8s.io/examples/controllers/nginx-deployment.yaml
7679
```
7780

78-
{{< note >}}
79-
You can specify the `--record` flag to write the command executed in the resource annotation `kubernetes.io/change-cause`. The recorded change is useful for future introspection. For example, to see the commands executed in each Deployment revision.
80-
{{< /note >}}
81+
{{< note >}}
82+
You can specify the `--record` flag to write the command executed in the resource annotation `kubernetes.io/change-cause`.
83+
The recorded change is useful for future introspection. For example, to see the commands executed in each Deployment revision.
84+
{{< /note >}}
8185

8286

8387
2. Run `kubectl get deployments` to check if the Deployment was created.
@@ -904,9 +908,9 @@ example, rollback the Deployment to its previous version.
904908
{{< /note >}}
905909
906910
{{< note >}}
907-
If you pause a Deployment, Kubernetes does not check progress against your specified deadline. You can
908-
safely pause a Deployment in the middle of a rollout and resume without triggering the condition for exceeding the
909-
deadline.
911+
If you pause a Deployment, Kubernetes does not check progress against your specified deadline.
912+
You can safely pause a Deployment in the middle of a rollout and resume without triggering
913+
the condition for exceeding the deadline.
910914
{{< /note >}}
911915
912916
You may experience transient errors with your Deployments, either due to a low timeout that you have set or

layouts/shortcodes/note.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<blockquote class="note">
2-
<div><strong>{{ T "note" }}</strong> {{ trim .Inner " \n" | markdownify }}</div>
2+
<div><strong>{{ T "note" }}</strong> {{ replaceRE "\\s+|\n" " " .Inner | markdownify }}</div>
33
</blockquote>

0 commit comments

Comments
 (0)