commit 91c70374d8ad6700ca354376968050a0a17015aa
author Jakub Pavlik <pavlk.jakub@gmail.com> Sun Jul 17 20:28:20 2016 +0200
committer Jakub Pavlik <pavlk.jakub@gmail.com> Mon Jul 18 10:56:43 2016 +0200
tree 88d5bb5390db5c31da196b08a041fb3f63fc1bab
parent 4a2c070f8505a402bc3f7e575aed6517c6633bac

temporary disabled members for kubelet

kubernetes/files/kubelet/default.pool

diff --git a/kubernetes/files/kubelet/default.pool b/kubernetes/files/kubelet/default.pool
index 2670e39..52bf112 100644
--- a/kubernetes/files/kubelet/default.pool
+++ b/kubernetes/files/kubelet/default.pool
@@ -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 }}"
\ No newline at end of file
+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 }}"
\ No newline at end of file

metadata/service/pool/cluster.yml

diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index 81db6df..437fb34 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -17,9 +17,11 @@
         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