[installer]: allow docker-registry customization

install/installer/pkg/components/docker-registry/helm.go

@@ -41,6 +41,12 @@ var Helm = common.CompositeHelmFunc(
 			}
 		}
 
+		// Append the custom parameters
+		registryValues = helm.CustomizeAnnotation(registryValues, "docker-registry.podAnnotations", cfg, Component, common.TypeMetaDeployment)
+		registryValues = helm.CustomizeLabel(registryValues, "docker-registry.podLabels", cfg, Component, common.TypeMetaDeployment)
+		registryValues = helm.CustomizeAnnotation(registryValues, "docker-registry.service.annotations", cfg, Component, common.TypeMetaService)
+		registryValues = helm.CustomizeEnvvar(registryValues, "docker-registry.extraEnvVars", cfg, Component)
+
 		inCluster := pointer.BoolDeref(cfg.Config.ContainerRegistry.InCluster, false)
 		s3Storage := cfg.Config.ContainerRegistry.S3Storage
 		enablePersistence := "true"

install/installer/pkg/helm/helm.go

@@ -11,17 +11,20 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
-	"sigs.k8s.io/yaml"
 	"strings"
 	"syscall"
 
+	"sigs.k8s.io/yaml"
+
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	"github.com/gitpod-io/gitpod/installer/third_party/charts"
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/downloader"
 	"helm.sh/helm/v3/pkg/getter"
 	"helm.sh/helm/v3/pkg/release"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // TemplateConfig
@@ -209,3 +212,56 @@ func ImportTemplate(chart *charts.Chart, templateCfg TemplateConfig, pkgConfig P
 		return append(templates, rel.Manifest), nil
 	}
 }
+
+// CustomizeAnnotation check for customized annotations and output in Helm format
+func CustomizeAnnotation(registryValues []string, prefix string, ctx *common.RenderContext, component string, typeMeta metav1.TypeMeta, existingAnnotations ...func() map[string]string) []string {
+	annotations := common.CustomizeAnnotation(ctx, component, common.TypeMetaDeployment, existingAnnotations...)
+	if len(annotations) > 0 {
+		for k, v := range annotations {
+			registryValues = append(registryValues, KeyValue(fmt.Sprintf("%s.%s", prefix, k), v))
+		}
+	}
+
+	return registryValues
+}
+
+// CustomizeLabel check for customized labels and output in Helm format - also removes the default labels, which conflict with Helm
+func CustomizeLabel(registryValues []string, prefix string, ctx *common.RenderContext, component string, typeMeta metav1.TypeMeta, existingLabels ...func() map[string]string) []string {
+	labels := common.CustomizeLabel(ctx, component, common.TypeMetaDeployment, existingLabels...)
+
+	// Remove the default labels
+	for k := range common.DefaultLabels(component) {
+		delete(labels, k)
+	}
+
+	if len(labels) > 0 {
+		for k, v := range labels {
+			registryValues = append(registryValues, KeyValue(fmt.Sprintf("%s.%s", prefix, k), v))
+		}
+	}
+
+	return registryValues
+}
+
+// CustomizeEnvvar check for customized envvars and output in Helm format - assumes name/value only
+func CustomizeEnvvar(registryValues []string, prefix string, ctx *common.RenderContext, component string, existingEnvvars ...[]corev1.EnvVar) []string {
+	// Helm is unlikely to have any existing envvars, so treat them as optional
+	envvars := common.CustomizeEnvvar(ctx, component, func() []corev1.EnvVar {
+		envs := make([]corev1.EnvVar, 0)
+
+		for _, e := range existingEnvvars {
+			envs = append(envs, e...)
+		}
+
+		return envs
+	}())
+
+	if len(envvars) > 0 {
+		for k, v := range envvars {
+			registryValues = append(registryValues, KeyValue(fmt.Sprintf("%s[%d].name", prefix, k), v.Name))
+			registryValues = append(registryValues, KeyValue(fmt.Sprintf("%s[%d].value", prefix, k), v.Value))
+		}
+	}
+
+	return registryValues
+}