From e774004131c2cde813bd1a170dfabfc666f708db Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Tue, 14 Dec 2021 13:11:54 -0800 Subject: [PATCH 1/2] Updating intro-windows-in-k8s for 1.23 Signed-off-by: Mark Rossetti --- .../windows/intro-windows-in-kubernetes.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md b/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md index 13f90862f0..19c71fa004 100644 --- a/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md +++ b/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md @@ -612,12 +612,12 @@ network port spaces). Kubernetes uses pause containers to allow for worker conta crashing or restarting without losing any of the networking configuration. Kubernetes maintains a multi-architecture image that includes support for Windows. -For Kubernetes v1.22 the recommended pause image is `k8s.gcr.io/pause:3.5`. +For Kubernetes v1.23 the recommended pause image is `k8s.gcr.io/pause:3.6`. The [source code](https://github.com/kubernetes/kubernetes/tree/master/build/pause) is available on GitHub. Microsoft maintains a different multi-architecture image, with Linux and Windows -amd64 support, that you can find as `mcr.microsoft.com/oss/kubernetes/pause:3.5`. +amd64 support, that you can find as `mcr.microsoft.com/oss/kubernetes/pause:3.6`. This image is built from the same source as the Kubernetes maintained image but all of the Windows binaries are [authenticode signed](https://docs.microsoft.com/en-us/windows-hardware/drivers/install/authenticode) by Microsoft. The Kubernetes project recommends using the Microsoft maintained image if you are @@ -661,14 +661,15 @@ On Windows nodes, strict compatibility rules apply where the host OS version mus match the container base image OS version. Only Windows containers with a container operating system of Windows Server 2019 are fully supported. -For Kubernetes v1.22, operating system compatibility for Windows nodes (and Pods) +For Kubernetes v1.23, operating system compatibility for Windows nodes (and Pods) is as follows: Windows Server LTSC release : Windows Server 2019 +: Windows Server 2022 Windows Server SAC release -: Windows Server version 2004, Windows Server version 20H2 +: Windows Server version 20H2 The Kubernetes [version-skew policy](/docs/setup/release/version-skew-policy/) also applies. From f19ded7dc081e9e1b08e5a4b2b17df00f07cd2fe Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Wed, 15 Dec 2021 09:20:54 -0800 Subject: [PATCH 2/2] Apply suggestions from code review Using v{{< skew currentVersion>}} in windows docs Co-authored-by: Tim Bannister --- .../windows/intro-windows-in-kubernetes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md b/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md index 19c71fa004..89546dc58d 100644 --- a/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md +++ b/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md @@ -612,7 +612,7 @@ network port spaces). Kubernetes uses pause containers to allow for worker conta crashing or restarting without losing any of the networking configuration. Kubernetes maintains a multi-architecture image that includes support for Windows. -For Kubernetes v1.23 the recommended pause image is `k8s.gcr.io/pause:3.6`. +For Kubernetes v{{< skew currentVersion >}} the recommended pause image is `k8s.gcr.io/pause:3.6`. The [source code](https://github.com/kubernetes/kubernetes/tree/master/build/pause) is available on GitHub. @@ -661,7 +661,7 @@ On Windows nodes, strict compatibility rules apply where the host OS version mus match the container base image OS version. Only Windows containers with a container operating system of Windows Server 2019 are fully supported. -For Kubernetes v1.23, operating system compatibility for Windows nodes (and Pods) +For Kubernetes v{{< skew currentVersion >}}, operating system compatibility for Windows nodes (and Pods) is as follows: Windows Server LTSC release