kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update weave to use the correct CIDR for pods

This commit is contained in:
Jordan Jennings 2017-06-12 17:53:47 -04:00
parent 1299fd63da
commit 767a8a6395
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template
View File

@ -97,11 +97,13 @@ spec:
limits:
cpu: 100m
memory: 200Mi
{{if .Networking.Weave.MTU }}
env:
- name: IPALLOC_RANGE
value: {{ .KubeControllerManager.ClusterCIDR }}
{{- if .Networking.Weave.MTU }}
- name: WEAVE_MTU
value: "{{ .Networking.Weave.MTU }}"
{{end}}
{{- end }}
- name: weave-npc
image: weaveworks/weave-npc:1.9.7
resources:

6
upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template
View File

@ -58,11 +58,13 @@ spec:
limits:
cpu: 100m
memory: 200Mi
{{if .Networking.Weave.MTU }}
env:
- name: IPALLOC_RANGE
value: {{ .KubeControllerManager.ClusterCIDR }}
{{- if .Networking.Weave.MTU }}
- name: WEAVE_MTU
value: "{{ .Networking.Weave.MTU }}"
{{end}}
{{- end }}
- name: weave-npc
image: weaveworks/weave-npc:1.9.7
resources:

3
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -280,7 +280,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if b.cluster.Spec.Networking.Weave != nil {
key := "networking.weave"
version := "1.9.7"
// 1.9.8-kops.1 = 1.9.7 plus IPALLOC_RANGE and WEAVE_MTU
version := "1.9.8-kops.1"
{
location := key + "/pre-k8s-1.6.yaml"