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

Add a v1.7.0 storage addon resource. 

Fixes #3298
This commit is contained in:
Mike Splain 2017-10-20 10:13:29 -04:00
parent 760da7eeba
commit e000d21673
6 changed files with 127 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.7.0.yaml Normal file
View File

@ -0,0 +1,23 @@
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: default
labels:
k8s-addon: storage-aws.addons.k8s.io
provisioner: kubernetes.io/aws-ebs
parameters:
type: gp2
---
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: gp2
annotations:
storageclass.beta.kubernetes.io/is-default-class: "true"
labels:
k8s-addon: storage-aws.addons.k8s.io
provisioner: kubernetes.io/aws-ebs
parameters:
type: gp2

13
upup/models/cloudup/resources/addons/storage-gce.addons.k8s.io/v1.7.0.yaml Normal file
View File

@ -0,0 +1,13 @@
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: standard
annotations:
storageclass.beta.kubernetes.io/is-default-class: "true"
labels:
kubernetes.io/cluster-service: "true"
k8s-addon: storage-gce.addons.k8s.io
addonmanager.kubernetes.io/mode: EnsureExists
provisioner: kubernetes.io/gce-pd
parameters:
type: pd-standard

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

@ -258,32 +258,72 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if kops.CloudProviderID(b.cluster.Spec.CloudProvider) == kops.CloudProviderAWS { if kops.CloudProviderID(b.cluster.Spec.CloudProvider) == kops.CloudProviderAWS {
key := "storage-aws.addons.k8s.io" key := "storage-aws.addons.k8s.io"
version := "1.6.0" version := "1.7.0"
location := key + "/v" + version + ".yaml" {
id := "v1.7.0"
location := key + "/" + id + ".yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Version: fi.String(version), Version: fi.String(version),
Selector: map[string]string{"k8s-addon": key}, Selector: map[string]string{"k8s-addon": key},
Manifest: fi.String(location), Manifest: fi.String(location),
}) KubernetesVersion: ">=1.7.0",
manifests[key] = "addons/" + location Id: id,
})
manifests[key+"-"+id] = "addons/" + location
}
{
id := "v1.6.0"
location := key + "/" + id + ".yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key),
Version: fi.String(version),
Selector: map[string]string{"k8s-addon": key},
Manifest: fi.String(location),
KubernetesVersion: "<1.7.0",
Id: id,
})
manifests[key+"-"+id] = "addons/" + location
}
} }
if kops.CloudProviderID(b.cluster.Spec.CloudProvider) == kops.CloudProviderGCE { if kops.CloudProviderID(b.cluster.Spec.CloudProvider) == kops.CloudProviderGCE {
key := "storage-gce.addons.k8s.io" key := "storage-gce.addons.k8s.io"
version := "1.6.0" version := "1.7.0"
location := key + "/v" + version + ".yaml" {
id := "v1.6.0"
location := key + "/" + id + ".yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Version: fi.String(version), Version: fi.String(version),
Selector: map[string]string{"k8s-addon": key}, Selector: map[string]string{"k8s-addon": key},
Manifest: fi.String(location), Manifest: fi.String(location),
}) KubernetesVersion: "<1.7.0",
manifests[key] = "addons/" + location Id: id,
})
manifests[key+"-"+id] = "addons/" + location
}
{
id := "v1.7.0"
location := key + "/" + id + ".yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key),
Version: fi.String(version),
Selector: map[string]string{"k8s-addon": key},
Manifest: fi.String(location),
KubernetesVersion: ">=1.7.0",
Id: id,
})
manifests[key+"-"+id] = "addons/" + location
}
} }
// The role.kubernetes.io/networking is used to label anything related to a networking addin, // The role.kubernetes.io/networking is used to label anything related to a networking addin,

13
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
View File

@ -49,11 +49,20 @@ spec:
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
version: 1.7.1 version: 1.7.1
- manifest: storage-aws.addons.k8s.io/v1.6.0.yaml - id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
name: storage-aws.addons.k8s.io name: storage-aws.addons.k8s.io
selector: selector:
k8s-addon: storage-aws.addons.k8s.io k8s-addon: storage-aws.addons.k8s.io
version: 1.6.0 version: 1.7.0
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.7.0
- id: pre-k8s-1.6 - id: pre-k8s-1.6
kubernetesVersion: <1.6.0 kubernetesVersion: <1.6.0
manifest: networking.kope.io/pre-k8s-1.6.yaml manifest: networking.kope.io/pre-k8s-1.6.yaml

13
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View File

@ -49,8 +49,17 @@ spec:
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
version: 1.7.1 version: 1.7.1
- manifest: storage-aws.addons.k8s.io/v1.6.0.yaml - id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
name: storage-aws.addons.k8s.io name: storage-aws.addons.k8s.io
selector: selector:
k8s-addon: storage-aws.addons.k8s.io k8s-addon: storage-aws.addons.k8s.io
version: 1.6.0 version: 1.7.0
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.7.0

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

@ -49,11 +49,20 @@ spec:
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
version: 1.7.1 version: 1.7.1
- manifest: storage-aws.addons.k8s.io/v1.6.0.yaml - id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
name: storage-aws.addons.k8s.io name: storage-aws.addons.k8s.io
selector: selector:
k8s-addon: storage-aws.addons.k8s.io k8s-addon: storage-aws.addons.k8s.io
version: 1.6.0 version: 1.7.0
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.7.0
- id: pre-k8s-1.6 - id: pre-k8s-1.6
kubernetesVersion: <1.6.0 kubernetesVersion: <1.6.0
manifest: networking.weave/pre-k8s-1.6.yaml manifest: networking.weave/pre-k8s-1.6.yaml