use google hyperkube image

2016-01-16 22:55:49 +01:00 · 2016-01-16 22:55:49 +01:00 · 8415634016
parent 319f687ced
commit 8415634016
2 changed files with 1 additions and 2 deletions
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@ -34,7 +34,7 @@ kube_proxy_mode: userspace

 # Temporary image, waiting for official google release
 #  hyperkube_image_repo: gcr.io/google_containers/hyperkube
-hyperkube_image_repo: quay.io/smana/hyperkube
+hyperkube_image_repo: gcr.io/google_containers/hyperkube
 hyperkube_image_tag: v1.1.3

 # IP address of the DNS server.
--- a/roles/network_plugin/tasks/flannel.yml
+++ b/roles/network_plugin/tasks/flannel.yml
@ -4,7 +4,6 @@
    src: flannel/network.json
    dest: /etc/flannel-network.json
    backup: yes
-  when: inventory_hostname in groups['kube-node']

 - name: Flannel | Create flannel pod manifest
  template: