Merge pull request #3959 from elementyang/pr-ingress

fix ingress nodeSelector label

inventory/sample/group_vars/k8s-cluster/addons.yml

@@ -50,7 +50,7 @@ cephfs_provisioner_enabled: false
 ingress_nginx_enabled: false
 # ingress_nginx_host_network: false
 # ingress_nginx_nodeselector:
-#   node-role.kubernetes.io/master: ""
+#   node-role.kubernetes.io/node: ""
 # ingress_nginx_tolerations:
 #   - key: "node-role.kubernetes.io/master"
 #     operator: "Equal"

roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml

@@ -2,7 +2,7 @@
 ingress_nginx_namespace: "ingress-nginx"
 ingress_nginx_host_network: false
 ingress_nginx_nodeselector:
-  node-role.kubernetes.io/master: ""
+  node-role.kubernetes.io/node: ""
 ingress_nginx_tolerations: []
 ingress_nginx_insecure_port: 80
 ingress_nginx_secure_port: 443