Skip to content

Commit e7caadc

Browse files
committed
Replace skew shortcode parameters
1 parent 3a0d817 commit e7caadc

File tree

11 files changed

+60
-60
lines changed

11 files changed

+60
-60
lines changed

content/en/docs/concepts/security/pod-security-admission.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ For each mode, there are two labels that determine the policy used:
102102
pod-security.kubernetes.io/<MODE>: <LEVEL>
103103

104104
# Optional: per-mode version label that can be used to pin the policy to the
105-
# version that shipped with a given Kubernetes minor version (for example v{{< skew latestVersion >}}).
105+
# version that shipped with a given Kubernetes minor version (for example v{{< skew currentVersion >}}).
106106
#
107107
# MODE must be one of `enforce`, `audit`, or `warn`.
108108
# VERSION must be a valid Kubernetes minor version, or `latest`.

content/en/docs/concepts/services-networking/network-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ standardized label to target a specific namespace.
258258

259259
## What you can't do with network policies (at least, not yet)
260260

261-
As of Kubernetes {{< skew latestVersion >}}, the following functionality does not exist in the NetworkPolicy API, but you might be able to implement workarounds using Operating System components (such as SELinux, OpenVSwitch, IPTables, and so on) or Layer 7 technologies (Ingress controllers, Service Mesh implementations) or admission controllers. In case you are new to network security in Kubernetes, its worth noting that the following User Stories cannot (yet) be implemented using the NetworkPolicy API.
261+
As of Kubernetes {{< skew currentVersion >}}, the following functionality does not exist in the NetworkPolicy API, but you might be able to implement workarounds using Operating System components (such as SELinux, OpenVSwitch, IPTables, and so on) or Layer 7 technologies (Ingress controllers, Service Mesh implementations) or admission controllers. In case you are new to network security in Kubernetes, its worth noting that the following User Stories cannot (yet) be implemented using the NetworkPolicy API.
262262

263263
- Forcing internal cluster traffic to go through a common gateway (this might be best served with a service mesh or other proxy).
264264
- Anything TLS related (use a service mesh or ingress controller for this).

content/en/docs/reference/labels-annotations-taints/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ for more information.
550550

551551
### pod-security.kubernetes.io/enforce-version
552552

553-
Example: `pod-security.kubernetes.io/enforce-version: "{{< skew latestVersion >}}"`
553+
Example: `pod-security.kubernetes.io/enforce-version: "{{< skew currentVersion >}}"`
554554

555555
Used on: Namespace
556556

@@ -577,7 +577,7 @@ for more information.
577577

578578
### pod-security.kubernetes.io/audit-version
579579

580-
Example: `pod-security.kubernetes.io/audit-version: "{{< skew latestVersion >}}"`
580+
Example: `pod-security.kubernetes.io/audit-version: "{{< skew currentVersion >}}"`
581581

582582
Used on: Namespace
583583

@@ -606,7 +606,7 @@ for more information.
606606

607607
### pod-security.kubernetes.io/warn-version
608608

609-
Example: `pod-security.kubernetes.io/warn-version: "{{< skew latestVersion >}}"`
609+
Example: `pod-security.kubernetes.io/warn-version: "{{< skew currentVersion >}}"`
610610

611611
Used on: Namespace
612612

content/en/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -544,17 +544,17 @@ field when using `--config`. This option will control the versions
544544
of kube-apiserver, kube-controller-manager, kube-scheduler and kube-proxy.
545545

546546
Example:
547-
* kubeadm is at {{< skew latestVersion >}}
548-
* `kubernetesVersion` must be at {{< skew latestVersion >}} or {{< skew prevMinorVersion >}}
547+
* kubeadm is at {{< skew currentVersion >}}
548+
* `kubernetesVersion` must be at {{< skew currentVersion >}} or {{< skew currentVersionAddMinor -1 >}}
549549

550550
### kubeadm's skew against the kubelet
551551

552552
Similarly to the Kubernetes version, kubeadm can be used with a kubelet version that is the same
553553
version as kubeadm or one version older.
554554

555555
Example:
556-
* kubeadm is at {{< skew latestVersion >}}
557-
* kubelet on the host must be at {{< skew latestVersion >}} or {{< skew prevMinorVersion >}}
556+
* kubeadm is at {{< skew currentVersion >}}
557+
* kubelet on the host must be at {{< skew currentVersion >}} or {{< skew currentVersionAddMinor -1 >}}
558558

559559
### kubeadm's skew against kubeadm
560560

@@ -567,17 +567,17 @@ the same node with `kubeadm upgrade`. Similar rules apply to the rest of the kub
567567
with the exception of `kubeadm upgrade`.
568568

