From a6344f7561cdf6bf387a25cd6259eb0881347812 Mon Sep 17 00:00:00 2001 From: Sergey Vasilenko Date: Thu, 6 Oct 2016 13:06:19 +0300 Subject: [PATCH] Changes in Kubernetes and Calico-CNI plugin config files required for usage of Calico CNI plugin version 1.4.2 --- roles/kubernetes/node/templates/cni-calico.conf.j2 | 4 +++- roles/kubernetes/node/templates/node-kubeconfig.yaml.j2 | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/kubernetes/node/templates/cni-calico.conf.j2 b/roles/kubernetes/node/templates/cni-calico.conf.j2 index c48b084a5..c992d984d 100644 --- 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" } } diff --git a/roles/kubernetes/node/templates/node-kubeconfig.yaml.j2 b/roles/kubernetes/node/templates/node-kubeconfig.yaml.j2 index d21b8eef3..43a41eab6 100644 --- 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: