Tailor Makefile post extraction

Add various .gitignore entries.

Signed-off-by: Ian Campbell <[email protected]>

Author: Ian Campbell

.gitignore

@@ -0,0 +1,5 @@
+*.iso
+kube-*-kernel
+kube-*-cmdline
+kube-*-initrd.img
+kube-weave.yaml

Makefile

@@ -11,27 +11,15 @@ endif
 
 KUBE_FORMAT_ARGS := $(patsubst %,-format %,$(KUBE_FORMATS))
 
-all: build-container-images build-vm-images
+all: kube-master.iso kube-node.iso
 
-build-container-images:
-	linuxkit pkg build kubelet
-
-build-cache-images:
-	$(MAKE) -C image-cache build
-
-push-container-images:
-	linuxkit pkg push kubelet
-	$(MAKE) -C image-cache push
-
-build-vm-images: kube-master.iso kube-node.iso
-
-kube-master.iso: kube.yml $(KUBE_RUNTIME).yml $(KUBE_RUNTIME)-master.yml $(KUBE_NETWORK).yml
+kube-master.iso: yml/kube.yml yml/$(KUBE_RUNTIME).yml yml/$(KUBE_RUNTIME)-master.yml yml/$(KUBE_NETWORK).yml
 	moby build -name kube-master $(KUBE_FORMAT_ARGS) $^
 
-kube-node.iso: kube.yml $(KUBE_RUNTIME).yml $(KUBE_NETWORK).yml
+kube-node.iso: yml/kube.yml yml/$(KUBE_RUNTIME).yml yml/$(KUBE_NETWORK).yml
 	moby build -name kube-node $(KUBE_FORMAT_ARGS) $^
 
-weave.yml: kube-weave.yaml
+yml/weave.yml: kube-weave.yaml
 
 kube-weave.yaml:
 	curl -L -o $@ https://cloud.weave.works/k8s/v1.8/net?v=$(KUBE_NETWORK_WEAVE)
@@ -40,4 +28,3 @@ clean:
 	rm -f -r \
 	  kube-*-kernel kube-*-cmdline kube-*-state kube-*-initrd.img *.iso \
 	  kube-weave.yaml
-	$(MAKE) -C image-cache clean

pkg/image-cache/common/.gitignore

@@ -0,0 +1,3 @@
+*.tar
+Dockerfile
+

pkg/image-cache/control-plane/.gitignore

@@ -0,0 +1,3 @@
+*.tar
+Dockerfile
+