Changes in Kubernetes and Calico-CNI plugin config files

required for usage of Calico CNI plugin version 1.4.2
2016-10-06 13:06:19 +03:00
parent c490e5c8a1
commit a6344f7561
2 changed files with 4 additions and 1 deletions
--- a/roles/kubernetes/node/templates/cni-calico.conf.j2
+++ b/roles/kubernetes/node/templates/cni-calico.conf.j2
@ -1,9 +1,11 @@
 {
  "name": "calico-k8s-network",
  "type": "calico",
-  "etcd_authority": "{{ etcd_authority }}",
  "log_level": "info",
  "ipam": {
    "type": "calico-ipam"
+  },
+  "kubernetes": {
+    "kubeconfig": "{{ kube_config_dir }}/node-kubeconfig.yaml"
  }
 }
--- a/roles/kubernetes/node/templates/node-kubeconfig.yaml.j2
+++ b/roles/kubernetes/node/templates/node-kubeconfig.yaml.j2
@ -4,6 +4,7 @@ clusters:
 - name: local
  cluster:
    certificate-authority: {{ kube_cert_dir }}/ca.pem
+    server: http://127.0.0.1:8080
 users:
 - name: kubelet
  user: