Merge pull request #24 from kitt1987/versioned-kubeproxy

versioned kubeproxy for v1.9

Author: kitt1987

ansible.cfg

@@ -5,5 +5,4 @@ host_key_checking = False
 any_unparsed_is_failed = True
 
 [ssh_connection]
-control_path = /root/.ansible-ssh/cp-%%h-%%p-%%r
 pipelining = True

roles/common/tasks/init-manifest-template-path.yml

@@ -10,6 +10,7 @@
   set_fact:
     k8s_manifest_template: "manifests"
     kubelet_conf_template: "default"
+    kubeproxy_template: "default"
   delegate_facts: True
   delegate_to: "{{ item }}"
   with_inventory_hostnames:
@@ -48,4 +49,19 @@
   delegate_to: "{{ item }}"
   with_inventory_hostnames:
     - kubernetes_nodes
-  when: kube_release_version is defined and particular_kubelet.stat.isdir is defined and particular_kubelet.stat.isdir
+  when: kube_release_version is defined and particular_kubelet.stat.isdir is defined and particular_kubelet.stat.isdir
+
+- name: Check if the particular kubeproxy configuration for version {{ kube_release_version }} exists
+  stat:
+    path: "{{ playbook_dir }}/roles/kube-proxy/templates/{{ major_k8s_version }}"
+  register: particular_kubeproxy
+  when: kube_release_version is defined
+
+- name: Set path of kubeproxy configuration
+  set_fact:
+    kubeproxy_template: "{{ major_k8s_version }}"
+  delegate_facts: True
+  delegate_to: "{{ item }}"
+  with_inventory_hostnames:
+    - kubernetes_nodes
+  when: kube_release_version is defined and particular_kubeproxy.stat.isdir is defined and particular_kubeproxy.stat.isdir

roles/kube-proxy/tasks/main.yml

@@ -1,7 +1,6 @@
-#FIXME versioned manifest for KubeProxy
 - name: Replicate kube-proxy manifests
   template:
-    src: kube-proxy.yml.j2
+    src: "{{ kubeproxy_template }}/kube-proxy.yml.j2"
     dest: "/tmp/kube-proxy.yml"
 
 - name: Create SA for kube-proxy

…s/kube-proxy/templates/kube-proxy.yml.j2 …e-proxy/templates/v1.9/kube-proxy.yml.j2roles/kube-proxy/templates/kube-proxy.yml.j2 renamed to roles/kube-proxy/templates/v1.9/kube-proxy.yml.j2 roles/kube-proxy/templates/kube-proxy.yml.j2 renamed to roles/kube-proxy/templates/v1.9/kube-proxy.yml.j2

@@ -56,7 +56,7 @@ spec:
         - /usr/local/bin/kube-proxy
         - --config=/var/lib/kube-proxy/config.conf
         - --cluster-cidr={{ pod_cidr }}
-        image: k8s.gcr.io/kube-proxy:{{kube_release_version}}
+        image: gcr.io/google_containers/kube-proxy:{{kube_release_version}}
         imagePullPolicy: IfNotPresent
         name: kube-proxy
         securityContext:

roles/net-plugin/tasks/prepare.yml

@@ -1,2 +1,3 @@
 - name: Prepare network plugin
-  include_tasks: "{{ cni_plugin }}-prepare.yml"
+  include_tasks: "{{ cni_plugin }}-prepare.yml"
+  when: cni_plugin != ""

run/simple-kube.sh

@@ -5,6 +5,6 @@
 
 docker run --name simple-kube --net=host -ti --rm \
   -e http_proxy="${http_proxy}" -e https_proxy="${https_proxy}" -e no_proxy="${no_proxy}" \
-  --mount type=tmpfs,destination=/root/.ansible-ssh \
+  --mount type=tmpfs,destination=/root/.ansible/cps \
   -v /var/run/docker.sock:/var/run/docker.sock \
   kitt0hsu/simple-kube