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

Merge pull request #2760 from justinsb/weave_198 

Update weave to 1.9.8
This commit is contained in:
Chris Love 2017-06-16 09:42:34 -06:00 committed by GitHub
parent 8fb99a87e2 f4cb670edc
commit f9f64e3fb3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ spec:
hostPID: true hostPID: true
containers: containers:
- name: weave - name: weave
image: weaveworks/weave-kube:1.9.7 image: weaveworks/weave-kube:1.9.8
command: command:
- /home/weave/launch.sh - /home/weave/launch.sh
livenessProbe: livenessProbe:
@ -105,7 +105,7 @@ spec:
value: "{{ .Networking.Weave.MTU }}" value: "{{ .Networking.Weave.MTU }}"
{{- end }} {{- end }}
- name: weave-npc - name: weave-npc
image: weaveworks/weave-npc:1.9.7 image: weaveworks/weave-npc:1.9.8
resources: resources:
requests: requests:
cpu: 100m cpu: 100m

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

@ -27,7 +27,7 @@ spec:
hostPID: true hostPID: true
containers: containers:
- name: weave - name: weave
image: weaveworks/weave-kube:1.9.7 image: weaveworks/weave-kube:1.9.8
command: command:
- /home/weave/launch.sh - /home/weave/launch.sh
livenessProbe: livenessProbe:
@ -66,7 +66,7 @@ spec:
value: "{{ .Networking.Weave.MTU }}" value: "{{ .Networking.Weave.MTU }}"
{{- end }} {{- end }}
- name: weave-npc - name: weave-npc
image: weaveworks/weave-npc:1.9.7 image: weaveworks/weave-npc:1.9.8
resources: resources:
requests: requests:
cpu: 100m cpu: 100m

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

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