Skip to content

Commit 58d9fe9

Browse files
authored
Merge pull request #39037 from wking/update-beta-os-annotation
modules: Update beta.kubernetes.io/os to kubernetes.io/os
2 parents fbca4db + 9859a0b commit 58d9fe9

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

modules/nodes-scheduler-node-selectors-about.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ metadata:
5050
resourceVersion: '478704'
5151
creationTimestamp: '2019-06-10T14:46:08Z'
5252
labels:
53-
beta.kubernetes.io/os: linux
53+
kubernetes.io/os: linux
5454
failure-domain.beta.kubernetes.io/zone: us-east-1a
5555
node.openshift.io/os_version: '4.5'
5656
node-role.kubernetes.io/worker: ''
@@ -76,7 +76,7 @@ metadata:
7676
resourceVersion: '478704'
7777
creationTimestamp: '2019-06-10T14:46:08Z'
7878
labels:
79-
beta.kubernetes.io/os: linux
79+
kubernetes.io/os: linux
8080
failure-domain.beta.kubernetes.io/zone: us-east-1a
8181
node.openshift.io/os_version: '4.5'
8282
node-role.kubernetes.io/worker: ''

modules/nodes-scheduler-node-selectors-pod.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ spec:
193193
pod-template-hash: 66d5cf9464
194194
spec:
195195
nodeSelector:
196-
beta.kubernetes.io/os: linux
196+
kubernetes.io/os: linux
197197
node-role.kubernetes.io/worker: ''
198198
type: user-node <1>
199199
----

modules/nw-ingress-controller-configuration-parameters.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The `nodePlacement` parameter includes two parts, `nodeSelector` and `toleration
7878
nodePlacement:
7979
nodeSelector:
8080
matchLabels:
81-
beta.kubernetes.io/os: linux
81+
kubernetes.io/os: linux
8282
tolerations:
8383
- effect: NoSchedule
8484
operator: Exists

modules/sample-windows-workload-deployment.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
windowsOptions:
6868
runAsUserName: "ContainerAdministrator"
6969
nodeSelector:
70-
beta.kubernetes.io/os: windows
70+
kubernetes.io/os: windows
7171
----
7272

7373
[NOTE]

0 commit comments

Comments
 (0)