From 6103d673b708cbf4e2da140c7816bbf95bb5cc1b Mon Sep 17 00:00:00 2001 From: Smaine Kahlouch Date: Mon, 4 Jan 2016 14:23:57 +0100 Subject: [PATCH] New calico's configuration --- roles/kubernetes/node/tasks/main.yml | 3 --- .../node/templates/kubelet.service.j2 | 1 - .../templates/calico/calico-node.service.j2 | 1 - .../templates/calico/calico.conf.j2} | 22 +++---------------- 4 files changed, 3 insertions(+), 24 deletions(-) rename roles/{kubernetes/node/templates/network-environment.j2 => network_plugin/templates/calico/calico.conf.j2} (51%) mode change 100755 => 100644 diff --git a/roles/kubernetes/node/tasks/main.yml b/roles/kubernetes/node/tasks/main.yml index f1269d6d6..5e54c51be 100644 --- a/roles/kubernetes/node/tasks/main.yml +++ b/roles/kubernetes/node/tasks/main.yml @@ -42,9 +42,6 @@ src: manifests/kube-proxy.manifest.j2 dest: "{{ kube_manifest_dir }}/kube-proxy.manifest" -- name: Write network-environment - template: src=network-environment.j2 dest=/etc/network-environment mode=640 - - name: Enable kubelet service: name: kubelet diff --git a/roles/kubernetes/node/templates/kubelet.service.j2 b/roles/kubernetes/node/templates/kubelet.service.j2 index cd7d0a947..c6fb53e4a 100644 --- a/roles/kubernetes/node/templates/kubelet.service.j2 +++ b/roles/kubernetes/node/templates/kubelet.service.j2 @@ -9,7 +9,6 @@ After=docker.service [Service] EnvironmentFile=/etc/kubernetes/kubelet -EnvironmentFile=/etc/network-environment ExecStart={{ bin_dir }}/kubelet \ $KUBE_LOGTOSTDERR \ $KUBE_LOG_LEVEL \ diff --git a/roles/network_plugin/templates/calico/calico-node.service.j2 b/roles/network_plugin/templates/calico/calico-node.service.j2 index a78ef4ffb..ba594c758 100644 --- a/roles/network_plugin/templates/calico/calico-node.service.j2 +++ b/roles/network_plugin/templates/calico/calico-node.service.j2 @@ -5,7 +5,6 @@ Requires=docker.service After=docker.service etcd2.service [Service] -EnvironmentFile=/etc/network-environment User=root PermissionsStartOnly=true {% if inventory_hostname in groups['kube-node'] and peer_with_router|default(false)%} diff --git a/roles/kubernetes/node/templates/network-environment.j2 b/roles/network_plugin/templates/calico/calico.conf.j2 old mode 100755 new mode 100644 similarity index 51% rename from roles/kubernetes/node/templates/network-environment.j2 rename to roles/network_plugin/templates/calico/calico.conf.j2 index 20bd60311..ec17f6e37 --- a/roles/kubernetes/node/templates/network-environment.j2 +++ b/roles/network_plugin/templates/calico/calico.conf.j2 @@ -1,24 +1,10 @@ -#! /usr/bin/bash -{% if kube_network_plugin == "calico" %} -# This node's IPv4 address +[config] CALICO_IPAM=true DEFAULT_IPV4={{ip | default(ansible_default_ipv4.address) }} -# The kubernetes master IP -{% if loadbalancer_apiserver is defined and apiserver_loadbalancer_domain_name is defined %} -KUBERNETES_MASTER=https://{{ apiserver_loadbalancer_domain_name }}:{{ loadbalancer_apiserver.port }} -{% else %} -KUBERNETES_MASTER={{ hostvars[groups['kube-master'][0]]['ip'] | default(hostvars[groups['kube-master'][0]]['ansible_default_ipv4']['address']) }} -{% endif %} - # Location of etcd cluster used by Calico. By default, this uses the etcd # instance running on the Kubernetes Master -ETCD_AUTHORITY="127.0.0.1:2379" -#{% if inventory_hostname in groups['etcd'] %} -#ETCD_AUTHORITY="127.0.0.1:2379" -#{% else %} -#ETCD_AUTHORITY="127.0.0.1:23799" -#{% endif %} +ETCD_AUTHORITY=127.0.0.1:2379 # The kubernetes-apiserver location - used by the calico plugin {% if loadbalancer_apiserver is defined and apiserver_loadbalancer_domain_name is defined %} @@ -26,9 +12,7 @@ KUBE_API_ROOT=https://{{ apiserver_loadbalancer_domain_name }}:{{ loadbalancer_a {% else %} KUBE_API_ROOT=https://{{ hostvars[groups['kube-master'][0]]['ip'] | default(hostvars[groups['kube-master'][0]]['ansible_default_ipv4']['address']) }}:{{kube_apiserver_port}}/api/v1/ {% endif %} -{% else %} -FLANNEL_ETCD_PREFIX="--etcd-prefix=/{{ cluster_name }}/network" -{% endif %} +# Kubernetes authentication token {% if calico_token is defined | default('') %} KUBE_AUTH_TOKEN={{ calico_token.content|b64decode }} {% endif %}