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.1 #8691

Merged
merged 1 commit into from
Mar 6, 2020
Merged

Update Weave Net to version 2.6.1 #8691

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
7 changes: 5 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.6.0'
image: 'weaveworks/weave-kube:2.6.1'
ports:
- name: metrics
containerPort: 6782
Expand Down Expand Up @@ -203,6 +203,7 @@ spec:
mountPath: /lib/modules
- name: xtables-lock
mountPath: /run/xtables.lock
readOnly: false
- name: weave-npc
args: []
env:
Expand All @@ -215,7 +216,7 @@ spec:
- name: EXTRA_ARGS
value: "{{ .Networking.Weave.NPCExtraArgs }}"
{{- end }}
image: 'weaveworks/weave-npc:2.6.0'
image: 'weaveworks/weave-npc:2.6.1'
ports:
- name: metrics
containerPort: 6781
Expand All @@ -233,7 +234,9 @@ spec:
volumeMounts:
- name: xtables-lock
mountPath: /run/xtables.lock
readOnly: false
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
hostPID: true
restartPolicy: Always
securityContext:
Expand Down
6 changes: 4 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.6.0'
image: 'weaveworks/weave-kube:2.6.1'
ports:
- name: metrics
containerPort: 6782
Expand Down Expand Up @@ -199,6 +199,7 @@ spec:
mountPath: /lib/modules
- name: xtables-lock
mountPath: /run/xtables.lock
readOnly: false
- name: weave-npc
args: []
env:
Expand All @@ -211,7 +212,7 @@ spec:
- name: EXTRA_ARGS
value: "{{ .Networking.Weave.NPCExtraArgs }}"
{{- end }}
image: 'weaveworks/weave-npc:2.6.0'
image: 'weaveworks/weave-npc:2.6.1'
ports:
- name: metrics
containerPort: 6781
Expand All @@ -229,6 +230,7 @@ spec:
volumeMounts:
- name: xtables-lock
mountPath: /run/xtables.lock
readOnly: false
hostNetwork: true
hostPID: true
restartPolicy: Always
Expand Down
4 changes: 2 additions & 2 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if b.cluster.Spec.Networking.Weave != nil {
key := "networking.weave"
versions := map[string]string{
"k8s-1.8": "2.6.0-kops.2",
"k8s-1.12": "2.6.0-kops.3",
"k8s-1.8": "2.6.1-kops.1",
"k8s-1.12": "2.6.1-kops.1",
}

{
Expand Down
8 changes: 4 additions & 4 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 @@ -89,16 +89,16 @@ spec:
- id: k8s-1.8
kubernetesVersion: <1.12.0
manifest: networking.weave/k8s-1.8.yaml
manifestHash: 50a20409003956b7c31a479408ca42ec97774854
manifestHash: 7aa5336ec05aef46b185cb660fc02bb2ac201852
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.6.0-kops.2
version: 2.6.1-kops.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: networking.weave/k8s-1.12.yaml
manifestHash: d2df87d90f8877a201f5cad93de296697191d4ae
manifestHash: 6f12295454fef72234205b7e6c62cdac656eab52
name: networking.weave
selector:
role.kubernetes.io/networking: "1"
version: 2.6.0-kops.3
version: 2.6.1-kops.1