From fe7771aeac323f2bd59490fdcf06e283eca67106 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Thu, 15 Jul 2021 09:07:47 -0700 Subject: [PATCH 1/3] Remove annotation for Experimental Windows Hyper-v removed in 1.21: https://github.com/kubernetes/kubernetes/pull/95505 --- .../en/docs/reference/labels-annotations-taints.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/content/en/docs/reference/labels-annotations-taints.md b/content/en/docs/reference/labels-annotations-taints.md index 29f3a63a8c..cd966f6150 100644 --- a/content/en/docs/reference/labels-annotations-taints.md +++ b/content/en/docs/reference/labels-annotations-taints.md @@ -200,18 +200,6 @@ Used on: Service The kube-proxy has this label for custom proxy, which delegates service control to custom proxy. -## experimental.windows.kubernetes.io/isolation-type - -Example: `experimental.windows.kubernetes.io/isolation-type: "hyperv"` - -Used on: Pod - -The annotation is used to run Windows containers with Hyper-V isolation. To use Hyper-V isolation feature and create a Hyper-V isolated container, the kubelet should be started with feature gates HyperVContainer=true and the Pod should include the annotation experimental.windows.kubernetes.io/isolation-type=hyperv. - -{{< note >}} -You can only set this annotation on Pods that have a single container. -{{< /note >}} - ## ingressclass.kubernetes.io/is-default-class Example: `ingressclass.kubernetes.io/is-default-class: "true"` From 7145fb89d6a5fcbc40c86d6d9eca6d3d3b702ae3 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Thu, 22 Jul 2021 11:12:20 -0700 Subject: [PATCH 2/3] address feedback --- .../en/docs/reference/labels-annotations-taints.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/content/en/docs/reference/labels-annotations-taints.md b/content/en/docs/reference/labels-annotations-taints.md index cd966f6150..bb36561997 100644 --- a/content/en/docs/reference/labels-annotations-taints.md +++ b/content/en/docs/reference/labels-annotations-taints.md @@ -200,6 +200,19 @@ Used on: Service The kube-proxy has this label for custom proxy, which delegates service control to custom proxy. +## experimental.windows.kubernetes.io/isolation-type (deprecated) + +Example: `experimental.windows.kubernetes.io/isolation-type: "hyperv"` + +Used on: Pod + +The annotation is used to run Windows containers with Hyper-V isolation. To use Hyper-V isolation feature and create a Hyper-V isolated container, the kubelet should be started with feature gates HyperVContainer=true and the Pod should include the annotation experimental.windows.kubernetes.io/isolation-type=hyperv. + +{{< note >}} +You can only set this annotation on Pods that have a single container. +Starting in v1.20, this annotation is deprecated as experimental hyper-v support was removed in 1.21. +{{< /note >}} + ## ingressclass.kubernetes.io/is-default-class Example: `ingressclass.kubernetes.io/is-default-class: "true"` From b078e4916eb971d66a9049a2eebb2e580b00303e Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Fri, 23 Jul 2021 08:34:11 -0700 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Tim Bannister --- content/en/docs/reference/labels-annotations-taints.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/docs/reference/labels-annotations-taints.md b/content/en/docs/reference/labels-annotations-taints.md index bb36561997..c123c8da5b 100644 --- a/content/en/docs/reference/labels-annotations-taints.md +++ b/content/en/docs/reference/labels-annotations-taints.md @@ -200,7 +200,7 @@ Used on: Service The kube-proxy has this label for custom proxy, which delegates service control to custom proxy. -## experimental.windows.kubernetes.io/isolation-type (deprecated) +## experimental.windows.kubernetes.io/isolation-type (deprecated) {#experimental-windows-kubernetes-io-isolation-type} Example: `experimental.windows.kubernetes.io/isolation-type: "hyperv"` @@ -210,7 +210,7 @@ The annotation is used to run Windows containers with Hyper-V isolation. To use {{< note >}} You can only set this annotation on Pods that have a single container. -Starting in v1.20, this annotation is deprecated as experimental hyper-v support was removed in 1.21. +Starting from v1.20, this annotation is deprecated. Experimental Hyper-V support was removed in 1.21. {{< /note >}} ## ingressclass.kubernetes.io/is-default-class