From e1e13b68b39ffa1503a22ac57e4a72da77574ab0 Mon Sep 17 00:00:00 2001 From: elementyang Date: Sat, 29 Dec 2018 14:41:23 +0800 Subject: [PATCH] fix ingress nodeSelector label --- inventory/sample/group_vars/k8s-cluster/addons.yml | 2 +- .../ingress_controller/ingress_nginx/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/sample/group_vars/k8s-cluster/addons.yml b/inventory/sample/group_vars/k8s-cluster/addons.yml index 7f2437754..bc120e5a6 100644 --- a/inventory/sample/group_vars/k8s-cluster/addons.yml +++ b/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: "key" # operator: "Equal" 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 b0d260a4b..e330817de 100644 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml +++ b/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