From 83fe607f62dc9b164e32e370114fa1f52c47d953 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Fri, 17 Apr 2020 14:51:06 +0200
Subject: [PATCH] Cleanup deprecated labels beta.kubernetes.io/arch and
beta.kubernetes.io/os (#5964)
---
docs/azure-csi.md | 2 +-
inventory/sample/group_vars/k8s-cluster/addons.yml | 2 +-
.../ansible/templates/coredns-deployment.yml.j2 | 2 +-
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 | 2 +-
.../ansible/templates/netchecker-agent-ds.yml.j2 | 2 +-
.../ansible/templates/netchecker-agent-hostnet-ds.yml.j2 | 2 +-
.../aws_ebs/templates/aws-ebs-csi-controllerservice.yml.j2 | 2 +-
.../aws_ebs/templates/aws-ebs-csi-nodeservice.yml.j2 | 2 +-
.../azuredisk/templates/azure-csi-azuredisk-controller.yml.j2 | 2 +-
.../azuredisk/templates/azure-csi-azuredisk-node.yml.j2 | 2 +-
.../templates/alb-ingress-clusterrole.yml.j2 | 2 +-
.../templates/alb-ingress-clusterrolebinding.yml.j2 | 2 +-
.../ingress_controller/ingress_nginx/README.md | 3 ---
.../ingress_controller/ingress_nginx/defaults/main.yml | 2 +-
.../calico/templates/calico-kube-controllers.yml.j2 | 2 +-
roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 | 2 +-
.../node/templates/manifests/nginx-proxy.manifest.j2 | 2 +-
roles/network_plugin/calico/templates/calico-typha.yml.j2 | 2 +-
roles/network_plugin/flannel/templates/cni-flannel.yml.j2 | 4 ++--
roles/network_plugin/multus/templates/multus-daemonset.yml.j2 | 2 +-
.../kubernetes_patch/files/nodeselector-os-linux-patch.json | 2 +-
21 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/docs/azure-csi.md b/docs/azure-csi.md
index e121c8874..811b5b078 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 85383b48e..133c80fd5 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 81903f3dc..a75965acd 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 4a966e477..e30a68b3d 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 eafb1029f..6208e8964 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 af57ceb6f..bbf6d99d6 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 e807c202b..947c0d310 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 e1a7867cf..9175e24b3 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 b9cd4dc4f..3b3b7e2b5 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 08957781a..45046a021 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 4522635ef..4d776f149 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 4f14f6a99..71068f48b 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 677cb4975..6a4c33c7e 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 98cfbfba4..409468436 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 cf4516f4a..b5db15c56 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 6210b30fc..a557d6e60 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 b4ea84c58..b05977d93 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 dbff96514..279e694c1 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 f654a4e83..fb84d4358 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 0175a0c3f..5572feb42 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 d718ff446..d6a7761da 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
--
GitLab