Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Weave Net to 2.3.0 #4954

Merged
merged 1 commit into from
Apr 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
- name: CONN_LIMIT
value: "{{ .Networking.Weave.ConnLimit }}"
{{- end }}
image: 'weaveworks/weave-kube:2.2.0'
image: 'weaveworks/weave-kube:2.3.0'
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down Expand Up @@ -165,7 +165,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 'weaveworks/weave-npc:2.2.0'
image: 'weaveworks/weave-npc:2.3.0'
resources:
requests:
cpu: 50m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ metadata:
name: weave-net
role.kubernetes.io/networking: "1"
spec:
# Wait 5 seconds to let pod connect before rolling next pod
minReadySeconds: 5
template:
metadata:
labels:
Expand Down Expand Up @@ -128,7 +130,7 @@ spec:
- name: CONN_LIMIT
value: "{{ .Networking.Weave.ConnLimit }}"
{{- end }}
image: 'weaveworks/weave-kube:2.2.0'
image: 'weaveworks/weave-kube:2.3.0'
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down Expand Up @@ -166,7 +168,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 'weaveworks/weave-npc:2.2.0'
image: 'weaveworks/weave-npc:2.3.0'
resources:
requests:
cpu: 50m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
- name: CONN_LIMIT
value: "{{ .Networking.Weave.ConnLimit }}"
{{- end }}
image: 'weaveworks/weave-kube:2.2.0'
image: 'weaveworks/weave-kube:2.3.0'
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down Expand Up @@ -83,7 +83,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 'weaveworks/weave-npc:2.2.0'
image: 'weaveworks/weave-npc:2.3.0'
resources:
requests:
cpu: 50m
Expand Down
4 changes: 2 additions & 2 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri

if b.cluster.Spec.Networking.Weave != nil {
key := "networking.weave"
// 2.2.0-kops.2 = 2.2.0, kops packaging version 1.
version := "2.2.0-kops.1"
// 2.3.0-kops.1 = 2.3.0, kops packaging version 1.
version := "2.3.0-kops.1"

{
location := key + "/pre-k8s-1.6.yaml"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,18 @@ spec:
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.2.0-kops.1
version: 2.3.0-kops.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.7.0'
manifest: networking.weave/k8s-1.6.yaml
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.2.0-kops.1
version: 2.3.0-kops.1
- id: k8s-1.7
kubernetesVersion: '>=1.7.0'
manifest: networking.weave/k8s-1.7.yaml
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.2.0-kops.1
version: 2.3.0-kops.1