[installer]: allow Installer to specify licensor type

Defaults to "legacy" and allows "replicated". This is defined
by the secret

Author: Simon Emms

components/installer/pkg/components/server/configmap.go

@@ -21,8 +21,10 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 	}
 
 	license := ""
+	licenseTypeFile := ""
 	if ctx.Config.License != nil {
-		license = licenseFilePath
+		license = fmt.Sprintf("%s/license", licensePath)
+		licenseTypeFile = fmt.Sprintf("%s/licensor", licensePath) // If not set, will use "legacy"
 	}
 
 	// todo(sje): all these values are configurable
@@ -32,6 +34,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		InstallationShortname: ctx.Namespace, // todo(sje): is this needed?
 		Stage:                 "production",  // todo(sje): is this needed?
 		LicenseFile:           license,
+		LicenseTypeFile:       licenseTypeFile,
 		WorkspaceHeartbeat: WorkspaceHeartbeat{
 			IntervalSeconds: 60,
 			TimeoutSeconds:  300,

components/installer/pkg/components/server/constants.go

@@ -13,7 +13,7 @@ const (
 	ContainerPort         = 3000
 	ContainerPortName     = "http"
 	authProviderFilePath  = "/gitpod/auth-providers"
-	licenseFilePath       = "/gitpod/license"
+	licensePath           = "/gitpod/license"
 	PrometheusPort        = 9500
 	PrometheusPortName    = "metrics"
 	InstallationAdminPort = common.ServerInstallationAdminPort

components/installer/pkg/components/server/deployment.go

@@ -51,8 +51,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{
 			Name:      "gitpod-license-key",
-			MountPath: licenseFilePath,
-			SubPath:   "license",
+			MountPath: licensePath,
 			ReadOnly:  true,
 		})
 	}

components/installer/pkg/components/server/types.go

@@ -17,7 +17,9 @@ type ConfigSerialized struct {
 	DevBranch                         string   `json:"devBranch"`
 	InsecureNoDomain                  bool     `json:"insecureNoDomain"`
 	License                           string   `json:"license"`
+	LicenseType                       string   `json:"licenseType"`
 	LicenseFile                       string   `json:"licenseFile"`
+	LicenseTypeFile                   string   `json:"licenseTypeFile"`
 	DefinitelyGpDisabled              bool     `json:"definitelyGpDisabled"`
 	EnableLocalApp                    bool     `json:"enableLocalApp"`
 	BuiltinAuthProvidersConfigured    bool     `json:"builtinAuthProvidersConfigured"`

components/installer/pkg/config/v1/config.go

@@ -227,6 +227,13 @@ type Workspace struct {
 	Templates *WorkspaceTemplates `json:"templates,omitempty"`
 }
 
+type LicensorType string
+
+const (
+	LicensorTypeLegacy     LicensorType = "legacy"
+	LicensorTypeReplicated LicensorType = "replicated"
+)
+
 type FSShiftMethod string
 
 const (

components/installer/pkg/config/v1/validation.go

@@ -41,6 +41,11 @@ var FSShiftMethodList = map[FSShiftMethod]struct{}{
 	FSShiftShiftFS: {},
 }
 
+var LicensorTypeList = map[LicensorType]struct{}{
+	LicensorTypeLegacy:     {},
+	LicensorTypeReplicated: {},
+}
+
 // LoadValidationFuncs load custom validation functions for this version of the config API
 func (v version) LoadValidationFuncs(validate *validator.Validate) error {
 	funcs := map[string]validator.Func{
@@ -115,7 +120,25 @@ func (v version) ClusterValidation(rcfg interface{}) cluster.ValidationChecks {
 
 	if cfg.License != nil {
 		secretName := cfg.License.Name
-		res = append(res, cluster.CheckSecret(secretName, cluster.CheckSecretRequiredData("license")))
+		licensorKey := "type"
+		res = append(res, cluster.CheckSecret(secretName, cluster.CheckSecretRequiredData("license"), cluster.CheckSecretRecommendedData(licensorKey), cluster.CheckSecretRule(func(s *corev1.Secret) ([]cluster.ValidationError, error) {
+			errors := make([]cluster.ValidationError, 0)
+
+			licensor := LicensorType(s.Data[licensorKey])
+			if licensor != "" {
+				// This field is optional, so blank is valid
+				_, ok := LicensorTypeList[licensor]
+
+				if !ok {
+					errors = append(errors, cluster.ValidationError{
+						Message: fmt.Sprintf("Secret '%s' has invalid license type '%s'", secretName, licensor),
+						Type:    cluster.ValidationStatusError,
+					})
+				}
+			}
+
+			return errors, nil
+		})))
 	}
 
 	if len(cfg.AuthProviders) > 0 {