[licensor]: remove prebuilds from the team level license

Author: Simon Emms

components/licensor/ee/pkg/licensor/licensor.go

@@ -87,10 +87,7 @@ type allowance struct {
 
 var allowanceMap = map[LicenseLevel]allowance{
 	LevelTeam: {
-		PrebuildTime: 50 * time.Hour,
 		Features: featureSet{
-			FeaturePrebuild: struct{}{},
-
 			FeatureAdminDashboard: struct{}{},
 		},
 	},

components/licensor/ee/pkg/licensor/licensor_test.go

@@ -238,9 +238,7 @@ func TestFeatures(t *testing.T) {
 			FeaturePrebuild,
 		}, LicenseTypeGitpod, seats, nil},
 
-		{"Gitpod (over seats): no license", true, LicenseLevel(0), []Feature{
-			FeaturePrebuild,
-		}, LicenseTypeGitpod, 11, nil},
+		{"Gitpod (over seats): no license", true, LicenseLevel(0), []Feature{}, LicenseTypeGitpod, 11, nil},
 		{"Gitpod (over seats): invalid license level", false, LicenseLevel(666), []Feature{}, LicenseTypeGitpod, seats + 1, nil},
 		{"Gitpod (over seats): enterprise license", false, LevelEnterprise, []Feature{}, LicenseTypeGitpod, seats + 1, nil},
 
@@ -274,14 +272,8 @@ func TestFeatures(t *testing.T) {
 			FeaturePrebuild,
 		}, LicenseTypeReplicated, seats + 1, &replicatedPaid},
 
-		{"Replicated (over seats - fallback): invalid license level", false, LicenseLevel(666), []Feature{
-			FeatureAdminDashboard,
-			FeaturePrebuild,
-		}, LicenseTypeReplicated, seats + 1, &replicatedCommunity},
-		{"Replicated (over seats - fallback): enterprise license", false, LevelEnterprise, []Feature{
-			FeatureAdminDashboard,
-			FeaturePrebuild,
-		}, LicenseTypeReplicated, seats + 1, &replicatedCommunity},
+		{"Replicated (over seats - fallback): invalid license level", false, LicenseLevel(666), []Feature{FeatureAdminDashboard}, LicenseTypeReplicated, seats + 1, &replicatedCommunity},
+		{"Replicated (over seats - fallback): enterprise license", false, LevelEnterprise, []Feature{FeatureAdminDashboard}, LicenseTypeReplicated, seats + 1, &replicatedCommunity},
 	}
 
 	for _, test := range tests {

install/kots/manifests/gitpod-installer-job.yaml

@@ -43,7 +43,7 @@ spec:
       containers:
         - name: installer
           # This will normally be the release tag - using this tag as need the license evaluator
-          image: 'eu.gcr.io/gitpod-core-dev/build/installer:main.2569'
+          image: 'eu.gcr.io/gitpod-core-dev/build/installer:sje-licensing.24'
           volumeMounts:
             - mountPath: /config-patch
               name: config-patch