add validation

Author: nandajavarma

install/installer/pkg/components/proxy/service.go

@@ -6,7 +6,6 @@ package proxy
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	"github.com/gitpod-io/gitpod/installer/pkg/config/v1/experimental"
@@ -15,14 +14,22 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
+var allowedServiceTypes = map[corev1.ServiceType]struct{}{
+	corev1.ServiceTypeLoadBalancer: {},
+	corev1.ServiceTypeClusterIP:    {},
+	corev1.ServiceTypeNodePort:     {},
+	corev1.ServiceTypeExternalName: {},
+}
+
 func service(ctx *common.RenderContext) ([]runtime.Object, error) {
 	serviceType := corev1.ServiceTypeLoadBalancer
 	_ = ctx.WithExperimental(func(cfg *experimental.Config) error {
 		if cfg.Common != nil && cfg.Common.ServiceConfig != nil {
 			st, ok := cfg.Common.ServiceConfig["proxy"]
 			if ok {
-				if strings.ToLower(st.ServiceType) == "clusterip" {
-					serviceType = corev1.ServiceTypeClusterIP
+				_, allowed := allowedServiceTypes[corev1.ServiceType(*st.ServiceType)]
+				if allowed {
+					serviceType = *st.ServiceType
 				}
 			}
 		}

install/installer/pkg/config/v1/experimental/experimental.go

@@ -24,15 +24,17 @@ type Config struct {
 }
 
 type CommonConfig struct {
-	PodConfig                map[string]*PodConfig     `json:"podConfig,omitempty"`
+	PodConfig map[string]*PodConfig `json:"podConfig,omitempty"`
+	// ServiceConfig is only supported for "proxy" service at the moment
 	ServiceConfig            map[string]*ServiceConfig `json:"serviceConfig,omitempty"`
 	StaticMessagebusPassword string                    `json:"staticMessagebusPassword"`
 }
 
 // ServiceConfig enables modification of type of service to `ClusterIP` if needed,
 // currently supported only for `proxy` service
 type ServiceConfig struct {
-	ServiceType string `json:"serviceType,omitempty"`
+	// Allowed values are: "ClusterIP", "LoadBalancer", "NodePort", "ExternalName"
+	ServiceType *corev1.ServiceType `json:"serviceType,omitempty" validate:"omitempty,service_config_type"`
 }
 
 type PodConfig struct {

install/installer/pkg/config/v1/experimental/validation.go

@@ -5,6 +5,8 @@
 package experimental
 
 import (
+	corev1 "k8s.io/api/core/v1"
+
 	"github.com/gitpod-io/gitpod/installer/pkg/cluster"
 	"github.com/go-playground/validator/v10"
 )
@@ -16,11 +18,22 @@ var TracingSampleTypeList = map[TracingSampleType]struct{}{
 	TracingSampleTypeRemote:        {},
 }
 
+var ServiceTypeList = map[corev1.ServiceType]struct{}{
+	corev1.ServiceTypeLoadBalancer: {},
+	corev1.ServiceTypeClusterIP:    {},
+	corev1.ServiceTypeNodePort:     {},
+	corev1.ServiceTypeExternalName: {},
+}
+
 var ValidationChecks = map[string]validator.Func{
 	"tracing_sampler_type": func(fl validator.FieldLevel) bool {
 		_, ok := TracingSampleTypeList[TracingSampleType(fl.Field().String())]
 		return ok
 	},
+	"service_config_type": func(fl validator.FieldLevel) bool {
+		_, ok := ServiceTypeList[corev1.ServiceType(fl.Field().String())]
+		return ok
+	},
 }
 
 func ClusterValidation(cfg *Config) cluster.ValidationChecks {