Merge pull request #1361 from justinsb/aws_storage_fix

Fix AWS storage manifest location

upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.5.0.yaml

@@ -6,6 +6,7 @@ metadata:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
     kubernetes.io/cluster-service: "true"
+    k8s-addon: storage-aws.addons.k8s.io
 provisioner: kubernetes.io/aws-ebs
 parameters:
   type: gp2

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -128,12 +128,20 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 		manifests[key] = "addons/" + location
 	}
 
-	addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+	{
-		Name:     fi.String("storage-aws"),
+		key := "storage-aws.addons.k8s.io"
-		Version:  fi.String("1.5.0"),
+		version := "1.5.0"
-		Selector: map[string]string{"k8s-addon": "storage-aws.addons.k8s.io"},
+
-		Manifest: fi.String("storage-aws/v1.5.0.yaml"),
+		location := key + "/v" + version + ".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),
+		})
+		manifests[key] = "addons/" + location
+	}
 
 	if b.cluster.Spec.Networking.Kopeio != nil {
 		key := "networking.kope.io"

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

@@ -24,8 +24,8 @@ spec:
     selector:
       k8s-addon: dns-controller.addons.k8s.io
     version: 1.4.1
-  - manifest: storage-aws/v1.5.0.yaml
+  - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
-    name: storage-aws
+    name: storage-aws.addons.k8s.io
     selector:
       k8s-addon: storage-aws.addons.k8s.io
     version: 1.5.0

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml

@@ -24,8 +24,8 @@ spec:
     selector:
       k8s-addon: dns-controller.addons.k8s.io
     version: 1.4.1
-  - manifest: storage-aws/v1.5.0.yaml
+  - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
-    name: storage-aws
+    name: storage-aws.addons.k8s.io
     selector:
       k8s-addon: storage-aws.addons.k8s.io
     version: 1.5.0