mirror of https://github.com/kubernetes/kops.git
Update Weave Net to 2.6.5
This commit is contained in:
parent
d6929b6335
commit
df1302887e
|
|
@ -13347,7 +13347,7 @@ spec:
|
|||
name: weave-net
|
||||
key: network-password
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-kube:2.6.4'
|
||||
image: 'weaveworks/weave-kube:2.6.5'
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 6782
|
||||
|
|
@ -13394,7 +13394,7 @@ spec:
|
|||
- name: EXTRA_ARGS
|
||||
value: "{{ .Networking.Weave.NPCExtraArgs }}"
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-npc:2.6.4'
|
||||
image: 'weaveworks/weave-npc:2.6.5'
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 6781
|
||||
|
|
@ -13644,7 +13644,7 @@ spec:
|
|||
name: weave-net
|
||||
key: network-password
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-kube:2.6.4'
|
||||
image: 'weaveworks/weave-kube:2.6.5'
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 6782
|
||||
|
|
@ -13691,7 +13691,7 @@ spec:
|
|||
- name: EXTRA_ARGS
|
||||
value: "{{ .Networking.Weave.NPCExtraArgs }}"
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-npc:2.6.4'
|
||||
image: 'weaveworks/weave-npc:2.6.5'
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 6781
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ spec:
|
|||
name: weave-net
|
||||
key: network-password
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-kube:2.6.4'
|
||||
image: 'weaveworks/weave-kube:2.6.5'
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 6782
|
||||
|
|
@ -222,7 +222,7 @@ spec:
|
|||
- name: EXTRA_ARGS
|
||||
value: "{{ .Networking.Weave.NPCExtraArgs }}"
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-npc:2.6.4'
|
||||
image: 'weaveworks/weave-npc:2.6.5'
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 6781
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ spec:
|
|||
name: weave-net
|
||||
key: network-password
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-kube:2.6.4'
|
||||
image: 'weaveworks/weave-kube:2.6.5'
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 6782
|
||||
|
|
@ -219,7 +219,7 @@ spec:
|
|||
- name: EXTRA_ARGS
|
||||
value: "{{ .Networking.Weave.NPCExtraArgs }}"
|
||||
{{- end }}
|
||||
image: 'weaveworks/weave-npc:2.6.4'
|
||||
image: 'weaveworks/weave-npc:2.6.5'
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 6781
|
||||
|
|
|
|||
|
|
@ -636,8 +636,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.4-kops.1",
|
||||
"k8s-1.12": "2.6.4-kops.1",
|
||||
"k8s-1.8": "2.6.5-kops.1",
|
||||
"k8s-1.12": "2.6.5-kops.1",
|
||||
}
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -89,16 +89,16 @@ spec:
|
|||
- id: k8s-1.8
|
||||
kubernetesVersion: <1.12.0
|
||||
manifest: networking.weave/k8s-1.8.yaml
|
||||
manifestHash: f8b6cd9ce602b4c812cb6a60b8a5d7639bab75d5
|
||||
manifestHash: d1bc5539972f06bbad6427651900d896ecaaaf34
|
||||
name: networking.weave
|
||||
selector:
|
||||
role.kubernetes.io/networking: "1"
|
||||
version: 2.6.4-kops.1
|
||||
version: 2.6.5-kops.1
|
||||
- id: k8s-1.12
|
||||
kubernetesVersion: '>=1.12.0'
|
||||
manifest: networking.weave/k8s-1.12.yaml
|
||||
manifestHash: 9274099876041660ea8a7048a43a3512f7339021
|
||||
manifestHash: 8b47cd3c6e82e5f0c8f9a13ccb34b730bb0b6da3
|
||||
name: networking.weave
|
||||
selector:
|
||||
role.kubernetes.io/networking: "1"
|
||||
version: 2.6.4-kops.1
|
||||
version: 2.6.5-kops.1
|
||||
|
|
|
|||
Loading…
Reference in New Issue