Small improvements to the kubeadm guide

weaveworks · Jun 18, 2019 · 566d7fc · 566d7fc
1 parent 5162479
commit 566d7fc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/images/kubeadm/Dockerfile b/images/kubeadm/Dockerfile
@@ -1,6 +1,6 @@
 FROM weaveworks/ignite-ubuntu:latest
 # Install dependencies. Use containerd for running the containers (for better performance)
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
         apt-transport-https \
         containerd \
         curl \

diff --git a/images/kubeadm/install.sh b/images/kubeadm/install.sh
@@ -55,13 +55,6 @@ if [[ "${MODE}" == "cleanup" ]]; then
 	exit 0
 fi
 
-if [[ ! -f $(which jq) ]]; then
-	apt-get	update && apt-get install -y jq
-fi
-if [[ ! -f $(which docker) ]]; then
-	apt-get	update && apt-get install -y docker.io
-fi
-
 BINARY_BUCKET=""
 if [[ "${BINARY_REF}" =~ ^[0-9]{5}$ ]]; then
 	PR_NUMBER=${BINARY_REF}
@@ -91,7 +84,6 @@ gsutil_cp ${BINARY_BUCKET}/kubeadm ${BINARY_DIR}/kubeadm
 chmod +x ${BINARY_DIR}/kubeadm
 
 install_kubeadm_apt() {
-	apt-get update && apt-get install -y apt-transport-https curl || exit 0
 	curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
 	echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list
 	apt-get update && apt-get install -y kubeadm