From e6fb330b1cc1df66eb2bb703189c8f87f53b73fb Mon Sep 17 00:00:00 2001
From: Michael Burke <mburke@redhat.com>
Date: Mon, 22 Jul 2019 17:44:08 -0400
Subject: [PATCH] Audit components for arch/OS label usage

---
 modules/nodes-nodes-viewing-listing-pods.adoc   | 2 +-
 modules/nodes-nodes-viewing-listing.adoc        | 2 +-
 modules/nodes-scheduler-node-selectors-pod.adoc | 2 +-
 modules/nw-multinetwork-sriov.adoc              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/nodes-nodes-viewing-listing-pods.adoc b/modules/nodes-nodes-viewing-listing-pods.adoc
index 3f69ca57f1..058e95196f 100644
--- a/modules/nodes-nodes-viewing-listing-pods.adoc
+++ b/modules/nodes-nodes-viewing-listing-pods.adoc
@@ -31,6 +31,6 @@ $ oc describe -l=<pod_selector>
 For example:
 +
 ----
-$ oc describe node  --selector=beta.kubernetes.io/os
+$ oc describe node  --selector=kubernetes.io/os
 $ oc describe node -l node-role.kubernetes.io/worker
 ----
diff --git a/modules/nodes-nodes-viewing-listing.adoc b/modules/nodes-nodes-viewing-listing.adoc
index 013f6ac05d..0f1d56c26e 100644
--- a/modules/nodes-nodes-viewing-listing.adoc
+++ b/modules/nodes-nodes-viewing-listing.adoc
@@ -67,7 +67,7 @@ Name:               node1.example.com <1>
 Roles:              worker <2>
 Labels:             beta.kubernetes.io/arch=amd64   <3>
                     beta.kubernetes.io/instance-type=m4.large
-                    beta.kubernetes.io/os=linux
+                    kubernetes.io/os=linux
                     failure-domain.beta.kubernetes.io/region=us-east-2
                     failure-domain.beta.kubernetes.io/zone=us-east-2a
                     kubernetes.io/hostname=ip-10-0-140-16
diff --git a/modules/nodes-scheduler-node-selectors-pod.adoc b/modules/nodes-scheduler-node-selectors-pod.adoc
index 45bb338af5..c969ec25a1 100644
--- a/modules/nodes-scheduler-node-selectors-pod.adoc
+++ b/modules/nodes-scheduler-node-selectors-pod.adoc
@@ -74,7 +74,7 @@ metadata:
   resourceVersion: '478704'
   creationTimestamp: '2019-06-10T14:46:08Z'
   labels:
-    beta.kubernetes.io/os: linux
+    kubernetes.io/os: linux
     failure-domain.beta.kubernetes.io/zone: us-east-1a
     node.openshift.io/os_version: '4.1'
     node-role.kubernetes.io/worker: ''
diff --git a/modules/nw-multinetwork-sriov.adoc b/modules/nw-multinetwork-sriov.adoc
index f0e45cb242..fcbd566a65 100644
--- a/modules/nw-multinetwork-sriov.adoc
+++ b/modules/nw-multinetwork-sriov.adoc
@@ -157,7 +157,7 @@ spec:
     spec:
       hostNetwork: true
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
       tolerations:
       - operator: Exists
       serviceAccountName: sriov-device-plugin
@@ -217,7 +217,7 @@ spec:
         openshift.io/component: network
     spec:
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
       tolerations:
       - operator: Exists
       serviceAccountName: sriov-cni