C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup deprecated labels beta.kubernetes.io/arch and beta.kubernetes.io/os (#5964)

Browse source
This commit is contained in:
Florian Ruynat 2020-04-17 14:51:06 +02:00 committed by GitHub
parent ea8b799ff0
commit 83fe607f62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/azure-csi.md
View file

@ -101,7 +101,7 @@ metadata:
name: nginx-azuredisk name: nginx-azuredisk
spec: spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- image: nginx - image: nginx
name: nginx-azuredisk name: nginx-azuredisk

2
inventory/sample/group_vars/k8s-cluster/addons.yml
View file

@ -84,7 +84,7 @@ ingress_nginx_enabled: false
# ingress_nginx_host_network: false # ingress_nginx_host_network: false
ingress_publish_status_address: "" ingress_publish_status_address: ""
# ingress_nginx_nodeselector: # ingress_nginx_nodeselector:
# beta.kubernetes.io/os: "linux" # kubernetes.io/os: "linux"
# ingress_nginx_tolerations: # ingress_nginx_tolerations:
# - key: "node-role.kubernetes.io/master" # - key: "node-role.kubernetes.io/master"
# operator: "Equal" # operator: "Equal"

2
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
View file

@ -26,7 +26,7 @@ spec:
spec: spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
serviceAccountName: coredns serviceAccountName: coredns
tolerations: tolerations:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master

2
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
View file

@ -38,7 +38,7 @@ spec:
supplementalGroups: [ 65534 ] supplementalGroups: [ 65534 ]
fsGroup: 65534 fsGroup: 65534
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
tolerations: tolerations:
- effect: NoSchedule - effect: NoSchedule
operator: Equal operator: Equal

2
roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
View file

@ -20,7 +20,7 @@ spec:
- effect: NoSchedule - effect: NoSchedule
operator: Exists operator: Exists
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: netchecker-agent - name: netchecker-agent
image: "{{ netcheck_agent_image_repo }}:{{ netcheck_agent_image_tag }}" image: "{{ netcheck_agent_image_repo }}:{{ netcheck_agent_image_tag }}"

2
roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
View file

@ -18,7 +18,7 @@ spec:
hostNetwork: true hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
priorityClassName: {% if netcheck_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}} priorityClassName: {% if netcheck_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
tolerations: tolerations:
- effect: NoSchedule - effect: NoSchedule

2
roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-controllerservice.yml.j2
View file

@ -17,7 +17,7 @@ spec:
app.kubernetes.io/name: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver
spec: spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
serviceAccount: ebs-csi-controller-sa serviceAccount: ebs-csi-controller-sa
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
tolerations: tolerations:

2
roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-nodeservice.yml.j2
View file

@ -17,7 +17,7 @@ spec:
app.kubernetes.io/name: aws-ebs-csi-driver app.kubernetes.io/name: aws-ebs-csi-driver
spec: spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
hostNetwork: true hostNetwork: true
priorityClassName: system-node-critical priorityClassName: system-node-critical
tolerations: tolerations:

2
roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2
View file

@ -17,7 +17,7 @@ spec:
hostNetwork: true hostNetwork: true
serviceAccountName: csi-azuredisk-controller-sa serviceAccountName: csi-azuredisk-controller-sa
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
tolerations: tolerations:
- key: "node-role.kubernetes.io/master" - key: "node-role.kubernetes.io/master"

2
roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-node.yml.j2
View file

@ -15,7 +15,7 @@ spec:
spec: spec:
hostNetwork: true hostNetwork: true
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
priorityClassName: system-node-critical priorityClassName: system-node-critical
containers: containers:
- name: liveness-probe - name: liveness-probe

2
roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrole.yml.j2
View file

@ -1,5 +1,5 @@
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: alb-ingress name: alb-ingress

2
roles/kubernetes-apps/ingress_controller/alb_ingress_controller/templates/alb-ingress-clusterrolebinding.yml.j2
View file

@ -1,5 +1,5 @@
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: alb-ingress name: alb-ingress

3
roles/kubernetes-apps/ingress_controller/ingress_nginx/README.md
View file

@ -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 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 ### Provider Specific Steps
There are cloud provider specific yaml files. There are cloud provider specific yaml files.

2
roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
View file

@ -3,7 +3,7 @@ ingress_nginx_namespace: "ingress-nginx"
ingress_nginx_host_network: false ingress_nginx_host_network: false
ingress_publish_status_address: "" ingress_publish_status_address: ""
ingress_nginx_nodeselector: ingress_nginx_nodeselector:
beta.kubernetes.io/os: "linux" kubernetes.io/os: "linux"
ingress_nginx_tolerations: [] ingress_nginx_tolerations: []
ingress_nginx_insecure_port: 80 ingress_nginx_insecure_port: 80
ingress_nginx_secure_port: 443 ingress_nginx_secure_port: 443

2
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
View file

@ -20,7 +20,7 @@ spec:
k8s-app: calico-kube-controllers k8s-app: calico-kube-controllers
spec: spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
hostNetwork: true hostNetwork: true
serviceAccountName: calico-kube-controllers serviceAccountName: calico-kube-controllers
tolerations: tolerations:

2
roles/kubernetes/node/templates/manifests/haproxy.manifest.j2
View file

@ -12,7 +12,7 @@ spec:
hostNetwork: true hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
priorityClassName: system-node-critical priorityClassName: system-node-critical
containers: containers:
- name: haproxy - name: haproxy

2
roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2
View file

@ -12,7 +12,7 @@ spec:
hostNetwork: true hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
priorityClassName: system-node-critical priorityClassName: system-node-critical
containers: containers:
- name: nginx-proxy - name: nginx-proxy

2
roles/network_plugin/calico/templates/calico-typha.yml.j2
View file

@ -48,7 +48,7 @@ spec:
cluster-autoscaler.kubernetes.io/safe-to-evict: 'true' cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
spec: spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
hostNetwork: true hostNetwork: true
tolerations: tolerations:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master

4
roles/network_plugin/flannel/templates/cni-flannel.yml.j2
View file

@ -94,11 +94,11 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
- matchExpressions: - matchExpressions:
- key: beta.kubernetes.io/os - key: kubernetes.io/os
operator: In operator: In
values: values:
- linux - linux
- key: beta.kubernetes.io/arch - key: kubernetes.io/arch
operator: In operator: In
values: values:
- amd64 - amd64

2
roles/network_plugin/multus/templates/multus-daemonset.yml.j2
View file

@ -21,7 +21,7 @@ spec:
hostNetwork: true hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
nodeSelector: nodeSelector:
beta.kubernetes.io/arch: amd64 kubernetes.io/arch: amd64
tolerations: tolerations:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists

2
roles/win_nodes/kubernetes_patch/files/nodeselector-os-linux-patch.json
View file

@ -1 +1 @@
{"spec":{"template":{"spec":{"nodeSelector":{"beta.kubernetes.io/os":"linux"}}}}} {"spec":{"template":{"spec":{"nodeSelector":{"kubernetes.io/os":"linux"}}}}}