diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template index bf97dc813b..4adc016249 100644 --- a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template @@ -66,7 +66,7 @@ spec: hostPID: true containers: - name: weave - image: weaveworks/weave-kube:1.9.7 + image: weaveworks/weave-kube:1.9.8 command: - /home/weave/launch.sh livenessProbe: @@ -105,7 +105,7 @@ spec: value: "{{ .Networking.Weave.MTU }}" {{- end }} - name: weave-npc - image: weaveworks/weave-npc:1.9.7 + image: weaveworks/weave-npc:1.9.8 resources: requests: cpu: 100m diff --git a/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template index 5748ec56e3..e248ce9fff 100644 --- a/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template @@ -27,7 +27,7 @@ spec: hostPID: true containers: - name: weave - image: weaveworks/weave-kube:1.9.7 + image: weaveworks/weave-kube:1.9.8 command: - /home/weave/launch.sh livenessProbe: @@ -66,7 +66,7 @@ spec: value: "{{ .Networking.Weave.MTU }}" {{- end }} - name: weave-npc - image: weaveworks/weave-npc:1.9.7 + image: weaveworks/weave-npc:1.9.8 resources: requests: cpu: 100m diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index eb9c25a85c..87cd6b49df 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -280,8 +280,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri if b.cluster.Spec.Networking.Weave != nil { key := "networking.weave" - // 1.9.8-kops.1 = 1.9.7 plus IPALLOC_RANGE and WEAVE_MTU - version := "1.9.8-kops.1" + // 1.9.8-kops.2 = 1.9.8 plus IPALLOC_RANGE and WEAVE_MTU + version := "1.9.8-kops.2" { location := key + "/pre-k8s-1.6.yaml"