From 907275a4e9f2bd3cfd104cc5a1963705bd1209c9 Mon Sep 17 00:00:00 2001 From: Juan-Lee Pang Date: Thu, 18 Apr 2019 17:16:43 -0700 Subject: [PATCH] Add azure default storageclass --- assets/azure.yaml | 10 +++++++ .../clusterstorage_controller.go | 15 ++++++----- pkg/generated/bindata.go | 27 ++++++++++++++++--- 3 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 assets/azure.yaml diff --git a/assets/azure.yaml b/assets/azure.yaml new file mode 100644 index 000000000..653dc23dc --- /dev/null +++ b/assets/azure.yaml @@ -0,0 +1,10 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: managed-premium + annotations: + storageclass.kubernetes.io/is-default-class: "true" +provisioner: kubernetes.io/azure-disk +parameters: + kind: Managed + storageaccounttype: Premium_LRS diff --git a/pkg/controller/clusterstorage/clusterstorage_controller.go b/pkg/controller/clusterstorage/clusterstorage_controller.go index 229de8897..d7651354d 100644 --- a/pkg/controller/clusterstorage/clusterstorage_controller.go +++ b/pkg/controller/clusterstorage/clusterstorage_controller.go @@ -296,15 +296,16 @@ func (r *ReconcileClusterStorage) syncStatus(clusterOperator *configv1.ClusterOp } func newStorageClassForCluster(infrastructure *configv1.Infrastructure) (*storagev1.StorageClass, error) { - platform := infrastructure.Status.Platform - - if platform == configv1.AWSPlatform { + switch infrastructure.Status.Platform { + case configv1.AWSPlatform: return resourceread.ReadStorageClassV1OrDie(generated.MustAsset("assets/aws.yaml")), nil - } else if platform == configv1.OpenStackPlatform { + case configv1.AzurePlatform: + return resourceread.ReadStorageClassV1OrDie(generated.MustAsset("assets/azure.yaml")), nil + case configv1.OpenStackPlatform: return resourceread.ReadStorageClassV1OrDie(generated.MustAsset("assets/openstack.yaml")), nil - } else if platform == configv1.VSpherePlatform { + case configv1.VSpherePlatform: return resourceread.ReadStorageClassV1OrDie(generated.MustAsset("assets/vsphere.yaml")), nil + default: + return nil, unsupportedPlatformError } - - return nil, unsupportedPlatformError } diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go index 03f144a93..59659bc76 100644 --- a/pkg/generated/bindata.go +++ b/pkg/generated/bindata.go @@ -1,10 +1,9 @@ -// Code generated by go-bindata. +// Code generated by go-bindata. DO NOT EDIT. @generated // sources: // assets/aws.yaml +// assets/azure.yaml // assets/openstack.yaml // assets/vsphere.yaml -// DO NOT EDIT! - package generated import ( @@ -90,6 +89,26 @@ func assetsAwsYaml() (*asset, error) { return a, nil } +var _assetsAzureYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\x8f\x4d\x4b\x04\x31\x0c\x86\xef\xfd\x15\x61\xef\x1d\xf1\x26\xbd\x7a\x55\x58\x76\xc1\xab\xc4\x69\x5c\xc2\x4c\xd3\x92\xa4\x0b\xe3\xaf\x97\x99\xa2\xb0\xd7\x7c\xbc\xcf\xf3\x62\xe3\x0f\x52\xe3\x2a\x09\xcc\xab\xe2\x8d\xa6\xe5\xc5\x26\xae\x4f\xf7\xe7\xb0\xb0\xe4\x04\xd7\x31\x7f\x5d\xd1\x2c\x14\x72\xcc\xe8\x98\x02\x80\x60\xa1\x04\x05\x05\x6f\x94\x63\x53\x2a\xdc\x4b\x54\x72\x64\x09\x00\x28\x52\x1d\x9d\xab\xd8\x7e\x0d\x7f\x80\x79\x0f\x9a\x96\xfe\x45\x2a\xe4\x74\xc0\xd8\x62\xa6\x6f\xec\xab\xc7\x63\x9d\xe0\xe4\xda\xe9\x14\x9a\xd6\x3b\xef\x7e\xa4\x09\x1e\x7f\xf0\xa7\x2b\xc5\xcc\xb6\x04\xdd\x43\xb9\x9c\xeb\xca\xf3\x96\xe0\x32\x14\x1a\x2a\x16\x72\xd2\x83\x3f\xca\xbc\x0f\xdb\xf0\x6f\x83\xf3\x5c\xbb\xb8\x6f\x8d\x12\x9c\x47\x87\xcf\xb7\xcb\x35\xfc\x06\x00\x00\xff\xff\x06\xc7\xaf\xdb\x1b\x01\x00\x00") + +func assetsAzureYamlBytes() ([]byte, error) { + return bindataRead( + _assetsAzureYaml, + "assets/azure.yaml", + ) +} + +func assetsAzureYaml() (*asset, error) { + bytes, err := assetsAzureYamlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "assets/azure.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + var _assetsOpenstackYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\x8e\xb1\x8e\xc3\x30\x0c\x43\x77\x7f\x85\x90\x3d\x3e\xdc\x76\xf0\x7a\x9f\x50\xa0\x3b\x13\xab\x85\x90\x44\x0e\x24\x25\xdf\x5f\x38\x45\x87\xae\x24\x1f\x49\xec\x72\x67\x73\x69\x5a\xc8\xa3\x19\x9e\x9c\x97\x3f\xcf\xd2\x7e\xce\xdf\xb4\x88\xd6\x42\xb7\xb7\xfe\xbf\xc2\x3d\x6d\x1c\xa8\x08\x94\x44\xa4\xd8\xb8\x63\xd0\x0a\xab\x89\x08\xaa\x2d\x10\xd2\xd4\xbb\x4f\x9f\xca\xb9\xa3\x79\xe2\x40\x5e\x8e\x89\x4d\x39\xf8\xda\x10\x1f\x2b\x3f\x70\xac\x31\x5e\x99\x42\x43\xd8\xc1\x43\xda\xad\x9d\xd2\x6f\xb1\x15\xfa\x66\x66\xd1\xca\x96\x5e\x01\x00\x00\xff\xff\xf3\x03\x04\x7a\xba\x00\x00\x00") func assetsOpenstackYamlBytes() ([]byte, error) { @@ -183,6 +202,7 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ "assets/aws.yaml": assetsAwsYaml, + "assets/azure.yaml": assetsAzureYaml, "assets/openstack.yaml": assetsOpenstackYaml, "assets/vsphere.yaml": assetsVsphereYaml, } @@ -229,6 +249,7 @@ type bintree struct { var _bintree = &bintree{nil, map[string]*bintree{ "assets": &bintree{nil, map[string]*bintree{ "aws.yaml": &bintree{assetsAwsYaml, map[string]*bintree{}}, + "azure.yaml": &bintree{assetsAzureYaml, map[string]*bintree{}}, "openstack.yaml": &bintree{assetsOpenstackYaml, map[string]*bintree{}}, "vsphere.yaml": &bintree{assetsVsphereYaml, map[string]*bintree{}}, }},