fix: extract kubelet and kubectl binaries from hyperkube's binary fol…

…der when possible (#2298) * fix: extract kubelet and kubectl directly from hyperkube's binary folder * Fix generated files
Azure · Nov 12, 2019 · 975af62 · 975af62
1 parent 5814afc
commit 975af62
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/parts/k8s/cloud-init/artifacts/cse_install.sh b/parts/k8s/cloud-init/artifacts/cse_install.sh
@@ -230,7 +230,14 @@ extractHyperkube() {
     pullContainerImage $CLI_TOOL ${HYPERKUBE_URL}
     if [[ "$CLI_TOOL" == "docker" ]]; then
         mkdir -p "$path"
-        docker run --rm -v $path:$path ${HYPERKUBE_URL} /bin/bash -c "cp /hyperkube $path"
+        # Check if we can extract kubelet and kubectl directly from hyperkube's binary folder
+        if docker run --rm --entrypoint "" -v $path:$path ${HYPERKUBE_URL} /bin/bash -c "cp /usr/local/bin/{kubelet,kubectl} $path"; then
+            mv "$path/kubelet" "/usr/local/bin/kubelet-${KUBERNETES_VERSION}"
+            mv "$path/kubectl" "/usr/local/bin/kubectl-${KUBERNETES_VERSION}"
+            return
+        else
+            docker run --rm -v $path:$path ${HYPERKUBE_URL} /bin/bash -c "cp /hyperkube $path"
+        fi
     else
         img unpack -o "$path" ${HYPERKUBE_URL}
     fi

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go