Skip to content

Commit cfe4284

Browse files
corneliusludmannroboquat
corneliusludmann
authored and
roboquat
committed
[installer] Update IDE config
1 parent d8ee631 commit cfe4284

File tree

6 files changed

+43
-15
lines changed

6 files changed

+43
-15
lines changed

‎installer/pkg/components/blobserve/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
3535
Port: ContainerPort,
3636
Timeout: util.Duration(time.Second * 5),
3737
Repos: map[string]blobserve.Repo{
38-
common.RepoName(ctx.Config.Repository, workspace.IDEImageRepo): {
38+
common.RepoName(ctx.Config.Repository, workspace.CodeIDEImage): {
3939
PrePull: []string{},
4040
Workdir: "/ide",
4141
Replacements: []blobserve.StringReplacement{{

‎installer/pkg/components/server/ide-configmap.go

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,30 @@ import (
1616
"k8s.io/apimachinery/pkg/runtime"
1717
)
1818

19-
func ideconfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
19+
func CodeImageStableVersion(ctx *common.RenderContext) string {
2020
stableVersion := ctx.VersionManifest.Components.Workspace.CodeImageStable.Version
2121
if stableVersion == "" {
2222
stableVersion = ctx.VersionManifest.Components.Workspace.CodeImage.Version
2323
}
24+
return stableVersion
25+
}
2426

27+
func ideconfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
28+
stableVersion := CodeImageStableVersion(ctx)
2529
idecfg := IDEConfig{
2630
IDEVersion: stableVersion,
27-
IDEImageRepo: workspace.IDEImageRepo,
31+
IDEImageRepo: workspace.CodeIDEImage,
2832
IDEImageAliases: map[string]string{
29-
"code": common.ImageName(ctx.Config.Repository, workspace.IDEImageRepo, stableVersion),
30-
"code-latest": common.ImageName(ctx.Config.Repository, workspace.IDEImageRepo, ctx.VersionManifest.Components.Workspace.CodeImage.Version),
33+
"code": common.ImageName(ctx.Config.Repository, workspace.CodeIDEImage, stableVersion),
34+
"code-latest": common.ImageName(ctx.Config.Repository, workspace.CodeIDEImage, ctx.VersionManifest.Components.Workspace.CodeImage.Version),
35+
},
36+
DesktopIDEImageAliases: map[string]string{
37+
"code-desktop": common.ImageName(ctx.Config.Repository, workspace.CodeDesktopIDEImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.CodeDesktopImage.Version),
38+
"code-desktop-insiders": common.ImageName(ctx.Config.Repository, workspace.CodeDesktopInsidersIDEImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.CodeDesktopImageInsiders.Version),
39+
"intellij:": common.ImageName(ctx.Config.Repository, workspace.IntelliJDesktopIDEImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.IntelliJImage.Version),
40+
"goland": common.ImageName(ctx.Config.Repository, workspace.GoLandDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.GoLandImage.Version),
3141
},
42+
SupervisorImage: common.ImageName(ctx.Config.Repository, workspace.SupervisorImage, ctx.VersionManifest.Components.Workspace.Supervisor.Version),
3243
}
3344

3445
fc, err := json.MarshalIndent(idecfg, "", " ")

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ import "github.com/gitpod-io/gitpod/installer/pkg/config/v1"
1010

1111
// IDEConfig RawIDEConfig interface from components/server/src/ide-config.ts
1212
type IDEConfig struct {
13-
IDEVersion string `json:"ideVersion"`
14-
IDEImageRepo string `json:"ideImageRepo"`
15-
IDEImageAliases map[string]string `json:"ideImageAliases"`
13+
IDEVersion string `json:"ideVersion"`
14+
IDEImageRepo string `json:"ideImageRepo"`
15+
IDEImageAliases map[string]string `json:"ideImageAliases"`
16+
DesktopIDEImageAliases map[string]string `json:"deskoptIdeImageAliases"`
17+
SupervisorImage string `json:"supervisorImage"`
1618
}
1719

1820
// ConfigSerialized interface from components/server/src/config.ts

‎installer/pkg/components/workspace/constants.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ const (
99
ContainerPort = 23000
1010
DefaultWorkspaceImage = "gitpod/workspace-full"
1111
DefaultWorkspaceImageVersion = "latest"
12-
IDEImageRepo = "ide/code" // todo(sje): does this need to be config driven?
12+
CodeIDEImage = "ide/code" // todo(sje): does this need to be config driven?
13+
CodeDesktopIDEImage = "ide/code-desktop"
14+
CodeDesktopInsidersIDEImage = "ide/code-desktop-insiders"
15+
IntelliJDesktopIDEImage = "ide/intellij"
16+
GoLandDesktopIdeImage = "ide/goland"
1317
DockerUpImage = "docker-up"
1418
SupervisorImage = "supervisor"
1519
SupervisorPort = 22999

‎installer/pkg/components/ws-scheduler/configmap.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ package wsscheduler
77
import (
88
"encoding/json"
99
"fmt"
10+
"time"
11+
1012
"github.com/gitpod-io/gitpod/common-go/util"
1113
"github.com/gitpod-io/gitpod/installer/pkg/common"
14+
"github.com/gitpod-io/gitpod/installer/pkg/components/server"
1215
"github.com/gitpod-io/gitpod/installer/pkg/components/workspace"
1316
wsmanager "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager"
1417
"github.com/gitpod-io/gitpod/ws-scheduler/pkg/scaler"
1518
"github.com/gitpod-io/gitpod/ws-scheduler/pkg/scheduler"
16-
"time"
1719

1820
corev1 "k8s.io/api/core/v1"
1921
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -38,6 +40,9 @@ type config struct {
3840

3941
func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
4042
// todo(sje): check this config
43+
44+
codeImageStableVersion := server.CodeImageStableVersion(ctx)
45+
4146
scaler := struct {
4247
Enabled bool `json:"enabled"`
4348
Driver scaler.WorkspaceManagerPrescaleDriverConfig `json:"driver"`
@@ -82,7 +87,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
8287
},
8388
},
8489
WorkspaceImage: common.ImageName("", workspace.DefaultWorkspaceImage, workspace.DefaultWorkspaceImageVersion),
85-
IDEImage: common.ImageName(ctx.Config.Repository, workspace.IDEImageRepo, ctx.VersionManifest.Components.Workspace.CodeImage.Version),
90+
IDEImage: common.ImageName(ctx.Config.Repository, workspace.CodeIDEImage, codeImageStableVersion),
8691
SupervisorImage: common.ImageName(ctx.Config.Repository, workspace.SupervisorImage, ctx.VersionManifest.Components.Workspace.Supervisor.Version),
8792
FeatureFlags: nil,
8893
MaxGhostWorkspaces: 10,

‎installer/pkg/config/versions/versions.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,16 @@ type Components struct {
3434
Server Versioned `json:"server"`
3535
ServiceWaiter Versioned `json:"serviceWaiter"`
3636
Workspace struct {
37-
CodeImage Versioned `json:"codeImage"`
38-
CodeImageStable Versioned `json:"codeImageStable"`
39-
DockerUp Versioned `json:"dockerUp"`
40-
Supervisor Versioned `json:"supervisor"`
37+
CodeImage Versioned `json:"codeImage"`
38+
CodeImageStable Versioned `json:"codeImageStable"`
39+
DockerUp Versioned `json:"dockerUp"`
40+
Supervisor Versioned `json:"supervisor"`
41+
DesktopIdeImages struct {
42+
CodeDesktopImage Versioned `json:"codeDesktop"`
43+
CodeDesktopImageInsiders Versioned `json:"codeDesktopInsiders"`
44+
IntelliJImage Versioned `json:"intellij"`
45+
GoLandImage Versioned `json:"goland"`
46+
} `json:"desktopIdeImages"`
4147
} `json:"workspace"`
4248
WSDaemon struct {
4349
Versioned

0 commit comments

Comments
 (0)