Cleanup

Author: aledbf

components/gitpod-protocol/src/license-protocol.ts

@@ -29,11 +29,6 @@ export interface GetLicenseInfoResult {
     licenseInfo: LicenseInfo;
 }
 
-export enum LicenseFeature {
-    CreateSnapshot = "create-snapshot",
-    // room for more
-}
-
 export interface LicenseService {
     validateLicense(): Promise<LicenseValidationResult>;
     getLicenseInfo(): Promise<GetLicenseInfoResult>;

components/server/ee/src/workspace/gitpod-server-impl.ts

@@ -60,7 +60,7 @@ import {
 import { ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import { v4 as uuidv4 } from "uuid";
 import { log, LogContext } from "@gitpod/gitpod-protocol/lib/util/logging";
-import { LicenseValidationResult, LicenseFeature } from "@gitpod/gitpod-protocol/lib/license-protocol";
+import { LicenseValidationResult } from "@gitpod/gitpod-protocol/lib/license-protocol";
 import { PrebuildManager } from "../prebuilds/prebuild-manager";
 import { LicenseDB } from "@gitpod/gitpod-db/lib";
 import { GuardedCostCenter, ResourceAccessGuard, ResourceAccessOp } from "../../../src/auth/resource-access";

components/server/src/workspace/gitpod-server-impl.ts

@@ -93,7 +93,6 @@ import {
 } from "@gitpod/gitpod-protocol/lib/admin-protocol";
 import {
     GetLicenseInfoResult,
-    LicenseFeature,
     LicenseInfo,
     LicenseValidationResult,
 } from "@gitpod/gitpod-protocol/lib/license-protocol";

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

@@ -18,8 +18,6 @@ type ConfigSerialized struct {
 	InstallationShortname             string   `json:"installationShortname"`
 	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"`