Add default storage class. Fixes #80

heptio · Oct 7, 2017 · 6320009 · 6320009
1 parent 58d910b
commit 6320009
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/scripts/default.storageclass.yaml b/scripts/default.storageclass.yaml
@@ -0,0 +1,9 @@
+apiVersion: storage.k8s.io/v1beta1
+kind: StorageClass
+metadata:
+  name: gp2
+  annotations:
+    storageclass.beta.kubernetes.io/is-default-class: "true"
+provisioner: kubernetes.io/aws-ebs
+parameters:
+  type: gp2
diff --git a/scripts/setup-k8s-master.sh.in b/scripts/setup-k8s-master.sh.in
@@ -27,6 +27,7 @@ test -n "{{LoadBalancerName}}"
 test -n "{{ClusterToken}}"
 test -n "{{NetworkingProviderUrl}}"
 test -n "{{DashboardUrl}}"
+test -n "{{StorageClassUrl}}"
 test -n "{{Region}}"
 
 # kubeadm wants lowercase for DNS (as it probably should)
@@ -68,6 +69,9 @@ kubectl apply -f {{NetworkingProviderUrl}}
 # Install the kubernetes dashboard by default
 kubectl apply -f {{DashboardUrl}}
 
+# Install the default StorageClass
+kubectl apply -f {{StorageClassUrl}}
+
 INSTANCE_ID=$(ec2metadata --instance-id)
 # Add this machine (master) to the load balancer for external access
 aws elb register-instances-with-load-balancer \

diff --git a/templates/kubernetes-cluster.template b/templates/kubernetes-cluster.template
@@ -358,6 +358,7 @@ Resources:
                 ClusterToken: !GetAtt KubeadmToken.Token
                 NetworkingProviderUrl: !Sub "https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}/scripts/${NetworkingProvider}.yaml"
                 DashboardUrl: !Sub "https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}/scripts/dashboard.yaml"
+                StorageClassUrl: !Sub "https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}/scripts/default.storageclass.yaml"
                 Region: !Ref AWS::Region
 
           commands: