Fix nodeselectors for contiv and nginx-ingress (#4662)
* Fix nodeselectors for contiv and nginx-ingress Change-Id: Ib3eb6bd87193c69a90ee944c9164a0b6792c79ba * Set kube proxy mode to iptables for addons task Change-Id: Iff71a71f672405c74b4708c71db15ddc4391a53apull/4338/head
parent
b8f0de3074
commit
741de6051c
|
@ -79,7 +79,7 @@ rbd_provisioner_enabled: false
|
||||||
ingress_nginx_enabled: false
|
ingress_nginx_enabled: false
|
||||||
# ingress_nginx_host_network: false
|
# ingress_nginx_host_network: false
|
||||||
# ingress_nginx_nodeselector:
|
# ingress_nginx_nodeselector:
|
||||||
# node-role.kubernetes.io/node: ""
|
# beta.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,7 +2,7 @@
|
||||||
ingress_nginx_namespace: "ingress-nginx"
|
ingress_nginx_namespace: "ingress-nginx"
|
||||||
ingress_nginx_host_network: false
|
ingress_nginx_host_network: false
|
||||||
ingress_nginx_nodeselector:
|
ingress_nginx_nodeselector:
|
||||||
node-role.kubernetes.io/node: ""
|
beta.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
|
||||||
|
|
|
@ -20,8 +20,13 @@ spec:
|
||||||
{% endif %}
|
{% endif %}
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
hostPID: true
|
hostPID: true
|
||||||
nodeSelector:
|
affinity:
|
||||||
node-role.kubernetes.io/node: ""
|
nodeAffinity:
|
||||||
|
requiredDuringSchedulingIgnoredDuringExecution:
|
||||||
|
nodeSelectorTerms:
|
||||||
|
- matchExpressions:
|
||||||
|
- key: node-role.kubernetes.io/master
|
||||||
|
operator: DoesNotExist
|
||||||
containers:
|
containers:
|
||||||
- name: contiv-etcd-proxy
|
- name: contiv-etcd-proxy
|
||||||
image: {{ contiv_etcd_image_repo }}:{{ contiv_etcd_image_tag }}
|
image: {{ contiv_etcd_image_repo }}:{{ contiv_etcd_image_tag }}
|
||||||
|
|
|
@ -6,6 +6,7 @@ mode: ha
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
kubeadm_control_plane: true
|
kubeadm_control_plane: true
|
||||||
kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085
|
kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085
|
||||||
|
kube_proxy_mode: iptables
|
||||||
kube_network_plugin: flannel
|
kube_network_plugin: flannel
|
||||||
helm_enabled: true
|
helm_enabled: true
|
||||||
kubernetes_audit: true
|
kubernetes_audit: true
|
||||||
|
|
Loading…
Reference in New Issue