569569
Example for `kubeadm join`:
570-
* kubeadm version {{< skew latestVersion >}} was used to create a cluster with `kubeadm init`
571-
* Joining nodes must use a kubeadm binary that is at version {{< skew latestVersion >}}
570+
* kubeadm version {{< skew currentVersion >}} was used to create a cluster with `kubeadm init`
571+
* Joining nodes must use a kubeadm binary that is at version {{< skew currentVersion >}}
572572

573573
Nodes that are being upgraded must use a version of kubeadm that is the same MINOR
574574
version or one MINOR version newer than the version of kubeadm used for managing the
575575
node.
576576

577577
Example for `kubeadm upgrade`:
578-
* kubeadm version {{< skew prevMinorVersion >}} was used to create or upgrade the node
579-
* The version of kubeadm used for upgrading the node must be at {{< skew prevMinorVersion >}}
580-
or {{< skew latestVersion >}}
578+
* kubeadm version {{< skew currentVersionAddMinor -1 >}} was used to create or upgrade the node
579+
* The version of kubeadm used for upgrading the node must be at {{< skew currentVersionAddMinor -1 >}}
580+
or {{< skew currentVersion >}}
581581

582582
To learn more about the version skew between the different Kubernetes component see
583583
the [Version Skew Policy](https://kubernetes.io/releases/version-skew-policy/).

content/en/docs/tasks/administer-cluster/cluster-upgrade.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ At a high level, the steps you perform are:
2121
## {{% heading "prerequisites" %}}
2222

2323
You must have an existing cluster. This page is about upgrading from Kubernetes
24-
{{< skew prevMinorVersion >}} to Kubernetes {{< skew latestVersion >}}. If your cluster
25-
is not currently running Kubernetes {{< skew prevMinorVersion >}} then please check
24+
{{< skew currentVersionAddMinor -1 >}} to Kubernetes {{< skew currentVersion >}}. If your cluster
25+
is not currently running Kubernetes {{< skew currentVersionAddMinor -1 >}} then please check
2626
the documentation for the version of Kubernetes that you plan to upgrade to.
2727

2828
## Upgrade approaches
@@ -55,7 +55,7 @@ At this point you should
5555
[install the latest version of `kubectl`](/docs/tasks/tools/).
5656

5757
For each node in your cluster, [drain](/docs/tasks/administer-cluster/safely-drain-node/)
58-
that node and then either replace it with a new node that uses the {{< skew latestVersion >}}
58+
that node and then either replace it with a new node that uses the {{< skew currentVersion >}}
5959
kubelet, or upgrade the kubelet on that node and bring the node back into service.
6060

6161
### Other deployments {#upgrade-other}

content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-certs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ serverTLSBootstrap: true
244244
```
245245

246246
If you have already created the cluster you must adapt it by doing the following:
247-
- Find and edit the `kubelet-config-{{< skew latestVersion >}}` ConfigMap in the `kube-system` namespace.
247+
- Find and edit the `kubelet-config-{{< skew currentVersion >}}` ConfigMap in the `kube-system` namespace.
248248
In that ConfigMap, the `kubelet` key has a
249249
[KubeletConfiguration](/docs/reference/config-api/kubelet-config.v1beta1/#kubelet-config-k8s-io-v1beta1-KubeletConfiguration)
250250
document as its value. Edit the KubeletConfiguration document to set `serverTLSBootstrap: true`.

content/en/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,8 @@ to 127.0.0.1. If your pod relies on virtual hosts, which is probably the more co
438438
case, you should not use `host`, but rather set the `Host` header in `httpHeaders`.
439439

440440
For an HTTP probe, the kubelet sends two request headers in addition to the mandatory `Host` header:
441-
`User-Agent`, and `Accept`. The default values for these headers are `kube-probe/{{< skew latestVersion >}}`
442-
(where `{{< skew latestVersion >}}` is the version of the kubelet ), and `*/*` respectively.
441+
`User-Agent`, and `Accept`. The default values for these headers are `kube-probe/{{< skew currentVersion >}}`
442+
(where `{{< skew currentVersion >}}` is the version of the kubelet ), and `*/*` respectively.
443443

444444
You can override the default headers by defining `.httpHeaders` for the probe; for example
445445

content/en/docs/tasks/configure-pod-container/enforce-standards-admission-controller.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ plugins:
3838
#
3939
# Version label values must be one of:
4040
# - "latest" (default)
41-
# - specific version like "v{{< skew latestVersion >}}"
41+
# - specific version like "v{{< skew currentVersion >}}"
4242
defaults:
4343
enforce: "privileged"
4444
enforce-version: "latest"
@@ -78,7 +78,7 @@ plugins:
7878
#
7979
# Version label values must be one of:
8080
# - "latest" (default)
81-
# - specific version like "v{{< skew latestVersion >}}"
81+
# - specific version like "v{{< skew currentVersion >}}"
8282
defaults:
8383
enforce: "privileged"
8484
enforce-version: "latest"

content/en/docs/tasks/configure-pod-container/enforce-standards-namespace-labels.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This manifest defines a Namespace `my-baseline-namespace` that:
2626
- _Blocks_ any pods that don't satisfy the `baseline` policy requirements.
2727
- Generates a user-facing warning and adds an audit annotation to any created pod that does not
2828
meet the `restricted` policy requirements.
29-
- Pins the versions of the `baseline` and `restricted` policies to v{{< skew latestVersion >}}.
29+
- Pins the versions of the `baseline` and `restricted` policies to v{{< skew currentVersion >}}.
3030

3131
```yaml
3232
apiVersion: v1
@@ -35,13 +35,13 @@ metadata:
3535
name: my-baseline-namespace
3636
labels:
3737
pod-security.kubernetes.io/enforce: baseline
38-
pod-security.kubernetes.io/enforce-version: v{{< skew latestVersion >}}
38+
pod-security.kubernetes.io/enforce-version: v{{< skew currentVersion >}}
3939

4040
# We are setting these to our _desired_ `enforce` level.
4141
pod-security.kubernetes.io/audit: restricted
42-
pod-security.kubernetes.io/audit-version: v{{< skew latestVersion >}}
42+
pod-security.kubernetes.io/audit-version: v{{< skew currentVersion >}}
4343
pod-security.kubernetes.io/warn: restricted
44-
pod-security.kubernetes.io/warn-version: v{{< skew latestVersion >}}
44+
pod-security.kubernetes.io/warn-version: v{{< skew currentVersion >}}
4545
```
4646
4747
## Add labels to existing namespaces with `kubectl label`
@@ -82,10 +82,10 @@ kubectl get namespaces --selector='!pod-security.kubernetes.io/enforce'
8282
### Applying to a single namespace
8383

8484
You can update a specific namespace as well. This command adds the `enforce=restricted`
85-
policy to `my-existing-namespace`, pinning the restricted policy version to v{{< skew latestVersion >}}.
85+
policy to `my-existing-namespace`, pinning the restricted policy version to v{{< skew currentVersion >}}.
8686

8787
```shell
8888
kubectl label --overwrite ns my-existing-namespace \
8989
pod-security.kubernetes.io/enforce=restricted \
90-
pod-security.kubernetes.io/enforce-version=v{{< skew latestVersion >}}
90+
pod-security.kubernetes.io/enforce-version=v{{< skew currentVersion >}}
9191
```

content/en/releases/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ type: docs
77

88
<!-- overview -->
99

10-
The Kubernetes project maintains release branches for the most recent three minor releases ({{< skew latestVersion >}}, {{< skew prevMinorVersion >}}, {{< skew oldestMinorVersion >}}). Kubernetes 1.19 and newer receive [approximately 1 year of patch support](/releases/patch-releases/#support-period). Kubernetes 1.18 and older received approximately 9 months of patch support.
10+
The Kubernetes project maintains release branches for the most recent three minor releases ({{< skew currentVersion >}}, {{< skew currentVersionAddMinor -1 >}}, {{< skew currentVersionAddMinor -2 >}}). Kubernetes 1.19 and newer receive [approximately 1 year of patch support](/releases/patch-releases/#support-period). Kubernetes 1.18 and older received approximately 9 months of patch support.
1111

1212
Kubernetes versions are expressed as **x.y.z**,
1313
where **x** is the major version, **y** is the minor version, and **z** is the patch version, following [Semantic Versioning](https://semver.org/) terminology.
@@ -22,6 +22,6 @@ More information in the [version skew policy](/releases/version-skew-policy/) do
2222

2323
## Upcoming Release
2424

25-
Check out the [schedule](https://github.com/kubernetes/sig-release/tree/master/releases/release-{{< skew nextMinorVersion >}}) for the upcoming **{{< skew nextMinorVersion >}}** Kubernetes release!
25+
Check out the [schedule](https://github.com/kubernetes/sig-release/tree/master/releases/release-{{< skew currentVersionAddMinor 1 >}}) for the upcoming **{{< skew currentVersionAddMinor 1 >}}** Kubernetes release!
2626

2727
## Helpful Resources

0 commit comments

Comments
 (0)