From ac6b8dcf6a18f549c710f38342bafc0495498bf4 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Wed, 20 Sep 2017 16:43:17 +0100
Subject: [PATCH] kubernetes: more flexible selection of network stack

Also move to 50 in the ordering so things can be added before as well as after.

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 projects/kubernetes/.gitignore |  2 ++
 projects/kubernetes/Makefile   | 15 +++++++++------
 projects/kubernetes/kube.yml   |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/projects/kubernetes/.gitignore b/projects/kubernetes/.gitignore
index 87935610d..6af0a22b7 100644
--- a/projects/kubernetes/.gitignore
+++ b/projects/kubernetes/.gitignore
@@ -2,3 +2,5 @@ image-cache/common/*.tar
 image-cache/common/Dockerfile
 image-cache/control-plane/*.tar
 image-cache/control-plane/Dockerfile
+weave.yaml
+network.yaml
diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile
index 8b8c6d19e..a17d706a2 100644
--- a/projects/kubernetes/Makefile
+++ b/projects/kubernetes/Makefile
@@ -1,9 +1,8 @@
 KUBE_RUNTIME ?= docker
-
-WEAVE_VERSION := v2.0.4
+NETWORK ?= weave-v2.0.4
 
 INIT_YAML ?=
-INIT_YAML += weave.yaml
+INIT_YAML += network.yaml
 
 all: tag-container-images build-vm-images
 
@@ -26,10 +25,14 @@ kube-master.iso: kube.yml $(KUBE_RUNTIME).yml $(KUBE_RUNTIME)-master.yml $(INIT_
 kube-node.iso: kube.yml $(KUBE_RUNTIME).yml
 	moby build -name kube-node -format iso-efi -format iso-bios $^
 
-weave.yaml:
-	curl -L -o $@ https://cloud.weave.works/k8s/v1.7/net?v=$(WEAVE_VERSION)
+network.yaml: $(NETWORK).yaml
+	ln -nf $< $@
+
+weave-%.yaml:
+	curl -L -o $@ https://cloud.weave.works/k8s/v1.7/net?v=$*
 
 clean:
 	rm -f -r \
-	  kube-*-kernel kube-*-cmdline kube-*-state kube-*-initrd.img *.iso
+	  kube-*-kernel kube-*-cmdline kube-*-state kube-*-initrd.img *.iso \
+	  weave-*.yaml network.yaml
 	$(MAKE) -C image-cache clean
diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml
index 7aba213b5..fd0e1f450 100644
--- a/projects/kubernetes/kube.yml
+++ b/projects/kubernetes/kube.yml
@@ -42,8 +42,8 @@ files:
     metadata: yaml
   - path: /etc/kubernetes
     symlink: "/var/lib/kubeadm"
-  - path: /etc/kubeadm/kube-system.init/01-weave.yaml
-    source: weave.yaml
+  - path: /etc/kubeadm/kube-system.init/50-network.yaml
+    source: network.yaml
   - path: /etc/sysctl.d/01-kubernetes.conf
     contents: 'net.ipv4.ip_forward = 1'
   - path: /opt/cni