Adds a layer field to the profiles response (#1277)

* Adds a layer field to the profiles response

- Layers allow you to specify the order in which profiles are installed

* fixes tests

* fixes up formatting

* new buf

* fixes cuddling

* Add comment about Layers

api/profiles/profiles.proto

@@ -75,6 +75,8 @@ message Profile {
   HelmRepository helm_repository = 10;
   // A list of available versions
   repeated string available_versions = 11;
+  // The layer of the profile
+  string layer = 12;
 }
 
 message GetProfilesRequest {

api/profiles/profiles.swagger.json

@@ -235,6 +235,10 @@
             "type": "string"
           },
           "title": "A list of available versions"
+        },
+        "layer": {
+          "type": "string",
+          "title": "The layer of the profile"
         }
       }
     }

pkg/helm/charts.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/url"
+	"os"
 	"path"
 	"sort"
 
@@ -27,6 +28,11 @@ import (
 // that they provide a Profile.
 const ProfileAnnotation = "weave.works/profile"
 
+// LayerAnnotation specifies profile application order.
+// Profiles are sorted by layer and those at a higher "layer" are only installed after
+// lower layers have successfully installed and started.
+const LayerAnnotation = "weave.works/layer"
+
 // NewRepoManager creates and returns a new RepoManager.
 func NewRepoManager(kc client.Client, cacheDir string) *RepoManager {
 	return &RepoManager{
@@ -97,6 +103,7 @@ func (h *RepoManager) GetCharts(ctx context.Context, hr *sourcev1beta1.HelmRepos
 						Keywords:    v.Keywords,
 						Icon:        v.Icon,
 						KubeVersion: v.KubeVersion,
+						Layer:       getLayer(v.Annotations),
 					}
 					for _, m := range v.Maintainers {
 						p.Maintainers = append(p.Maintainers, &pb.Maintainer{
@@ -229,6 +236,16 @@ func credsForRepository(ctx context.Context, kc client.Client, hr *sourcev1beta1
 }
 
 func fetchIndexFile(chartURL string) (*repo.IndexFile, error) {
+	if hostname := os.Getenv("SOURCE_CONTROLLER_LOCALHOST"); hostname != "" {
+		u, err := url.Parse(chartURL)
+		if err != nil {
+			return nil, err
+		}
+
+		u.Host = hostname
+		chartURL = u.String()
+	}
+
 	u, err := url.Parse(chartURL)
 	if err != nil {
 		return nil, fmt.Errorf("error parsing URL %q: %w", chartURL, err)
@@ -263,6 +280,10 @@ func fetchIndexFile(chartURL string) (*repo.IndexFile, error) {
 	return i, nil
 }
 
+func getLayer(annotations map[string]string) string {
+	return annotations[LayerAnnotation]
+}
+
 func hasAnnotation(cm *chart.Metadata, name string) bool {
 	for k := range cm.Annotations {
 		if k == name {

pkg/helm/charts_test.go

@@ -66,6 +66,7 @@ var _ = Describe("RepoManager", func() {
 					"1.1.0",
 					"1.1.2",
 				},
+				Layer: "layer-1",
 			}))
 		})
 

pkg/helm/testdata/with_profiles/index.yaml

@@ -36,6 +36,7 @@ entries:
     - created: 2016-10-06T16:23:20.499543808-06:00
       annotations:
         weave.works/profile: demo-profile
+        weave.works/layer: layer-1
       description: Simple demo profile
       digest: aaff4545f79d8b2913a10cb400ebb6fa9c77fe813287afbacf1a0b897cdffffff
       home: https://helm.sh/helm
@@ -76,6 +77,7 @@ entries:
     - created: 2016-10-06T16:23:20.499543808-06:00
       annotations:
         weave.works/profile: demo-profile
+        weave.works/layer: layer-1
       description: Simple demo profile
       digest: aaff4545f79d8b2913a10cb400ebb6fa9c77fe813287afbacf1a0b897cdffffff
       home: https://helm.sh/helm

ui/lib/api/profiles/profiles.pb.ts

@@ -29,6 +29,7 @@ export type Profile = {
   kubeVersion?: string
   helmRepository?: HelmRepository
   availableVersions?: string[]
+  layer?: string
 }
 
 export type GetProfilesRequest = {