kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Weave Net to 2.6.5

This commit is contained in:
Ciprian Hacman 2020-06-11 09:07:36 +03:00
parent d6929b6335
commit df1302887e
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
upup/models/bindata.go
View File

@ -13347,7 +13347,7 @@ spec:
name: weave-net name: weave-net
key: network-password key: network-password
{{- end }} {{- end }}
image: 'weaveworks/weave-kube:2.6.4' image: 'weaveworks/weave-kube:2.6.5'
ports: ports:
- name: metrics - name: metrics
containerPort: 6782 containerPort: 6782
@ -13394,7 +13394,7 @@ spec:
- name: EXTRA_ARGS - name: EXTRA_ARGS
value: "{{ .Networking.Weave.NPCExtraArgs }}" value: "{{ .Networking.Weave.NPCExtraArgs }}"
{{- end }} {{- end }}
image: 'weaveworks/weave-npc:2.6.4' image: 'weaveworks/weave-npc:2.6.5'
ports: ports:
- name: metrics - name: metrics
containerPort: 6781 containerPort: 6781
@ -13644,7 +13644,7 @@ spec:
name: weave-net name: weave-net
key: network-password key: network-password
{{- end }} {{- end }}
image: 'weaveworks/weave-kube:2.6.4' image: 'weaveworks/weave-kube:2.6.5'
ports: ports:
- name: metrics - name: metrics
containerPort: 6782 containerPort: 6782
@ -13691,7 +13691,7 @@ spec:
- name: EXTRA_ARGS - name: EXTRA_ARGS
value: "{{ .Networking.Weave.NPCExtraArgs }}" value: "{{ .Networking.Weave.NPCExtraArgs }}"
{{- end }} {{- end }}
image: 'weaveworks/weave-npc:2.6.4' image: 'weaveworks/weave-npc:2.6.5'
ports: ports:
- name: metrics - name: metrics
containerPort: 6781 containerPort: 6781

4
upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
View File

@ -175,7 +175,7 @@ spec:
name: weave-net name: weave-net
key: network-password key: network-password
{{- end }} {{- end }}
image: 'weaveworks/weave-kube:2.6.4' image: 'weaveworks/weave-kube:2.6.5'
ports: ports:
- name: metrics - name: metrics
containerPort: 6782 containerPort: 6782
@ -222,7 +222,7 @@ spec:
- name: EXTRA_ARGS - name: EXTRA_ARGS
value: "{{ .Networking.Weave.NPCExtraArgs }}" value: "{{ .Networking.Weave.NPCExtraArgs }}"
{{- end }} {{- end }}
image: 'weaveworks/weave-npc:2.6.4' image: 'weaveworks/weave-npc:2.6.5'
ports: ports:
- name: metrics - name: metrics
containerPort: 6781 containerPort: 6781

4
upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template
View File

@ -172,7 +172,7 @@ spec:
name: weave-net name: weave-net
key: network-password key: network-password
{{- end }} {{- end }}
image: 'weaveworks/weave-kube:2.6.4' image: 'weaveworks/weave-kube:2.6.5'
ports: ports:
- name: metrics - name: metrics
containerPort: 6782 containerPort: 6782
@ -219,7 +219,7 @@ spec:
- name: EXTRA_ARGS - name: EXTRA_ARGS
value: "{{ .Networking.Weave.NPCExtraArgs }}" value: "{{ .Networking.Weave.NPCExtraArgs }}"
{{- end }} {{- end }}
image: 'weaveworks/weave-npc:2.6.4' image: 'weaveworks/weave-npc:2.6.5'
ports: ports:
- name: metrics - name: metrics
containerPort: 6781 containerPort: 6781

4
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -636,8 +636,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if b.cluster.Spec.Networking.Weave != nil { if b.cluster.Spec.Networking.Weave != nil {
key := "networking.weave" key := "networking.weave"
versions := map[string]string{ versions := map[string]string{
"k8s-1.8": "2.6.4-kops.1", "k8s-1.8": "2.6.5-kops.1",
"k8s-1.12": "2.6.4-kops.1", "k8s-1.12": "2.6.5-kops.1",
} }
{ {

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -89,16 +89,16 @@ spec:
- id: k8s-1.8 - id: k8s-1.8
kubernetesVersion: <1.12.0 kubernetesVersion: <1.12.0
manifest: networking.weave/k8s-1.8.yaml manifest: networking.weave/k8s-1.8.yaml
manifestHash: f8b6cd9ce602b4c812cb6a60b8a5d7639bab75d5 manifestHash: d1bc5539972f06bbad6427651900d896ecaaaf34
name: networking.weave name: networking.weave
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
version: 2.6.4-kops.1 version: 2.6.5-kops.1
- id: k8s-1.12 - id: k8s-1.12
kubernetesVersion: '>=1.12.0' kubernetesVersion: '>=1.12.0'
manifest: networking.weave/k8s-1.12.yaml manifest: networking.weave/k8s-1.12.yaml
manifestHash: 9274099876041660ea8a7048a43a3512f7339021 manifestHash: 8b47cd3c6e82e5f0c8f9a13ccb34b730bb0b6da3
name: networking.weave name: networking.weave
selector: selector:
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
version: 2.6.4-kops.1 version: 2.6.5-kops.1