diff --git a/docs/azure-csi.md b/docs/azure-csi.md
index e121c88748c88e4914d2f538c36ea031192934cb..811b5b07802e90333e9b7bbbc841abdc66544a7b 100644
--- a/docs/azure-csi.md
+++ b/docs/azure-csi.md
@@ -101,7 +101,7 @@ metadata:
name: nginx-azuredisk
spec:
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
containers:
- image: nginx
name: nginx-azuredisk
diff --git a/inventory/sample/group_vars/k8s-cluster/addons.yml b/inventory/sample/group_vars/k8s-cluster/addons.yml
index 85383b48ee0020a5ab34782dac84e171ffcfb3a3..133c80fd5a479fddc132659d851c86850c88aad9 100644
--- a/inventory/sample/group_vars/k8s-cluster/addons.yml
+++ b/inventory/sample/group_vars/k8s-cluster/addons.yml
@@ -84,7 +84,7 @@ ingress_nginx_enabled: false
# ingress_nginx_host_network: false
ingress_publish_status_address: ""
# ingress_nginx_nodeselector:
-# beta.kubernetes.io/os: "linux"
+# kubernetes.io/os: "linux"
# ingress_nginx_tolerations:
# - key: "node-role.kubernetes.io/master"
# operator: "Equal"
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
index 81903f3dcec6c70f7a381eed8ed9637d9119dbad..a75965acd1a7d57a2b3b1ad93f934814b37b27d5 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
@@ -26,7 +26,7 @@ spec:
spec:
priorityClassName: system-cluster-critical
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
serviceAccountName: coredns
tolerations:
- key: node-role.kubernetes.io/master
diff --git a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
index 4a966e47767579d26a8ec0edf4de0ffed4eca749..e30a68b3d321e2d85ba191eac239cc81ab3f9486 100644
--- a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
@@ -38,7 +38,7 @@ spec:
supplementalGroups: [ 65534 ]
fsGroup: 65534
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
tolerations:
- effect: NoSchedule
operator: Equal
diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
index eafb1029fe345a3b65588bed7d891d53291abf1e..6208e89644b28582714ded37bc53b42d7e730a28 100644
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
@@ -20,7 +20,7 @@ spec:
- effect: NoSchedule
operator: Exists
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
containers:
- name: netchecker-agent
image: "{{ netcheck_agent_image_repo }}:{{ netcheck_agent_image_tag }}"
diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
index af57ceb6f884dce67bc1ea25bee469da421f7186..bbf6d99d6656fb9f25031ce8c09fc7726bd395aa 100644
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
@@ -18,7 +18,7 @@ spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
priorityClassName: {% if netcheck_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
tolerations:
- effect: NoSchedule
diff --git a/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-controllerservice.yml.j2 b/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-controllerservice.yml.j2
index e807c202b7bba4e874b5aa7dce62ca3d7b69b2f4..947c0d31068220a8f455cd77a68bf732e38dacab 100644
--- a/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-controllerservice.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-controllerservice.yml.j2
@@ -17,7 +17,7 @@ spec:
app.kubernetes.io/name: aws-ebs-csi-driver
spec:
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
serviceAccount: ebs-csi-controller-sa
priorityClassName: system-cluster-critical
tolerations:
diff --git a/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-nodeservice.yml.j2 b/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-nodeservice.yml.j2
index e1a7867cf282ea6633d0f745628b17054502d443..9175e24b3899ad757c4b226fcb997fd58148626e 100644
--- a/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-nodeservice.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-nodeservice.yml.j2
@@ -17,7 +17,7 @@ spec:
app.kubernetes.io/name: aws-ebs-csi-driver
spec:
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
hostNetwork: true
priorityClassName: system-node-critical
tolerations:
diff --git a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2 b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2
index b9cd4dc4f821b2eb2dff3b2d2ef3e958bce1c685..3b3b7e2b5c8e7988dd0276309fc48ce509b04d91 100644
--- a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2
@@ -17,7 +17,7 @@ spec:
hostNetwork: true
serviceAccountName: csi-azuredisk-controller-sa
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
priorityClassName: system-cluster-critical
tolerations:
- key: "node-role.kubernetes.io/master"
diff --git a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-node.yml.j2 b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-node.yml.j2
index 08957781a043198a8d9a2d64cb66906fffeb5d1e..45046a021a272eecea23c46fb4ff6d7c7f15d16a 100644
--- a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-node.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-node.yml.j2
@@ -15,7 +15,7 @@ spec:
spec:
hostNetwork: true
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
priorityClassName: system-node-critical
containers:
- name: liveness-probe
diff --git a/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrole.yml.j2 b/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrole.yml.j2
index 4522635efe15d4793b96bde063cf52aad40ff62e..4d776f1490efc17b743e86cfc2bfab2daed881e8 100644
--- a/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrole.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrole.yml.j2
@@ -1,5 +1,5 @@
---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: alb-ingress
diff --git a/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrolebinding.yml.j2 b/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrolebinding.yml.j2
index 4f14f6a9965881e8c7be7bc1b3f82e2b500a3e6d..71068f48b285eac3ac9d89cacd651af767505ad0 100644
--- a/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrolebinding.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrolebinding.yml.j2
@@ -1,5 +1,5 @@
---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: alb-ingress
diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/README.md b/roles/kubernetes-apps/ingress_controller/ingress_nginx/README.md
index 677cb497533e168830cbc4986327f71d74de864e..6a4c33c7e8209ac9ff956deb407bf191b079438e 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/README.md
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/README.md
@@ -37,9 +37,6 @@ The following **Mandatory Command** is required for all deployments.
kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/mandatory.yaml
```
-!!! tip
- If you are using a Kubernetes version previous to 1.14, you need to change `kubernetes.io/os` to `beta.kubernetes.io/os` at line 217 of [mandatory.yaml](https://github.com/kubernetes/ingress-nginx/blob/master/deploy/static/mandatory.yaml#L217), see [Labels details](https://kubernetes.io/docs/reference/kubernetes-api/labels-annotations-taints/).
-
### Provider Specific Steps
There are cloud provider specific yaml files.
diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml b/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
index 98cfbfba41714d09525d1691b384eccef65f2e8c..409468436dc66aa0f6fe14ae357106f7d41e1f7d 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
@@ -3,7 +3,7 @@ ingress_nginx_namespace: "ingress-nginx"
ingress_nginx_host_network: false
ingress_publish_status_address: ""
ingress_nginx_nodeselector:
- beta.kubernetes.io/os: "linux"
+ kubernetes.io/os: "linux"
ingress_nginx_tolerations: []
ingress_nginx_insecure_port: 80
ingress_nginx_secure_port: 443
diff --git a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2 b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
index cf4516f4aeab466b8f0f03c5edc912efe5de3e86..b5db15c56123cefe5cf773613c6bffdcf693654d 100644
--- a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
+++ b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
@@ -20,7 +20,7 @@ spec:
k8s-app: calico-kube-controllers
spec:
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
hostNetwork: true
serviceAccountName: calico-kube-controllers
tolerations:
diff --git a/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 b/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2
index 6210b30fc21853157ded7da48cab42af69c418ef..a557d6e6058c2022a1847b4c02c0aca715ef1120 100644
--- a/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2
+++ b/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2
@@ -12,7 +12,7 @@ spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
priorityClassName: system-node-critical
containers:
- name: haproxy
diff --git a/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2 b/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2
index b4ea84c58e788f4f4d3749fcba5fbc35c27cb7f5..b05977d93ad3658347c0085446fe42ce6074d10a 100644
--- a/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2
+++ b/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2
@@ -12,7 +12,7 @@ spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
priorityClassName: system-node-critical
containers:
- name: nginx-proxy
diff --git a/roles/network_plugin/calico/templates/calico-typha.yml.j2 b/roles/network_plugin/calico/templates/calico-typha.yml.j2
index dbff9651416199e35952c3272af194c946ff4274..279e694c1180897b974aaf84c66d5fe7fc976991 100644
--- a/roles/network_plugin/calico/templates/calico-typha.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-typha.yml.j2
@@ -48,7 +48,7 @@ spec:
cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
spec:
nodeSelector:
- beta.kubernetes.io/os: linux
+ kubernetes.io/os: linux
hostNetwork: true
tolerations:
- key: node-role.kubernetes.io/master
diff --git a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
index f654a4e83b392f68233cbca3b4e2f0f90a0ea5f9..fb84d4358bceeaca65eba5be88153a115bfa2a02 100644
--- a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
+++ b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
@@ -94,11 +94,11 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- - key: beta.kubernetes.io/os
+ - key: kubernetes.io/os
operator: In
values:
- linux
- - key: beta.kubernetes.io/arch
+ - key: kubernetes.io/arch
operator: In
values:
- amd64
diff --git a/roles/network_plugin/multus/templates/multus-daemonset.yml.j2 b/roles/network_plugin/multus/templates/multus-daemonset.yml.j2
index 0175a0c3fd11c8e5279be56130f645bc7ea6e045..5572feb42f2cd849b116f8c2f63965f3ce48eebb 100644
--- a/roles/network_plugin/multus/templates/multus-daemonset.yml.j2
+++ b/roles/network_plugin/multus/templates/multus-daemonset.yml.j2
@@ -21,7 +21,7 @@ spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
nodeSelector:
- beta.kubernetes.io/arch: amd64
+ kubernetes.io/arch: amd64
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
diff --git a/roles/win_nodes/kubernetes_patch/files/nodeselector-os-linux-patch.json b/roles/win_nodes/kubernetes_patch/files/nodeselector-os-linux-patch.json
index d718ff4465e0ca7cfb082dcdfa711790731b4a8b..d6a7761da65886a06089e7c4afe49292e9feec1f 100644
--- a/roles/win_nodes/kubernetes_patch/files/nodeselector-os-linux-patch.json
+++ b/roles/win_nodes/kubernetes_patch/files/nodeselector-os-linux-patch.json
@@ -1 +1 @@
-{"spec":{"template":{"spec":{"nodeSelector":{"beta.kubernetes.io/os":"linux"}}}}}
\ No newline at end of file
+{"spec":{"template":{"spec":{"nodeSelector":{"kubernetes.io/os":"linux"}}}}}
\ No newline at end of file