From 815f50803c38a6516b6c73713bb7d49fcc02a95d Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Wed, 15 Nov 2017 10:33:38 +0000
Subject: [PATCH] kubernetes: rename images to better reflect what they are.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`linuxkitprojects/kubernetes` → `linuxkitprojects/kubelet`
`linuxkitprojects/kubernetes-image-cache-*` → `linuxkitprojects/kubernetes-docker-image-cache-*`

`kubernetes` subdirectory is also renamed to `kubelet`.

`image-cache` subdirectory is not renamed since we may want to build other
sorts of image cache at some point.

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 projects/kubernetes/Makefile                                | 4 ++--
 projects/kubernetes/image-cache/build.yml.in                | 2 +-
 projects/kubernetes/{kubernetes => kubelet}/Dockerfile      | 0
 projects/kubernetes/{kubernetes => kubelet}/build.yml       | 2 +-
 projects/kubernetes/{kubernetes => kubelet}/kubeadm-init.sh | 0
 projects/kubernetes/{kubernetes => kubelet}/kubelet.sh      | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename projects/kubernetes/{kubernetes => kubelet}/Dockerfile (100%)
 rename projects/kubernetes/{kubernetes => kubelet}/build.yml (82%)
 rename projects/kubernetes/{kubernetes => kubelet}/kubeadm-init.sh (100%)
 rename projects/kubernetes/{kubernetes => kubelet}/kubelet.sh (100%)

diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile
index 52042d299..10e0a388b 100644
--- a/projects/kubernetes/Makefile
+++ b/projects/kubernetes/Makefile
@@ -13,13 +13,13 @@ KUBE_FORMAT_ARGS := $(patsubst %,-format %,$(KUBE_FORMATS))
 all: build-container-images build-vm-images
 
 build-container-images:
-	linuxkit pkg build kubernetes
+	linuxkit pkg build kubelet
 
 build-cache-images:
 	$(MAKE) -C image-cache build
 
 push-container-images:
-	linuxkit pkg push kubernetes
+	linuxkit pkg push kubelet
 	$(MAKE) -C image-cache push
 
 build-vm-images: kube-master.iso kube-node.iso
diff --git a/projects/kubernetes/image-cache/build.yml.in b/projects/kubernetes/image-cache/build.yml.in
index c7dee1e61..2b9a26c43 100644
--- a/projects/kubernetes/image-cache/build.yml.in
+++ b/projects/kubernetes/image-cache/build.yml.in
@@ -1,5 +1,5 @@
 org: linuxkitprojects
-image: kubernetes-image-cache-@@CACHE@@
+image: kubernetes-docker-image-cache-@@CACHE@@
 disable-content-trust: true
 arches:
   - amd64
diff --git a/projects/kubernetes/kubernetes/Dockerfile b/projects/kubernetes/kubelet/Dockerfile
similarity index 100%
rename from projects/kubernetes/kubernetes/Dockerfile
rename to projects/kubernetes/kubelet/Dockerfile
diff --git a/projects/kubernetes/kubernetes/build.yml b/projects/kubernetes/kubelet/build.yml
similarity index 82%
rename from projects/kubernetes/kubernetes/build.yml
rename to projects/kubernetes/kubelet/build.yml
index 878b405d2..05c64c46d 100644
--- a/projects/kubernetes/kubernetes/build.yml
+++ b/projects/kubernetes/kubelet/build.yml
@@ -1,5 +1,5 @@
 org: linuxkitprojects
-image: kubernetes
+image: kubelet
 network: true
 disable-content-trust: true
 arches:
diff --git a/projects/kubernetes/kubernetes/kubeadm-init.sh b/projects/kubernetes/kubelet/kubeadm-init.sh
similarity index 100%
rename from projects/kubernetes/kubernetes/kubeadm-init.sh
rename to projects/kubernetes/kubelet/kubeadm-init.sh
diff --git a/projects/kubernetes/kubernetes/kubelet.sh b/projects/kubernetes/kubelet/kubelet.sh
similarity index 100%
rename from projects/kubernetes/kubernetes/kubelet.sh
rename to projects/kubernetes/kubelet/kubelet.sh