Skip to content

Commit d711b75

Browse files
authored
Merge pull request #40353 from pacoxu/update-IdentifyPodOS
update IdentifyPodOS as it is removed
2 parents f23cc95 + a673285 commit d711b75

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

content/en/docs/concepts/windows/intro.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ section refers to several key workload abstractions and how they map to Windows.
8989

9090
The `.spec.os.name` field should be set to `windows` to indicate that the current Pod uses Windows containers.
9191

92-
{{< note >}}
93-
Starting from 1.25, the `IdentifyPodOS` feature gate is in GA stage and defaults to be enabled.
94-
{{< /note >}}
95-
9692
If you set the `.spec.os.name` field to `windows`,
9793
you must not set the following fields in the `.spec` of that Pod:
9894

content/en/docs/concepts/windows/user-guide.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,6 @@ that the containers in that Pod are designed for. For Pods that run Linux contai
162162
`.spec.os.name` to `linux`. For Pods that run Windows containers, set `.spec.os.name`
163163
to `windows`.
164164

165-
{{< note >}}
166-
Starting from 1.25, the `IdentifyPodOS` feature is in GA stage and defaults to be enabled.
167-
{{< /note >}}
168-
169165
The scheduler does not use the value of `.spec.os.name` when assigning Pods to nodes. You should
170166
use normal Kubernetes mechanisms for
171167
[assigning pods to nodes](/docs/concepts/scheduling-eviction/assign-pod-node/)

content/en/docs/reference/command-line-tools-reference/feature-gates-removed.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ In the following table:
169169
| `IPv6DualStack` | `false` | Alpha | 1.15 | 1.20 |
170170
| `IPv6DualStack` | `true` | Beta | 1.21 | 1.22 |
171171
| `IPv6DualStack` | `true` | GA | 1.23 | 1.24 |
172+
| `IdentifyPodOS` | `false` | Alpha | 1.23 | 1.23 |
173+
| `IdentifyPodOS` | `true` | Beta | 1.24 | 1.24 |
174+
| `IdentifyPodOS` | `true` | GA | 1.25 | 1.27 |
172175
| `ImmutableEphemeralVolumes` | `false` | Alpha | 1.18 | 1.18 |
173176
| `ImmutableEphemeralVolumes` | `true` | Beta | 1.19 | 1.20 |
174177
| `ImmutableEphemeralVolumes` | `true` | GA | 1.21 | 1.24 |
@@ -575,6 +578,11 @@ In the following table:
575578
- `IPv6DualStack`: Enable [dual stack](/docs/concepts/services-networking/dual-stack/)
576579
support for IPv6.
577580

581+
- `IdentifyPodOS`: Allows the Pod OS field to be specified. This helps in identifying
582+
the OS of the pod authoritatively during the API server admission time.
583+
In Kubernetes {{< skew currentVersion >}}, the allowed values for the `pod.spec.os.name`
584+
are `windows` and `linux`.
585+
578586
- `ImmutableEphemeralVolumes`: Allows for marking individual Secrets and ConfigMaps as
579587
immutable for better safety and performance.
580588

content/en/docs/reference/command-line-tools-reference/feature-gates.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,6 @@ For a reference to old feature gates that are removed, please refer to
282282
| `EphemeralContainers` | `true` | Beta | 1.23 | 1.24 |
283283
| `EphemeralContainers` | `true` | GA | 1.25 | - |
284284
| `ExecProbeTimeout` | `true` | GA | 1.20 | - |
285-
| `IdentifyPodOS` | `false` | Alpha | 1.23 | 1.23 |
286-
| `IdentifyPodOS` | `true` | Beta | 1.24 | 1.24 |
287-
| `IdentifyPodOS` | `true` | GA | 1.25 | - |
288285
| `JobTrackingWithFinalizers` | `false` | Alpha | 1.22 | 1.22 |
289286
| `JobTrackingWithFinalizers` | `false` | Beta | 1.23 | 1.24 |
290287
| `JobTrackingWithFinalizers` | `true` | Beta | 1.25 | 1.25 |
@@ -543,10 +540,6 @@ Each feature gate is designed for enabling/disabling a specific feature:
543540
- `HPAScaleToZero`: Enables setting `minReplicas` to 0 for `HorizontalPodAutoscaler`
544541
resources when using custom or external metrics.
545542
- `IPTablesOwnershipCleanup`: This causes kubelet to no longer create legacy iptables rules.
546-
- `IdentifyPodOS`: Allows the Pod OS field to be specified. This helps in identifying
547-
the OS of the pod authoritatively during the API server admission time.
548-
In Kubernetes {{< skew currentVersion >}}, the allowed values for the `pod.spec.os.name`
549-
are `windows` and `linux`.
550543
- `InTreePluginAWSUnregister`: Stops registering the aws-ebs in-tree plugin in kubelet
551544
and volume controllers.
552545
- `InTreePluginAzureDiskUnregister`: Stops registering the azuredisk in-tree plugin in kubelet

0 commit comments

Comments
 (0)