openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "KubeADM: force calico interface to match to same as kubelet"

Browse Source
This commit is contained in:
Zuul 2018-03-09 00:32:34 +00:00 committed by Gerrit Code Review
commit 3a552b4200
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/helm-cni.yaml
View File

@ -63,7 +63,7 @@
environment: environment:
KUBECONFIG: '/mnt/rootfs/etc/kubernetes/admin.conf' KUBECONFIG: '/mnt/rootfs/etc/kubernetes/admin.conf'
- name: kubeadm | cni | calico - name: kubeadm | cni | calico
command: helm install /opt/charts/calico --name calico --namespace kube-system --set networking.podSubnet="{{ k8s.networking.podSubnet }}" --set networking.mtu="{{ cni_default_device_mtu.stdout }}" --wait --timeout=600 command: helm install /opt/charts/calico --name calico --namespace kube-system --set networking.podSubnet="{{ k8s.networking.podSubnet }}" --set conf.node.IP_AUTODETECTION_METHOD="can-reach={% if k8s.api.advertiseAddress is defined %}{{ k8s.api.advertiseAddress }}{% else %}{% if k8s.api.advertiseAddressDevice is defined %}{{ hostvars[inventory_hostname]['ansible_'+k8s.api.advertiseAddressDevice].ipv4.address }}{% else %}{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}{% endif %}{% endif %}" --set networking.mtu="{{ cni_default_device_mtu.stdout }}" --wait --timeout=600
environment: environment:
HELM_HOST: 'localhost:44134' HELM_HOST: 'localhost:44134'
- name: kubeadm | cni | calico - name: kubeadm | cni | calico