rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-04 16:30:02 +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

2
cluster/defaults.go
View File

@@ -26,6 +26,8 @@ const (
DefaultCanalNodeImage = "quay.io/calico/node:v2.6.2" DefaultCanalNodeImage = "quay.io/calico/node:v2.6.2"
DefaultCanalCNIImage = "quay.io/calico/cni:v1.11.0" DefaultCanalCNIImage = "quay.io/calico/cni:v1.11.0"
DefaultCanalFlannelImage = "quay.io/coreos/flannel:v0.9.1" DefaultCanalFlannelImage = "quay.io/coreos/flannel:v0.9.1"
DefaultWeaveImage = "weaveworks/weave-kube:2.1.2"
DefaultWeaveCNIImage = "weaveworks/weave-npc:2.1.2"
DefaultKubeDNSImage = "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5" DefaultKubeDNSImage = "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"
DefaultDNSMasqImage = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5" DefaultDNSMasqImage = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"

11
cluster/network.go
View File

@@ -25,6 +25,10 @@ const (
CanalNodeImage = "canal_node_image" CanalNodeImage = "canal_node_image"
CanalCNIImage = "canal_cni_image" CanalCNIImage = "canal_cni_image"
CanalFlannelImage = "canal_flannel_image" CanalFlannelImage = "canal_flannel_image"
WeaveNetworkPlugin = "weave"
WeaveImage = "weave_node_image"
WeaveCNIImage = "weave_cni_image"
) )
func (c *Cluster) DeployNetworkPlugin() error { func (c *Cluster) DeployNetworkPlugin() error {
@@ -81,8 +85,7 @@ func (c *Cluster) doCanalDeploy() error {
} }
func (c *Cluster) doWeaveDeploy() error { func (c *Cluster) doWeaveDeploy() error {
weaveConfig := make(map[string]string) pluginYaml := network.GetWeaveManifest(c.ClusterCIDR, c.Network.Options[WeaveImage], c.Network.Options[WeaveCNIImage])
pluginYaml := network.GetWeaveManifest(weaveConfig)
return c.doAddonDeploy(pluginYaml, NetworkPluginResourceName) return c.doAddonDeploy(pluginYaml, NetworkPluginResourceName)
} }
@@ -107,5 +110,9 @@ func (c *Cluster) setClusterNetworkDefaults() {
setDefaultIfEmptyMapValue(c.Network.Options, CanalCNIImage, DefaultCanalCNIImage) setDefaultIfEmptyMapValue(c.Network.Options, CanalCNIImage, DefaultCanalCNIImage)
setDefaultIfEmptyMapValue(c.Network.Options, CanalNodeImage, DefaultCanalNodeImage) setDefaultIfEmptyMapValue(c.Network.Options, CanalNodeImage, DefaultCanalNodeImage)
setDefaultIfEmptyMapValue(c.Network.Options, CanalFlannelImage, DefaultCanalFlannelImage) setDefaultIfEmptyMapValue(c.Network.Options, CanalFlannelImage, DefaultCanalFlannelImage)
case c.Network.Plugin == WeaveNetworkPlugin:
setDefaultIfEmptyMapValue(c.Network.Options, WeaveImage, DefaultWeaveImage)
setDefaultIfEmptyMapValue(c.Network.Options, WeaveCNIImage, DefaultWeaveCNIImage)
} }
} }

8
network/weave.go
View File

@@ -1,6 +1,6 @@
package network 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. return `# This ConfigMap can be used to configure a self-hosted Weave Net installation.
apiVersion: v1 apiVersion: v1
kind: List kind: List
@@ -33,7 +33,9 @@ items:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
image: 'weaveworks/weave-kube:2.1.2' - name: IPALLOC_RANGE
value: "` + clusterCIDR + `"
image: ` + image + `
livenessProbe: livenessProbe:
httpGet: httpGet:
host: 127.0.0.1 host: 127.0.0.1
@@ -68,7 +70,7 @@ items:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
image: 'weaveworks/weave-npc:2.1.2' image: ` + cniImage + `
resources: resources:
requests: requests:
cpu: 10m cpu: 10m