C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
commit 6f5dc9ab4f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roles/network_plugin/flannel/defaults/main.yml
View file

@ -10,3 +10,10 @@ flannel_public_ip: "{{ access_ip|default(ip|default(ansible_default_ipv4.address
# You can choose what type of flannel backend to use # You can choose what type of flannel backend to use
# please refer to flannel's docs : https://github.com/coreos/flannel/blob/master/README.md # please refer to flannel's docs : https://github.com/coreos/flannel/blob/master/README.md
flannel_backend_type: "vxlan" flannel_backend_type: "vxlan"
flannel_server_helper_image_repo: "gcr.io/google_containers/flannel-server-helper"
flannel_server_helper_image_tag: "0.1"
flannel_image_repo: "quay.io/coreos/flannel"
flannel_image_tag: "0.5.5"

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

@ -17,7 +17,7 @@
path: "/etc/flannel-network.json" path: "/etc/flannel-network.json"
containers: containers:
- name: "flannel-server-helper" - 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: args:
- "--network-config=/etc/flannel-network.json" - "--network-config=/etc/flannel-network.json"
- "--etcd-prefix=/{{ cluster_name }}/network" - "--etcd-prefix=/{{ cluster_name }}/network"
@ -27,7 +27,7 @@
mountPath: "/etc/flannel-network.json" mountPath: "/etc/flannel-network.json"
imagePullPolicy: "Always" imagePullPolicy: "Always"
- name: "flannel-container" - name: "flannel-container"
image: "quay.io/coreos/flannel:0.5.5" image: "{{ flannel_image_repo }}:{{ flannel_image_tag }}"
command: command:
- "/bin/sh" - "/bin/sh"
- "-c" - "-c"