From 5efc09710b2e4af79af501d64489a9937721c66f Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Mon, 14 Dec 2015 09:54:58 +0100
Subject: [PATCH] Renaming hyperkube image vars
---
.../master/templates/manifests/kube-apiserver.manifest.j2 | 2 +-
.../manifests/kube-controller-manager.manifest.j2 | 2 +-
.../master/templates/manifests/kube-scheduler.manifest.j2 | 2 +-
roles/kubernetes/node/defaults/main.yml | 7 +++----
.../node/templates/manifests/kube-proxy.manifest.j2 | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
index 8ada4bc3e..666d61759 100644
--- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
+++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
@@ -6,7 +6,7 @@ spec:
hostNetwork: true
containers:
- name: kube-apiserver
- image: {{ hyperkube_image.name }}:{{ hyperkube_image.tag }}
+ image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
command:
- /hyperkube
- apiserver
diff --git a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
index 17052f9f4..1b98ecbc8 100644
--- a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
+++ b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
@@ -7,7 +7,7 @@ spec:
hostNetwork: true
containers:
- name: kube-controller-manager
- image: {{ hyperkube_image.name }}:{{ hyperkube_image.tag }}
+ image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
command:
- /hyperkube
- controller-manager
diff --git a/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2
index 7a595f2c6..0a0efdcb0 100644
--- a/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2
+++ b/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2
@@ -7,7 +7,7 @@ spec:
hostNetwork: true
containers:
- name: kube-scheduler
- image: {{ hyperkube_image.name }}:{{ hyperkube_image.tag }}
+ image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
command:
- /hyperkube
- scheduler
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index fdea54b40..a098e0c11 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -32,11 +32,10 @@ dns_domain: "{{ cluster_name }}"
kube_proxy_mode: userspace
-hyperkube_image:
# Temporary image, waiting for official google release
-# name: gcr.io/google_containers/hyperkube
- name: quay.io/smana/hyperkube
- tag: v1.1.3
+# hyperkube_image_repo: gcr.io/google_containers/hyperkube
+hyperkube_image_repo: quay.io/smana/hyperkube
+hyperkube_image_tag: v1.1.3
# IP address of the DNS server.
# Kubernetes will create a pod with several containers, serving as the DNS
diff --git a/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2 b/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
index 5d8aef5c0..32c52e7d9 100644
--- a/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
+++ b/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
@@ -7,7 +7,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
- image: {{ hyperkube_image.name }}:{{ hyperkube_image.tag }}
+ image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
command:
- /hyperkube
- proxy
--
GitLab