From 2b06a635cdc81d0308895a897126e1b336a5d26c Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Thu, 5 Jan 2017 01:13:38 -0500
Subject: [PATCH] Fix AWS storage manifest location

---
 .../v1.5.0.yaml                               |  1 +
 .../pkg/fi/cloudup/bootstrapchannelbuilder.go | 20 +++++++++++++------
 .../kopeio-vxlan/manifest.yaml                |  4 ++--
 .../simple/manifest.yaml                      |  4 ++--
 4 files changed, 19 insertions(+), 10 deletions(-)
 rename upup/models/cloudup/resources/addons/{storage-aws => storage-aws.addons.k8s.io}/v1.5.0.yaml (86%)

diff --git a/upup/models/cloudup/resources/addons/storage-aws/v1.5.0.yaml b/upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.5.0.yaml
similarity index 86%
rename from upup/models/cloudup/resources/addons/storage-aws/v1.5.0.yaml
rename to upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.5.0.yaml
index 0f7039bf40..366aa180a5 100644
--- a/upup/models/cloudup/resources/addons/storage-aws/v1.5.0.yaml
+++ b/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
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index 2849adf368..669ffe8b73 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/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"),
-		Version:  fi.String("1.5.0"),
-		Selector: map[string]string{"k8s-addon": "storage-aws.addons.k8s.io"},
-		Manifest: fi.String("storage-aws/v1.5.0.yaml"),
-	})
+	{
+		key := "storage-aws.addons.k8s.io"
+		version := "1.5.0"
+
+		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"
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
index 9851de4f7f..bb9411bafc 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+++ b/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
-    name: storage-aws
+  - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
+    name: storage-aws.addons.k8s.io
     selector:
       k8s-addon: storage-aws.addons.k8s.io
     version: 1.5.0
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
index 5ed36a052f..ed076eb5e6 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+++ b/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
-    name: storage-aws
+  - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
+    name: storage-aws.addons.k8s.io
     selector:
       k8s-addon: storage-aws.addons.k8s.io
     version: 1.5.0