Merge pull request #602 from adidenko/fix-canal-ssl

Fix etcd ssl for canal

roles/kubernetes/node/tasks/main.yml

@@ -11,13 +11,6 @@
     owner: kube
   when: kube_network_plugin == "calico"
 
-- name: Write Canal cni config
-  template:
-    src: "cni-canal.conf.j2"
-    dest: "/etc/cni/net.d/10-canal.conf"
-    owner: kube
-  when: kube_network_plugin == "canal"
-
 - name: Write kubelet config file
   template: src=kubelet.j2 dest={{ kube_config_dir }}/kubelet.env backup=yes
   notify:

roles/kubernetes/node/templates/cni-canal.conf.j2

@@ -1,15 +0,0 @@
-{
-  "name": "canal-k8s-network",
-  "type": "flannel",
-  "delegate": {
-    "type": "calico",
-    "etcd_endpoints": "{{ etcd_access_endpoint }}",
-    "log_level": "info",
-    "policy": {
-      "type": "k8s"
-    },
-    "kubernetes": {
-      "kubeconfig": "{{ kube_config_dir }}/node-kubeconfig.yaml"
-    }
-  }
-}