Cleanup some tasks and manage differences between Kubernetes version and apt package version

roles/kubernetes/defaults/main.yml

@@ -4,7 +4,8 @@ kubernetes_apt_key: https://packages.cloud.google.com/apt/doc/apt-key.gpg
 kubernetes_apt_channel: main
 kubernetes_release: xenial
 # versions can be found here
-kubernetes_version: v1.11.3
+kubernetes_version: 1.11.3
+kubernetes_version_apt: "{{kubernetes_version}}-00"
 kubernetes_port: 6443
 
 # kubeadm

roles/kubernetes/tasks/main.yml

@@ -8,9 +8,6 @@
   - "'k8s_masters' in group_names"
   - groups.k8s_masters | length > 1
 
-# at this point everyone should be able to ping the api floating ip if multimaster
-# add a test here and don't continue until everyone does not ping the api ip
-
 - name: Install iputils-ping
   apt:
     name: iputils-ping
@@ -23,8 +20,10 @@
 - name: Check all hosts can ping API floating IP
   shell: "ping {{ api_floating_ip }} -c 1"
   register: result
+  until: ('100% packet loss' not in result.stdout)
+  retries: 15
+  delay: 10
   changed_when: no
-  failed_when: ('100% packet loss' in result.stdout)
 
 
 - include: packages.yml
@@ -37,7 +36,7 @@
 # add masters
 - block:
     # docker-in-docker sometimes hangs pulling images so explicitly do it here
-    - include: docker-images.yml
+    #- include: docker-images.yml
 
     - include: kubeadm-master.yml
       when: inventory_hostname == initial_master
@@ -51,7 +50,7 @@
 - name: Wait for coredns to be running
   shell: "kubectl get pods --namespace=kube-system | grep coredns | grep Running | wc -l"
   register: result
-  until: result.stdout.find("2") != -1
+  until: ("2" in result.stdout)
   retries: 180
   delay: 10
   changed_when: no
@@ -68,7 +67,7 @@
 - name: Wait for all nodes to be ready
   shell: "kubectl get nodes {{ ansible_hostname }} | tail -n+2 | awk '{ print $2 }'"
   register: result
-  until: result.stdout.find("Ready") == 0
+  until: ("Ready" in result.stdout)
   retries: 36
   delay: 10
   changed_when: no

roles/kubernetes/tasks/packages.yml

@@ -12,8 +12,7 @@
 
 - name: Installing kubernetes core components (kubectl, kubelet ...)
   apt:
-    name: ['kubelet', 'kubeadm', 'kubectl', 'kubernetes-cni']
-    state: latest
+    name: ['kubelet={{kubernetes_version_apt}}', 'kubeadm={{kubernetes_version_apt}}', 'kubectl={{kubernetes_version_apt}}']
   register: result
   retries: 3
   until: result is success

roles/kubernetes/templates/kubeadm-config.j2

@@ -10,7 +10,7 @@ etcd:
 {% endfor %}
 networking:
   podSubnet: "{{ pod_subnet }}"
-kubernetesVersion: "{{ kubernetes_version }}"
+kubernetesVersion: "v{{ kubernetes_version }}"
 apiServerCertSANs:
 {% for host in groups['k8s_masters'] %}
 - "{{ hostvars[host]['vpn_ip'] }}"

roles/proxy/tasks/keepalived.yml

@@ -1,2 +1,3 @@
 ---
+#TODO
 - debug: msg="Not Implemented"