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
This commit is contained in:
Aleksandr Didenko
2016-11-14 13:03:54 +01:00
parent f6233ffc9a
commit caa81f3ac2
6 changed files with 73 additions and 8 deletions

View File

@@ -9,3 +9,7 @@ canal_masquerade: "true"
# Log-level
canal_log_level: "info"
# Etcd SSL dirs
canal_cert_dir: /etc/canal/certs
etcd_cert_dir: /etc/ssl/etcd/ssl