github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

cluster/saltbase: Enable rkt to load master components images.

Browse Source
This commit is contained in:
Yifan Gu 2016-06-10 16:44:32 -07:00
parent 16d69f9f37
commit d96c7edc34
2 changed files with 66 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/gce/coreos/configure-node.sh Normal file → Executable file
View File

@ -173,8 +173,8 @@ function configure-master-components() {
configure-kube-apiserver configure-kube-apiserver
configure-kube-scheduler configure-kube-scheduler
configure-kube-controller-manager configure-kube-controller-manager
configure-addon-manager
configure-master-addons configure-master-addons
configure-addon-manager
} }
# TODO(yifan): Merge this with mount-master-pd() in configure-vm.sh # TODO(yifan): Merge this with mount-master-pd() in configure-vm.sh
@ -301,9 +301,10 @@ function load-docker-images() {
} }
# TODO(yifan): Making this function more generic for other runtimes.
function load-master-components-images() { function load-master-components-images() {
echo "Loading docker images for master components" echo "Loading docker images for master components"
export RKT_BIN=/opt/rkt/rkt
export DOCKER2ACI_BIN=/opt/docker2aci/docker2aci
${SALT_DIR}/install.sh ${KUBE_BIN_TAR} ${SALT_DIR}/install.sh ${KUBE_BIN_TAR}
${SALT_DIR}/salt/kube-master-addons/kube-master-addons.sh ${SALT_DIR}/salt/kube-master-addons/kube-master-addons.sh

24
cluster/saltbase/salt/kube-master-addons/kube-master-addons.sh
View File

@ -15,6 +15,8 @@
# limitations under the License. # limitations under the License.
# loadedImageFlags is a bit-flag to track which docker images loaded successfully. # loadedImageFlags is a bit-flag to track which docker images loaded successfully.
function load-docker-images() {
let loadedImageFlags=0 let loadedImageFlags=0
while true; do while true; do
@ -61,6 +63,28 @@ while true; do
sleep 15 sleep 15
done done
}
function convert-rkt-image() {
(cd /tmp; ${DOCKER2ACI_BIN} $1)
}
function load-rkt-images() {
convert-rkt-image /srv/salt/kube-bins/kube-apiserver.tar
convert-rkt-image /srv/salt/kube-bins/kube-scheduler.tar
convert-rkt-image /srv/salt/kube-bins/kube-controller-manager.tar
# Currently, we can't run docker image tarballs directly,
# So we use 'rkt fetch' to load the docker images into rkt image stores.
# see https://github.com/coreos/rkt/issues/2392.
${RKT_BIN} fetch /tmp/*.aci --insecure-options=image
}
if [[ "${KUBERNETES_CONTAINER_RUNTIME}" == "rkt" ]]; then
load-rkt-images
else
load-docker-images
fi
# Now exit. After kube-push, salt will notice that the service is down and it # Now exit. After kube-push, salt will notice that the service is down and it
# will start it and new docker images will be loaded. # will start it and new docker images will be loaded.