From 7e19d388212bcd27a7712b811e8c6bf164afa0fc Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Thu, 14 Sep 2017 16:45:33 +0100
Subject: [PATCH] kubernetes: use a common base kube yml file

With the master tailoring for docker now being in docker-master.yml,
kube-master and kube-node are identical, so just use a single kube.yml.

The reference to kube-master.yml in README.md is obsolete, so just drop it.

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 projects/kubernetes/Makefile                  |  8 +--
 projects/kubernetes/README.md                 |  2 -
 projects/kubernetes/kube-node.yml             | 52 -------------------
 .../kubernetes/{kube-master.yml => kube.yml}  |  0
 4 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 projects/kubernetes/kube-node.yml
 rename projects/kubernetes/{kube-master.yml => kube.yml} (100%)

diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile
index 8862f2868..034e519fd 100644
--- a/projects/kubernetes/Makefile
+++ b/projects/kubernetes/Makefile
@@ -14,11 +14,11 @@ push-container-images:
 
 build-vm-images: kube-master.iso kube-node.iso
 
-kube-master.iso: kube-master.yml $(KUBE_RUNTIME).yml $(KUBE_RUNTIME)-master.yml
-	moby build -name kube-master -format iso-efi -format iso-bios kube-master.yml $(KUBE_RUNTIME).yml $(KUBE_RUNTIME)-master.yml
+kube-master.iso: kube.yml $(KUBE_RUNTIME).yml $(KUBE_RUNTIME)-master.yml
+	moby build -name kube-master -format iso-efi -format iso-bios kube.yml $(KUBE_RUNTIME).yml $(KUBE_RUNTIME)-master.yml
 
-kube-node.iso: kube-node.yml $(KUBE_RUNTIME).yml
-	moby build -name kube-node -format iso-efi -format iso-bios kube-node.yml $(KUBE_RUNTIME).yml
+kube-node.iso: kube.yml $(KUBE_RUNTIME).yml
+	moby build -name kube-node -format iso-efi -format iso-bios kube.yml $(KUBE_RUNTIME).yml
 
 clean:
 	rm -f -r \
diff --git a/projects/kubernetes/README.md b/projects/kubernetes/README.md
index 3a1c6300d..d5e3a13a3 100644
--- a/projects/kubernetes/README.md
+++ b/projects/kubernetes/README.md
@@ -4,8 +4,6 @@ This project aims to demonstrate how one can create minimal and immutable Kubern
 
 Make sure to `cd projects/kubernetes` first.
 
-Edit `kube-master.yml` and add your public SSH key to `files` section.
-
 Build OS images:
 ```
 make build-vm-images
diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml
deleted file mode 100644
index a561be679..000000000
--- a/projects/kubernetes/kube-node.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-kernel:
-  image: linuxkit/kernel:4.9.50
-  cmdline: "console=tty0 console=ttyS0"
-init:
-  - linuxkit/init:851e9c3ad0574d640b733b92fdb26c368d2f7f8f
-  - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a
-  - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075
-  - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10
-onboot:
-  - name: sysctl
-    image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051
-    binds:
-     - /etc/sysctl.d/01-kubernetes.conf:/etc/sysctl.d/01-kubernetes.conf
-    readonly: false
-  - name: sysfs
-    image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9
-  - name: dhcpcd
-    image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7
-    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
-  - name: metadata
-    image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2
-  - name: format
-    image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382
-  - name: mounts
-    image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08
-    command: ["/usr/bin/mountie", "/var/lib/"]
-services:
-  - name: getty
-    image: linuxkit/getty:797cb79e0a229fcd16ebf44a0da74bcec03968ec
-    env:
-     - INSECURE=true
-  - name: rngd
-    image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e
-  - name: ntpd
-    image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
-  - name: sshd
-    image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0
-  - name: kubelet
-    image: linuxkitprojects/kubernetes:b73aacdfaad2167f7b193d9b68f7e52186eb188a
-files:
-  - path: /etc/kubernetes
-    symlink: "/var/lib/kubeadm"
-  - path: /etc/sysctl.d/01-kubernetes.conf
-    contents: 'net.ipv4.ip_forward = 1'
-  - path: /opt/cni
-    directory: true
-  - path: /etc/cni
-    directory: true
-  - path: root/.ssh/authorized_keys
-    source: ~/.ssh/id_rsa.pub
-    mode: "0600"
-    optional: true
diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube.yml
similarity index 100%
rename from projects/kubernetes/kube-master.yml
rename to projects/kubernetes/kube.yml