From 841563401657750edb81633ea515de20625bcd99 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Sat, 16 Jan 2016 22:55:49 +0100
Subject: [PATCH] use google hyperkube image
---
roles/kubernetes/node/defaults/main.yml | 2 +-
roles/network_plugin/tasks/flannel.yml | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index a098e0c11..5586fc6e7 100644
--- 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.
diff --git a/roles/network_plugin/tasks/flannel.yml b/roles/network_plugin/tasks/flannel.yml
index e0b3391aa..fc5dcaa2f 100644
--- 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:
--
GitLab