Merge pull request #642 from kubernetes-incubator/k8s_imgpull

Allow pre-downloaded images to be used effectively

inventory/group_vars/all.yml

@@ -139,6 +139,9 @@ dns_server: "{{ kube_service_addresses|ipaddr('net')|ipaddr(2)|ipaddr('address')
 ## to self hosted registries like so:
 docker_options: "--insecure-registry={{ kube_service_addresses }}"
 
+# K8s image pull policy (imagePullPolicy)
+k8s_image_pull_policy: IfNotPresent
+
 # default packages to install within the cluster
 kpm_packages: []
 #  - name: kube-system/grafana

roles/dnsmasq/templates/dnsmasq-ds.yml

@@ -15,6 +15,7 @@ spec:
       containers:
         - name: dnsmasq
           image: "{{ dnsmasq_image_repo }}:{{ dnsmasq_image_tag }}"
+          imagePullPolicy: {{ k8s_image_pull_policy }}
           command:
             - dnsmasq
           args:

roles/kubernetes-apps/ansible/templates/calico-policy-controller.yml.j2

@@ -24,6 +24,7 @@ spec:
       containers:
         - name: calico-policy-controller
           image: {{ calico_policy_image_repo }}:{{ calico_policy_image_tag }}
+          imagePullPolicy: {{ k8s_image_pull_policy }}
           env:
             - name: ETCD_ENDPOINTS
               value: "{{ etcd_access_endpoint }}"

roles/kubernetes-apps/ansible/templates/kubedns-rc.yml

@@ -22,6 +22,7 @@ spec:
       containers:
       - name: kubedns
         image: "{{ kubedns_image_repo }}:{{ kubedns_image_tag }}"
+        imagePullPolicy: {{ k8s_image_pull_policy }}
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -64,6 +65,7 @@ spec:
           protocol: TCP
       - name: dnsmasq
         image: "{{ kubednsmasq_image_repo }}:{{ kubednsmasq_image_tag }}"
+        imagePullPolicy: {{ k8s_image_pull_policy }}
         args:
         - --log-facility=-
         - --cache-size=1000
@@ -78,6 +80,7 @@ spec:
           protocol: TCP
       - name: healthz
         image: "{{ exechealthz_image_repo }}:{{ exechealthz_image_tag }}"
+        imagePullPolicy: {{ k8s_image_pull_policy }}
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2

@@ -10,6 +10,7 @@ spec:
   containers:
   - name: kube-apiserver
     image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
+    imagePullPolicy: {{ k8s_image_pull_policy }}
     command:
     - /hyperkube
     - apiserver

roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2

@@ -10,6 +10,7 @@ spec:
   containers:
   - name: kube-controller-manager
     image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
+    imagePullPolicy: {{ k8s_image_pull_policy }}
     command:
     - /hyperkube
     - controller-manager

roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2

@@ -10,6 +10,7 @@ spec:
   containers:
   - name: kube-scheduler
     image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
+    imagePullPolicy: {{ k8s_image_pull_policy }}
     command:
     - /hyperkube
     - scheduler

roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2

@@ -10,6 +10,7 @@ spec:
   containers:
   - name: kube-proxy
     image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
+    imagePullPolicy: {{ k8s_image_pull_policy }}
     command:
     - /hyperkube
     - proxy

roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2

@@ -10,6 +10,7 @@ spec:
   containers:
   - name: nginx-proxy
     image: {{ nginx_image_repo }}:{{ nginx_image_tag }}
+    imagePullPolicy: {{ k8s_image_pull_policy }}
     securityContext:
       privileged: true
     volumeMounts:

roles/network_plugin/canal/templates/canal-node.yml.j2

@@ -48,6 +48,7 @@ spec:
         # container hosts.
         - name: flannel
           image: "{{ flannel_image_repo }}:{{ flannel_image_tag }}"
+          imagePullPolicy: {{ k8s_image_pull_policy }}
           env:
             # Cluster name
             - name: CLUSTER_NAME
@@ -117,6 +118,7 @@ spec:
         # host.
         - name: calico-node
           image: "{{ calico_node_image_repo }}:{{ calico_node_image_tag }}"
+          imagePullPolicy: {{ k8s_image_pull_policy }}
           env:
             # The location of the etcd cluster.
             - name: ETCD_ENDPOINTS

roles/network_plugin/flannel/templates/flannel-pod.yml

@@ -18,6 +18,7 @@
     containers:
       - name: "flannel-container"
         image: "{{ flannel_image_repo }}:{{ flannel_image_tag }}"
+        imagePullPolicy: {{ k8s_image_pull_policy }}
         command:
           - "/bin/sh"
           - "-c"