[installer]: extract the minio incluster helm config into it's own package

Author: Simon Emms

installer/pkg/components/minio/helm.go

@@ -2,38 +2,22 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License-AGPL.txt in the project root for license information.
 
+// Minio is used for both incluster deployments and as a facade for non-GCP storage providers
+
 package minio
 
 import (
-	"fmt"
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
-	"github.com/gitpod-io/gitpod/installer/pkg/helm"
-	"github.com/gitpod-io/gitpod/installer/third_party/charts"
-	"helm.sh/helm/v3/pkg/cli/values"
+	"github.com/gitpod-io/gitpod/installer/pkg/components/minio/incluster"
 	"k8s.io/utils/pointer"
 )
 
 var Helm = common.CompositeHelmFunc(
-	helm.ImportTemplate(charts.Minio(), helm.TemplateConfig{}, func(cfg *common.RenderContext) (*common.HelmConfig, error) {
-		accessKey := cfg.Values.StorageAccessKey
-		if accessKey == "" {
-			return nil, fmt.Errorf("unknown value: storage access key")
-		}
-		secretKey := cfg.Values.StorageSecretKey
-		if secretKey == "" {
-			return nil, fmt.Errorf("unknown value: storage secret key")
+	func(cfg *common.RenderContext) ([]string, error) {
+		if pointer.BoolDeref(cfg.Config.ObjectStorage.InCluster, false) {
+			return incluster.Helm(ServiceAPIPort, ServiceConsolePort)(cfg)
 		}
 
-		return &common.HelmConfig{
-			Enabled: pointer.BoolDeref(cfg.Config.ObjectStorage.InCluster, false),
-			Values: &values.Options{
-				Values: []string{
-					helm.KeyValue("minio.auth.rootUser", accessKey),
-					helm.KeyValue("minio.auth.rootPassword", secretKey),
-					helm.KeyValue("service.ports.api", fmt.Sprintf("%d", ServiceAPIPort)),
-					helm.KeyValue("service.ports.console", fmt.Sprintf("%d", ServiceConsolePort)),
-				},
-			},
-		}, nil
-	}),
+		return nil, nil
+	},
 )

installer/pkg/components/minio/incluster/minio.go

@@ -0,0 +1,31 @@
+// Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package incluster
+
+import (
+	"fmt"
+	"github.com/gitpod-io/gitpod/installer/pkg/common"
+	"github.com/gitpod-io/gitpod/installer/pkg/helm"
+	"github.com/gitpod-io/gitpod/installer/third_party/charts"
+	"helm.sh/helm/v3/pkg/cli/values"
+)
+
+var Helm = func(apiPort int32, consolePort int32) common.HelmFunc {
+	return common.CompositeHelmFunc(
+		helm.ImportTemplate(charts.Minio(), helm.TemplateConfig{}, func(cfg *common.RenderContext) (*common.HelmConfig, error) {
+			return &common.HelmConfig{
+				Enabled: true,
+				Values: &values.Options{
+					Values: []string{
+						helm.KeyValue("minio.auth.rootUser", cfg.Values.StorageAccessKey),
+						helm.KeyValue("minio.auth.rootPassword", cfg.Values.StorageSecretKey),
+						helm.KeyValue("minio.service.ports.api", fmt.Sprintf("%d", apiPort)),
+						helm.KeyValue("minio.service.ports.console", fmt.Sprintf("%d", consolePort)),
+					},
+				},
+			}, nil
+		}),
+	)
+}