External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-20 07:17:45 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #330 from jonbec/master

Browse Source 
Add settable flannel image tag & image repo
This commit is contained in:
Antoine Legrand
2016-07-29 08:02:18 -07:00
committed by GitHub
parent b91f8630a3 d4dfdf68a6
commit 4419662fa0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/network_plugin/flannel/templates/flannel-pod.yml
View File

@@ -17,7 +17,7 @@
path: "/etc/flannel-network.json"
containers:
- name: "flannel-server-helper"
image: "gcr.io/google_containers/flannel-server-helper:0.1"
image: "{{ flannel_server_helper_image_repo }}:{{ flannel_server_helper_image_tag }}"
args:
- "--network-config=/etc/flannel-network.json"
- "--etcd-prefix=/{{ cluster_name }}/network"
@@ -27,7 +27,7 @@
mountPath: "/etc/flannel-network.json"
imagePullPolicy: "Always"
- name: "flannel-container"
image: "quay.io/coreos/flannel:0.5.5"
image: "{{ flannel_image_repo }}:{{ flannel_image_tag }}"
command:
- "/bin/sh"
- "-c"