fix kots install upstream uri (#479)

* fix kots install upstream uri

* add channelSlug to test embedded release

Author: cbodonnell

.github/workflows/pull-request.yaml

@@ -86,6 +86,7 @@ jobs:
         export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
         echo "# channel release object" > e2e/kots-release-install/release.yaml
         echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
+        echo 'channelSlug: "ci"' >> e2e/kots-release-install/release.yaml
         echo 'appSlug: "embedded-cluster-smoke-test-staging-app"' >> e2e/kots-release-install/release.yaml
         echo "versionLabel: \"appver-${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
         cat e2e/kots-release-install/release.yaml

.github/workflows/release-dev.yaml

@@ -65,6 +65,7 @@ jobs:
           export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
           echo "# channel release object" > e2e/kots-release-install/release.yaml
           echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
+          echo 'channelSlug: "ci"' >> e2e/kots-release-install/release.yaml
           echo 'appSlug: "embedded-cluster-smoke-test-staging-app"' >> e2e/kots-release-install/release.yaml
           echo "versionLabel: \"appver-${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
           cat e2e/kots-release-install/release.yaml

pkg/addons/adminconsole/adminconsole.go

@@ -264,15 +264,22 @@ func (a *AdminConsole) Outro(ctx context.Context, cli client.Client) error {
 	}
 
 	var appVersionLabel string
+	var channelSlug string
 	if channelRelease, err := release.GetChannelRelease(); err != nil {
 		return fmt.Errorf("unable to get channel release: %w", err)
 	} else if channelRelease != nil {
 		appVersionLabel = channelRelease.VersionLabel
+		channelSlug = channelRelease.ChannelSlug
+	}
+
+	upstreamURI := license.Spec.AppSlug
+	if channelSlug != "" && channelSlug != "stable" {
+		upstreamURI = fmt.Sprintf("%s/%s", upstreamURI, channelSlug)
 	}
 
 	installArgs := []string{
 		"install",
-		license.Spec.AppSlug,
+		upstreamURI,
 		"--license-file",
 		a.licenseFile,
 		"--namespace",

pkg/release/release.go

@@ -153,6 +153,7 @@ func (r *ReleaseData) GetEmbeddedClusterConfig() (*embeddedclusterv1beta1.Config
 type ChannelRelease struct {
 	VersionLabel string `yaml:"versionLabel"`
 	ChannelID    string `yaml:"channelID"`
+	ChannelSlug  string `yaml:"channelSlug"`
 	AppSlug      string `yaml:"appSlug"`
 }