mirror of https://github.com/kubernetes/kops.git
Merge pull request #4062 from justinsb/bump_weave_for_212
Automatic merge from submit-queue. Bump weave version in bootstrapchannelbuilder 2.1.3 upstream becomes 2.1.3-kops.1, so if we need to make our own "packaging" changes, we can do 2.1.3-kops.2 etc.
This commit is contained in:
commit
a19d90143f
|
@ -388,8 +388,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
|
||||||
|
|
||||||
if b.cluster.Spec.Networking.Weave != nil {
|
if b.cluster.Spec.Networking.Weave != nil {
|
||||||
key := "networking.weave"
|
key := "networking.weave"
|
||||||
// 2.0.6-kops.1 = 2.0.5 with kops manifest tweaks. This should go away with the next version bump.
|
// 2.1.3-kops.1 = 2.1.3, kops packaging version 1.
|
||||||
version := "2.0.6-kops.1"
|
version := "2.1.3-kops.1"
|
||||||
|
|
||||||
{
|
{
|
||||||
location := key + "/pre-k8s-1.6.yaml"
|
location := key + "/pre-k8s-1.6.yaml"
|
||||||
|
|
|
@ -69,18 +69,18 @@ spec:
|
||||||
name: networking.weave
|
name: networking.weave
|
||||||
selector:
|
selector:
|
||||||
role.kubernetes.io/networking: "1"
|
role.kubernetes.io/networking: "1"
|
||||||
version: 2.0.6-kops.1
|
version: 2.1.3-kops.1
|
||||||
- id: k8s-1.6
|
- id: k8s-1.6
|
||||||
kubernetesVersion: '>=1.6.0 <1.7.0'
|
kubernetesVersion: '>=1.6.0 <1.7.0'
|
||||||
manifest: networking.weave/k8s-1.6.yaml
|
manifest: networking.weave/k8s-1.6.yaml
|
||||||
name: networking.weave
|
name: networking.weave
|
||||||
selector:
|
selector:
|
||||||
role.kubernetes.io/networking: "1"
|
role.kubernetes.io/networking: "1"
|
||||||
version: 2.0.6-kops.1
|
version: 2.1.3-kops.1
|
||||||
- id: k8s-1.7
|
- id: k8s-1.7
|
||||||
kubernetesVersion: '>=1.7.0'
|
kubernetesVersion: '>=1.7.0'
|
||||||
manifest: networking.weave/k8s-1.7.yaml
|
manifest: networking.weave/k8s-1.7.yaml
|
||||||
name: networking.weave
|
name: networking.weave
|
||||||
selector:
|
selector:
|
||||||
role.kubernetes.io/networking: "1"
|
role.kubernetes.io/networking: "1"
|
||||||
version: 2.0.6-kops.1
|
version: 2.1.3-kops.1
|
||||||
|
|
Loading…
Reference in New Issue