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

Upgrade Weave to 1.8.2 and fix semantic versioning issue #1250

Merged
merged 2 commits into from
Dec 24, 2016
Merged

Upgrade Weave to 1.8.2 and fix semantic versioning issue #1250

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
267c0ca
Upgrade Weave to 1.8.2
itskingori Dec 23, 2016
66f430c
Prefer Semantic Versioning
itskingori Dec 24, 2016
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 ...ons/networking.weave/v1.8.1.20161130.yaml → ...ons/networking.weave/v1.8.2.20161223.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
hostPID: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we could get the file names 1.8.2.yaml, it will address an open issue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 66f430c.

containers:
- name: weave
image: weaveworks/weave-kube:1.8.1
image: weaveworks/weave-kube:1.8.2
command:
- /home/weave/launch.sh
livenessProbe:
Expand All @@ -47,7 +47,7 @@ spec:
requests:
cpu: 10m
- name: weave-npc
image: weaveworks/weave-npc:1.8.1
image: weaveworks/weave-npc:1.8.2
resources:
requests:
cpu: 10m
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri

if b.cluster.Spec.Networking.Weave != nil {
key := "networking.weave"
version := "1.8.1.20161130"
version := "1.8.2.20161223"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again we rename the file.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 66f430c.


// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
location := key + "/v" + version + ".yaml"
Expand Down