mirror of https://github.com/kubernetes/kops.git
parent
a9fb0d8004
commit
5eadcbcfea
|
@ -388,8 +388,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
|
|||
|
||||
if b.cluster.Spec.Networking.Weave != nil {
|
||||
key := "networking.weave"
|
||||
// 2.1.3-kops.2 = 2.1.3, kops packaging version 2.
|
||||
version := "2.1.3-kops.2"
|
||||
// 2.2.0-kops.2 = 2.2.0, kops packaging version 1.
|
||||
version := "2.2.0-kops.1"
|
||||
|
||||
{
|
||||
location := key + "/pre-k8s-1.6.yaml"
|
||||
|
|
|
@ -69,18 +69,18 @@ spec:
|
|||
name: networking.weave
|
||||
selector:
|
||||
role.kubernetes.io/networking: "1"
|
||||
version: 2.1.3-kops.2
|
||||
version: 2.2.0-kops.1
|
||||
- id: k8s-1.6
|
||||
kubernetesVersion: '>=1.6.0 <1.7.0'
|
||||
manifest: networking.weave/k8s-1.6.yaml
|
||||
name: networking.weave
|
||||
selector:
|
||||
role.kubernetes.io/networking: "1"
|
||||
version: 2.1.3-kops.2
|
||||
version: 2.2.0-kops.1
|
||||
- id: k8s-1.7
|
||||
kubernetesVersion: '>=1.7.0'
|
||||
manifest: networking.weave/k8s-1.7.yaml
|
||||
name: networking.weave
|
||||
selector:
|
||||
role.kubernetes.io/networking: "1"
|
||||
version: 2.1.3-kops.2
|
||||
version: 2.2.0-kops.1
|
||||
|
|
Loading…
Reference in New Issue