Cleanup

Author: aledbf

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

@@ -36,11 +36,6 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil
 	})
 
-	license := ""
-	if ctx.Config.License != nil {
-		license = licenseFilePath
-	}
-
 	workspaceImage := ctx.Config.Workspace.WorkspaceImage
 	if workspaceImage == "" {
 		workspaceImage = ctx.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, ""), workspace.DefaultWorkspaceImage, workspace.DefaultWorkspaceImageVersion)
@@ -208,7 +203,6 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		Version:               ctx.VersionManifest.Version,
 		HostURL:               fmt.Sprintf("https://%s", ctx.Config.Domain),
 		InstallationShortname: ctx.Config.Metadata.InstallationShortname,
-		LicenseFile:           license,
 		WorkspaceHeartbeat: WorkspaceHeartbeat{
 			IntervalSeconds: 60,
 			TimeoutSeconds:  300,

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

@@ -120,22 +120,6 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 
 	volumes := make([]corev1.Volume, 0)
 	volumeMounts := make([]corev1.VolumeMount, 0)
-	if ctx.Config.License != nil {
-		volumes = append(volumes, corev1.Volume{
-			Name: "gitpod-license-key",
-			VolumeSource: corev1.VolumeSource{
-				Secret: &corev1.SecretVolumeSource{
-					SecretName: ctx.Config.License.Name,
-				},
-			},
-		})
-
-		volumeMounts = append(volumeMounts, corev1.VolumeMount{
-			Name:      "gitpod-license-key",
-			MountPath: licenseFilePath,
-			SubPath:   "license",
-		})
-	}
 
 	if len(ctx.Config.AuthProviders) > 0 {
 		for i, provider := range ctx.Config.AuthProviders {

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

@@ -19,7 +19,6 @@ type ConfigSerialized struct {
 	DevBranch                         string   `json:"devBranch"`
 	InsecureNoDomain                  bool     `json:"insecureNoDomain"`
 	License                           string   `json:"license"`
-	LicenseFile                       string   `json:"licenseFile"`
 	DefinitelyGpDisabled              bool     `json:"definitelyGpDisabled"`
 	EnableLocalApp                    bool     `json:"enableLocalApp"`
 	DisableDynamicAuthProviderLogin   bool     `json:"disableDynamicAuthProviderLogin"`