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

Fix nodeselectors for contiv and nginx-ingress (#4662)

Browse source 
* Fix nodeselectors for contiv and nginx-ingress

Change-Id: Ib3eb6bd87193c69a90ee944c9164a0b6792c79ba

* Set kube proxy mode to iptables for addons task

Change-Id: Iff71a71f672405c74b4708c71db15ddc4391a53a
This commit is contained in:
Matthew Mosesohn 2019-04-29 09:36:19 +03:00 committed by Kubernetes Prow Robot
parent b8f0de3074
commit 741de6051c
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
View file

@ -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

9
roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2
View file

@ -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 }}

1
tests/files/packet_centos7-flannel-addons.yml
View file

@ -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