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.

Sign up for GitHub

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

Jump to bottom

Update weave to 2.5.2 #7444

Merged
merged 2 commits into from
Aug 22, 2019
Merged

Update weave to 2.5.2 #7444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c32fe97
upgrade weave to 2.5.2 to address the issues in https://github.com/we…
while1eq1 Aug 21, 2019
84aba6e
update manifest hashes
while1eq1 Aug 21, 2019
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
4 changes: 2 additions & 2 deletions upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ spec:
name: weave-net
key: network-password
{{- end }}
image: 'weaveworks/weave-kube:2.5.1'
image: 'weaveworks/weave-kube:2.5.2'
ports:
- name: metrics
containerPort: 6782
Expand Down Expand Up @@ -204,7 +204,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 'weaveworks/weave-npc:2.5.1'
image: 'weaveworks/weave-npc:2.5.2'
ports:
- name: metrics
containerPort: 6781
Expand Down
4 changes: 2 additions & 2 deletions upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ spec:
name: weave-net
key: network-password
{{- end }}
image: 'weaveworks/weave-kube:2.5.1'
image: 'weaveworks/weave-kube:2.5.2'
ports:
- name: metrics
containerPort: 6782
Expand Down Expand Up @@ -196,7 +196,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 'weaveworks/weave-npc:2.5.1'
image: 'weaveworks/weave-npc:2.5.2'
ports:
- name: metrics
containerPort: 6781
Expand Down
4 changes: 2 additions & 2 deletions upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ spec:
name: weave-net
key: network-password
{{- end }}
image: 'weaveworks/weave-kube:2.5.1'
image: 'weaveworks/weave-kube:2.5.2'
ports:
- name: metrics
containerPort: 6782
Expand Down Expand Up @@ -200,7 +200,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 'weaveworks/weave-npc:2.5.1'
image: 'weaveworks/weave-npc:2.5.2'
ports:
- name: metrics
containerPort: 6781
Expand Down
6 changes: 3 additions & 3 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,9 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
versions := map[string]string{
"pre-k8s-1.6": "2.3.0-kops.3",
"k8s-1.6": "2.3.0-kops.3",
"k8s-1.7": "2.5.1-kops.2",
"k8s-1.8": "2.5.1-kops.2",
"k8s-1.12": "2.5.1-kops.2",
"k8s-1.7": "2.5.2-kops.2",
"k8s-1.8": "2.5.2-kops.2",
"k8s-1.12": "2.5.2-kops.2",
}

{
Expand Down
12 changes: 6 additions & 6 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,24 +123,24 @@ spec:
- id: k8s-1.7
kubernetesVersion: '>=1.7.0 <1.8.0'
manifest: networking.weave/k8s-1.7.yaml
manifestHash: e017ce8498a9c4b0569bf2e4d7f49f9f4201ef52
manifestHash: 258ad76c3ef165f216980c96367df13a8bffb1d8
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.5.1-kops.2
version: 2.5.2-kops.2
- id: k8s-1.8
kubernetesVersion: '>=1.8.0 <1.12.0'
manifest: networking.weave/k8s-1.8.yaml
manifestHash: 390e23353f5370d294663065a3ca7e0fb1d63737
manifestHash: 748a1526515a719058b99c203cd943a740675e21
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.5.1-kops.2
version: 2.5.2-kops.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: networking.weave/k8s-1.12.yaml
manifestHash: c784dfaae5188e0b1e4dbfea0373abe8d1a01b48
manifestHash: 11e566a259bbb5f066cf2b06cd8832e74072a900
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.5.1-kops.2
version: 2.5.2-kops.2