Allow for local CNI binaries and configuration files with KUBERNETES_PROVIDER=vagrant.

Files are taken from cluster/network-plugins/{bin,conf} to be consumed within a vagrant kube-up.sh environment. Paths used for configuration files and the 'cni' name of the network provider are all from the kubernetes documentation, but the actual implementation in the salt automation doesn't seem to exist.

Allow for local CNI binaries and configuration files with KUBERNETES_PROVIDER=vagrant.
ce220836 · Matt Johnson · 46e6df65 · ce220836
Commit ce220836 authored Mar 30, 2016 by Matt Johnson
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 0 deletions

init.sls cluster/saltbase/salt/cni/init.sls +21 -0

No files found.
--- a/cluster/saltbase/salt/cni/init.sls
+++ b/cluster/saltbase/salt/cni/init.sls
@@ -5,6 +5,13 @@
    - mode: 755
    - makedirs: True

+/etc/cni/net.d:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: 755
+    - makedirs: True
+
 # These are all available CNI network plugins.
 cni-tar:
  archive:
@@ -18,3 +25,17 @@ cni-tar:
    - archive_format: tar
    - if_missing: /opt/cni/bin

+{% if grains['cloud'] is defined and grains.cloud in [ 'vagrant' ]  %}
+# Install local CNI network plugins in a Vagrant environment
+cmd-local-cni-plugins:
+   cmd.run:
+      - name: |
+         cp -v /vagrant/cluster/network-plugins/cni/bin/* /opt/cni/bin/.
+         chmod +x /opt/cni/bin/*
+cmd-local-cni-config:
+   cmd.run:
+      - name: |
+         cp -v /vagrant/cluster/network-plugins/cni/config/* /etc/cni/net.d/.
+         chown root:root /etc/cni/net.d/*
+         chmod 744 /etc/cni/net.d/*
+{% endif -%}