Merge pull request #17580 from mikedanese/stage-image

add an option to push/pull component images from a registry using kube-up

cluster/saltbase/install.sh

@@ -73,9 +73,16 @@ kube_bin_dir="/srv/salt-new/salt/kube-bins";
 docker_images_sls_file="/srv/salt-new/pillar/docker-images.sls";
 for docker_file in "${KUBE_DOCKER_WRAPPED_BINARIES[@]}"; do
   docker_tag=$(cat ${kube_bin_dir}/${docker_file}.docker_tag);
+  if [[ ! -z "${KUBE_IMAGE_TAG}" ]]; then
+    docker_tag="${KUBE_IMAGE_TAG}"
+  fi
   sed -i "s/#${docker_file}_docker_tag_value#/${docker_tag}/" "${docker_images_sls_file}";
 done
 
+cat <<EOF >>"${docker_images_sls_file}"
+kube_docker_registry: '$(echo ${KUBE_DOCKER_REGISTRY:-gcr.io/google_containers})'
+EOF
+
 
 echo "+++ Swapping in new configs"
 for dir in "${SALTDIRS[@]}"; do

cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest

@@ -111,7 +111,7 @@
 "containers":[
     {
     "name": "kube-apiserver",
-    "image": "gcr.io/google_containers/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
+    "image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
     "resources": {
       "limits": {
         "cpu": "250m"

cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest

@@ -65,7 +65,7 @@
 "containers":[
     {
     "name": "kube-controller-manager",
-    "image": "gcr.io/google_containers/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
+    "image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
     "resources": {
       "limits": {
         "cpu": "200m"

cluster/saltbase/salt/kube-proxy/kube-proxy.manifest

@@ -25,7 +25,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-proxy
-    image: gcr.io/google_containers/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
+    image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
     command:
     - /bin/sh
     - -c

cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest

@@ -21,7 +21,7 @@
 "containers":[
     {
     "name": "kube-scheduler",
-    "image": "gcr.io/google_containers/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
+    "image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
     "resources": {
       "limits": {
         "cpu": "100m"