openstack
/
salt-formula-kubernetes
Code Issues Proposed changes

temporary disabled members for kubelet

This commit is contained in:
Jakub Pavlik 2016-07-17 20:28:20 +02:00
parent 4a2c070f85
commit 91c70374d8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kubernetes/files/kubelet/default.pool
View File

@ -1,4 +1,4 @@
{%- from "kubernetes/map.jinja" import pool with context %}
# test_args has to be kept at the end, so they'll overwrite any prior configuration
DAEMON_ARGS="--api-servers={% for member in pool.apiserver.members %}https://{{ member.host }}{% if not loop.last %},{% endif %}{% endfor %} --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --config=/etc/kubernetes/manifests --allow-privileged={{ pool.kubelet.allow_privileged }} --cluster_dns={{ pool.cluster_dns }} --cluster_domain={{ pool.cluster_domain }} --v=2 {% if pool.network.engine == 'opencontrail' %}--network-plugin={{ pool.network.engine }}{% endif %} {% if pool.network.engine == 'calico' %}--network-plugin=cni --network-plugin-dir=/etc/cni/net.d{% endif %} --file-check-frequency={{ pool.kubelet.frequency }}"
DAEMON_ARGS="--api-servers={% for member in pool.apiserver.members %}{%- if pool.apiserver.insecure.enabled %}http://{{ member.host }}:8080{%- else %}https://{{ member.host }}{%- endif %}{% if not loop.last %},{% endif %}{% endfor %} --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --config=/etc/kubernetes/manifests --allow-privileged={{ pool.kubelet.allow_privileged }} --cluster_dns={{ pool.cluster_dns }} --cluster_domain={{ pool.cluster_domain }} --v=2 {% if pool.network.engine == 'opencontrail' %}--network-plugin={{ pool.network.engine }}{% endif %} {% if pool.network.engine == 'calico' %}--network-plugin=cni --network-plugin-dir=/etc/cni/net.d{% endif %} --file-check-frequency={{ pool.kubelet.frequency }}"

8
metadata/service/pool/cluster.yml
View File

@ -17,9 +17,11 @@ parameters:
insecure:
enabled: True
members:
- host: ${_param:cluster_node01_address}
- host: ${_param:cluster_node02_address}
- host: ${_param:cluster_node03_address}
- host: ${_param:cluster_vip_address}
# Temporary disabled until kubelet HA would be fixed
# - host: ${_param:cluster_node01_address}
# - host: ${_param:cluster_node02_address}
# - host: ${_param:cluster_node03_address}
address: ${_param:cluster_local_address}
cluster_dns: 10.254.0.10
cluster_domain: cluster.local