Fix etcd ssl for canal

- Move CNI configuration from `kubernetes/node` role to
`network_plugin/canal`
- Create SSL dir for Canal and symlink etcd SSL files
- Add needed options to `canal-config` configmap
- Run flannel and calico-node containers with proper configuration

roles/network_plugin/canal/templates/canal-config.yml.j2

@@ -20,3 +20,8 @@ data:
 
   # Cluster name for Flannel etcd path
   cluster_name: "{{ cluster_name }}"
+
+  # SSL Etcd configuration
+  etcd_cafile: "{{ canal_cert_dir }}/ca_cert.crt"
+  etcd_certfile: "{{ canal_cert_dir }}/cert.crt"
+  etcd_keyfile: "{{ canal_cert_dir }}/key.pem"

roles/network_plugin/canal/templates/canal-node.yml.j2

@@ -40,6 +40,9 @@ spec:
         - name: resolv
           hostPath:
             path: /etc/resolv.conf
+        - name: "canal-certs"
+          hostPath:
+            path: "{{ canal_cert_dir }}"
       containers:
         # Runs the flannel daemon to enable vxlan networking between
         # container hosts.
@@ -76,10 +79,26 @@ spec:
             # Write the subnet.env file to the mounted directory.
             - name: FLANNELD_SUBNET_FILE
               value: "/run/flannel/subnet.env"
+            # Etcd SSL vars
+            - name: ETCD_CA_CERT_FILE
+              valueFrom:
+                configMapKeyRef:
+                  name: canal-config
+                  key: etcd_cafile
+            - name: ETCD_CERT_FILE
+              valueFrom:
+                configMapKeyRef:
+                  name: canal-config
+                  key: etcd_certfile
+            - name: ETCD_KEY_FILE
+              valueFrom:
+                configMapKeyRef:
+                  name: canal-config
+                  key: etcd_keyfile
           command:
             - "/bin/sh"
             - "-c"
-            - "/opt/bin/flanneld -etcd-prefix /$(CLUSTER_NAME)/network"
+            - "/opt/bin/flanneld -etcd-prefix /$(CLUSTER_NAME)/network -etcd-cafile $(ETCD_CA_CERT_FILE) -etcd-certfile $(ETCD_CERT_FILE) -etcd-keyfile $(ETCD_KEY_FILE)"
           ports:
             - hostPort: 10253
               containerPort: 10253
@@ -90,6 +109,8 @@ spec:
               mountPath: "/etc/resolv.conf"
             - name: "run-flannel"
               mountPath: "/run/flannel"
+            - name: "canal-certs"
+              mountPath: "{{ canal_cert_dir }}"
         # Runs calico/node container on each Kubernetes node.  This
         # container programs network policy and local routes on each
         # host.
@@ -108,6 +129,22 @@ spec:
             # Disable file logging so `kubectl logs` works.
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
+            # Etcd SSL vars
+            - name: ETCD_CA_CERT_FILE
+              valueFrom:
+                configMapKeyRef:
+                  name: canal-config
+                  key: etcd_cafile
+            - name: ETCD_CERT_FILE
+              valueFrom:
+                configMapKeyRef:
+                  name: canal-config
+                  key: etcd_certfile
+            - name: ETCD_KEY_FILE
+              valueFrom:
+                configMapKeyRef:
+                  name: canal-config
+                  key: etcd_keyfile
           securityContext:
             privileged: true
           volumeMounts:
@@ -117,3 +154,5 @@ spec:
             - mountPath: /var/run/calico
               name: var-run-calico
               readOnly: false
+            - name: "canal-certs"
+              mountPath: "{{ canal_cert_dir }}"

roles/network_plugin/canal/templates/cni-canal.conf.j2

@@ -0,0 +1,15 @@
+{
+  "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"
+    }
+  }
+}