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 Net to version 2.6.0 #7898

Merged
merged 1 commit into from
Dec 26, 2019
Merged

Update Weave Net to version 2.6.0 #7898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -168,7 +168,7 @@ spec:
name: weave-net
key: network-password
{{- end }}
image: 'weaveworks/weave-kube:2.5.2'
image: 'weaveworks/weave-kube:2.6.0'
ports:
- name: metrics
containerPort: 6782
Expand Down Expand Up @@ -208,7 +208,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
image: 'weaveworks/weave-npc:2.5.2'
image: 'weaveworks/weave-npc:2.6.0'
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 @@ -160,7 +160,7 @@ spec:
name: weave-net
key: network-password
{{- end }}
image: 'weaveworks/weave-kube:2.5.2'
image: 'weaveworks/weave-kube:2.6.0'
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.2'
image: 'weaveworks/weave-npc:2.6.0'
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 @@ -164,7 +164,7 @@ spec:
name: weave-net
key: network-password
{{- end }}
image: 'weaveworks/weave-kube:2.5.2'
image: 'weaveworks/weave-kube:2.6.0'
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.2'
image: 'weaveworks/weave-npc:2.6.0'
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 @@ -694,9 +694,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.2-kops.2",
"k8s-1.8": "2.5.2-kops.2",
"k8s-1.12": "2.5.2-kops.3",
"k8s-1.7": "2.6.0-kops.2",
"k8s-1.8": "2.6.0-kops.2",
"k8s-1.12": "2.6.0-kops.3",
}

{
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 @@ -131,24 +131,24 @@ spec:
- id: k8s-1.7
kubernetesVersion: '>=1.7.0 <1.8.0'
manifest: networking.weave/k8s-1.7.yaml
manifestHash: 258ad76c3ef165f216980c96367df13a8bffb1d8
manifestHash: 0cd4e69658afad4925e27ad8b05704fe7afe8fca
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.5.2-kops.2
version: 2.6.0-kops.2
- id: k8s-1.8
kubernetesVersion: '>=1.8.0 <1.12.0'
manifest: networking.weave/k8s-1.8.yaml
manifestHash: 748a1526515a719058b99c203cd943a740675e21
manifestHash: f9d056a15c55dd906fb0d41583d457542f7136e2
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.5.2-kops.2
version: 2.6.0-kops.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: networking.weave/k8s-1.12.yaml
manifestHash: 96334bfcfa6a3ec9791b50c94674a8821cb6ad67
manifestHash: c6614394aa5efaf6d12dedd8df66b5ee3e63aa46
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.5.2-kops.3
version: 2.6.0-kops.3