mounting kubectl from the host instead to copying it to protokube

kubernetes · Oct 8, 2017 · 0ce4369 · 0ce4369
1 parent 319ebab
commit 0ce4369
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/images/protokube-builder/onbuild.sh b/images/protokube-builder/onbuild.sh
@@ -32,9 +32,4 @@ cp /src/.build/local/protokube /src/.build/artifacts/
 make channels
 cp /src/.build/local/channels /src/.build/artifacts/
 
-# channels uses protokube
-cd /src/.build/artifacts/
-curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.6.6/bin/linux/amd64/kubectl
-chmod +x kubectl
-
 chown -R $HOST_UID:$HOST_GID /src/.build/artifacts
diff --git a/images/protokube/Dockerfile b/images/protokube/Dockerfile
@@ -21,8 +21,6 @@ RUN apt-get update && apt-get install --yes \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-COPY /.build/artifacts/kubectl /usr/bin/kubectl
-
 COPY /.build/artifacts/protokube /usr/bin/protokube
 COPY /.build/artifacts/channels /usr/bin/channels
 

diff --git a/nodeup/pkg/model/protokube.go b/nodeup/pkg/model/protokube.go
@@ -106,6 +106,7 @@ func (t *ProtokubeBuilder) buildSystemdService() (*nodetasks.Service, error) {
 	dockerArgs := []string{
 		"/usr/bin/docker", "run",
 		"-v", "/:/rootfs/",
+		"-v", "/usr/local/bin/kubectl:/usr/bin/kubectl:ro",
 		"-v", "/var/run/dbus:/var/run/dbus",
 		"-v", "/run/systemd:/run/systemd",
 		"--net=host", "--privileged",