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

2015-11-17 18:13:24 -08:00
parent 41cb3d6a39
commit 4ace8280a0
9 changed files with 66 additions and 10 deletions
--- a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
+++ b/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"