Merge pull request #591 from kubernetes-incubator/etcdtls

Add etcd tls support
This commit is contained in:
Matthew Mosesohn
2016-11-10 12:32:13 +03:00
committed by GitHub
37 changed files with 457 additions and 409 deletions

View File

@@ -1,6 +1,10 @@
{
"name": "calico-k8s-network",
"type": "calico",
"etcd_endpoints": "{{ etcd_access_endpoint }}",
"etcd_cert_file": "{{ etcd_cert_dir }}/node.pem",
"etcd_key_file": "{{ etcd_cert_dir }}/node-key.pem",
"etcd_ca_cert_file": "{{ etcd_cert_dir }}/ca.pem",
"log_level": "info",
"ipam": {
"type": "calico-ipam"