rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-09 02:51:15 +00:00
Code Issues Releases Wiki Activity

merge head & add weave-net network plugin configuration cluster cidr, weave_image, weave_cni_image

Browse Source
This commit is contained in:
kyamazawa
2017-12-06 12:53:51 +09:00
parent f5797c6ba3
commit 82dce19ac8
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
network/weave.go
View File

@@ -1,6 +1,6 @@
package network
func GetWeaveManifest(weaveConfig map[string]string) string {
func GetWeaveManifest(clusterCIDR, image, cniImage string) string {
return `# This ConfigMap can be used to configure a self-hosted Weave Net installation.
apiVersion: v1
kind: List
@@ -33,7 +33,9 @@ items:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 'weaveworks/weave-kube:2.1.2'
- name: IPALLOC_RANGE
value: "` + clusterCIDR + `"
image: ` + image + `
livenessProbe:
httpGet:
host: 127.0.0.1
@@ -68,7 +70,7 @@ items:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 'weaveworks/weave-npc:2.1.2'
image: ` + cniImage + `
resources:
requests:
cpu: 10m