[usage] Deploy usage by default

Author: easyCZ

install/installer/cmd/testdata/render/aws-setup/output.golden

@@ -21,7 +21,7 @@ import (
 
 func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 	cfg := server.Config{
-		LedgerSchedule:     "", // By default controller is disabled
+		LedgerSchedule:     time.Duration(15 * time.Minute).String(),
 		ResetUsageSchedule: time.Duration(15 * time.Minute).String(),
 		Server: &baseserver.Configuration{
 			Services: baseserver.ServicesConfiguration{
@@ -36,6 +36,12 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 			ForUsers:            1_000_000_000,
 			MinForUsersOnStripe: 0,
 		},
+
+		// This is the default configuration, used in self-hosted installs.
+		// For SaaS, we explicitly configure it based on workspace classes below.
+		CreditsPerMinuteByWorkspaceClass: map[string]float64{
+			"default": 0.1666666667,
+		},
 	}
 
 	expWebAppConfig := getExperimentalWebAppConfig(ctx)
@@ -55,22 +61,23 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 	expUsageConfig := getExperimentalUsageConfig(ctx)
 
 	if expUsageConfig != nil {
-		if expUsageConfig.Schedule != "" {
-			cfg.LedgerSchedule = expUsageConfig.Schedule
-		}
+		cfg.LedgerSchedule = expUsageConfig.Schedule
 		cfg.ResetUsageSchedule = expUsageConfig.ResetUsageSchedule
+
 		if expUsageConfig.DefaultSpendingLimit != nil {
 			cfg.DefaultSpendingLimit = *expUsageConfig.DefaultSpendingLimit
 		}
 	}
 
 	workspaceClassConfig := getExperimentalWorkspaceClassConfig(ctx)
-
-	cfg.CreditsPerMinuteByWorkspaceClass = make(map[string]float64)
-	for _, v := range workspaceClassConfig {
-		if v.Credits != nil {
-			cfg.CreditsPerMinuteByWorkspaceClass[v.Id] = v.Credits.PerMinute
+	if len(workspaceClassConfig) > 0 {
+		creditsPerMinuteByWorkspaceClass := make(map[string]float64)
+		for _, v := range workspaceClassConfig {
+			if v.Credits != nil {
+				cfg.CreditsPerMinuteByWorkspaceClass[v.Id] = v.Credits.PerMinute
+			}
 		}
+		cfg.CreditsPerMinuteByWorkspaceClass = creditsPerMinuteByWorkspaceClass
 	}
 
 	_ = ctx.WithExperimental(func(ucfg *experimental.Config) error {

install/installer/cmd/testdata/render/azure-setup/output.golden

@@ -5,14 +5,29 @@ package usage
 
 import (
 	"testing"
+	"time"
 
+	"github.com/gitpod-io/gitpod/installer/pkg/common"
+	config "github.com/gitpod-io/gitpod/installer/pkg/config/v1"
 	"github.com/gitpod-io/gitpod/installer/pkg/config/v1/experimental"
+	"github.com/gitpod-io/gitpod/installer/pkg/config/versions"
+	"github.com/gitpod-io/gitpod/usage/pkg/db"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 )
 
-func TestConfigMap_ContainsSchedule(t *testing.T) {
-	ctx := renderContextWithUsageConfig(t, &experimental.UsageConfig{Enabled: true, Schedule: "2m", ResetUsageSchedule: "5m"})
+func TestConfigMap_WithExperimentalOptions(t *testing.T) {
+	billinstancesAfter := time.Date(2022, 10, 10, 10, 10, 10, 0, time.UTC)
+	ctx := renderContextWithUsageConfig(t, &experimental.UsageConfig{
+		Schedule:           "2m",
+		ResetUsageSchedule: "5m",
+		BillInstancesAfter: &billinstancesAfter,
+		DefaultSpendingLimit: &db.DefaultSpendingLimit{
+			ForTeams:            123,
+			ForUsers:            456,
+			MinForUsersOnStripe: 7,
+		},
+	})
 
 	objs, err := configmap(ctx)
 	require.NoError(t, err)
@@ -25,6 +40,116 @@ func TestConfigMap_ContainsSchedule(t *testing.T) {
        "controllerSchedule": "2m",
 	   "resetUsageSchedule": "5m",
        "stripeCredentialsFile": "stripe-secret/apikeys",
+	   "creditsPerMinuteByWorkspaceClass": {
+		"default": 0.1666666667
+	   },
+	   "defaultSpendingLimit": {
+		"forUsers": 456,
+		"forTeams": 123,
+		"minForUsersOnStripe": 7
+	   },
+	   "stripePrices": {
+		"individualUsagePriceIds": {
+		  "eur": "",
+		  "usd": ""
+		},
+		"teamUsagePriceIds": {
+		  "eur": "",
+		  "usd": ""
+		}
+	   },
+       "server": {
+         "services": {
+           "grpc": {
+             "address": "0.0.0.0:9001"
+           }
+         }
+       }
+     }`,
+		cfgmap.Data[configJSONFilename],
+	)
+}
+
+func TestConfigMap_WithExperimentalOptions_EmptySchedule(t *testing.T) {
+	billinstancesAfter := time.Date(2022, 10, 10, 10, 10, 10, 0, time.UTC)
+	ctx := renderContextWithUsageConfig(t, &experimental.UsageConfig{
+		Schedule:           "", // empty specifies job is disabled
+		ResetUsageSchedule: "", // empty specifies job is disabled
+		BillInstancesAfter: &billinstancesAfter,
+		DefaultSpendingLimit: &db.DefaultSpendingLimit{
+			ForTeams:            123,
+			ForUsers:            456,
+			MinForUsersOnStripe: 7,
+		},
+	})
+
+	objs, err := configmap(ctx)
+	require.NoError(t, err)
+
+	cfgmap, ok := objs[0].(*corev1.ConfigMap)
+	require.True(t, ok)
+
+	require.JSONEq(t,
+		`{
+       "stripeCredentialsFile": "stripe-secret/apikeys",
+	   "creditsPerMinuteByWorkspaceClass": {
+		"default": 0.1666666667
+	   },
+	   "defaultSpendingLimit": {
+		"forUsers": 456,
+		"forTeams": 123,
+		"minForUsersOnStripe": 7
+	   },
+	   "stripePrices": {
+		"individualUsagePriceIds": {
+		  "eur": "",
+		  "usd": ""
+		},
+		"teamUsagePriceIds": {
+		  "eur": "",
+		  "usd": ""
+		}
+	   },
+       "server": {
+         "services": {
+           "grpc": {
+             "address": "0.0.0.0:9001"
+           }
+         }
+       }
+     }`,
+		cfgmap.Data[configJSONFilename],
+	)
+}
+
+func TestConfigMap_DefaultOptions(t *testing.T) {
+	ctx, err := common.NewRenderContext(config.Config{
+		Domain: "test.domain.everything.awesome.is",
+	}, versions.Manifest{
+		Components: versions.Components{
+			Usage: versions.Versioned{
+				Version: "commit-test-latest",
+			},
+			ServiceWaiter: versions.Versioned{
+				Version: "commit-test-latest",
+			},
+		},
+	}, "test-namespace")
+	require.NoError(t, err)
+
+	objs, err := configmap(ctx)
+	require.NoError(t, err)
+
+	cfgmap, ok := objs[0].(*corev1.ConfigMap)
+	require.True(t, ok)
+
+	require.JSONEq(t,
+		`{
+       "controllerSchedule": "15m0s",
+	   "resetUsageSchedule": "15m0s",
+	   "creditsPerMinuteByWorkspaceClass": {
+		"default": 0.1666666667
+	   },
 	   "defaultSpendingLimit": {
 		"forUsers": 1000000000,
 		"forTeams": 1000000000,

install/installer/cmd/testdata/render/customization/output.golden

@@ -4,19 +4,12 @@
 package usage
 
 import (
-	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	"github.com/gitpod-io/gitpod/installer/pkg/config/v1/experimental"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
 func Objects(ctx *common.RenderContext) ([]runtime.Object, error) {
-	cfg := getExperimentalUsageConfig(ctx)
-	if cfg == nil {
-		return nil, nil
-	}
-
-	log.Debug("Detected experimental.WebApp.Usage configuration", cfg)
 	return common.CompositeRenderFunc(
 		deployment,
 		rolebinding,

install/installer/cmd/testdata/render/external-registry/output.golden

@@ -64,7 +64,7 @@ func renderContextWithUsageConfig(t *testing.T, usage *experimental.UsageConfig)
 }
 
 func renderContextWithUsageEnabled(t *testing.T) *common.RenderContext {
-	return renderContextWithUsageConfig(t, &experimental.UsageConfig{Enabled: true})
+	return renderContextWithUsageConfig(t, &experimental.UsageConfig{})
 }
 
 func renderContextWithStripeSecretSet(t *testing.T) *common.RenderContext {

install/installer/cmd/testdata/render/gcp-setup/output.golden

@@ -267,7 +267,6 @@ type PublicAPIConfig struct {
 }
 
 type UsageConfig struct {
-	Enabled                          bool                     `json:"enabled"`
 	Schedule                         string                   `json:"schedule"`
 	ResetUsageSchedule               string                   `json:"resetUsageSchedule"`
 	BillInstancesAfter               *time.Time               `json:"billInstancesAfter"`