[installer]: separate server and IDE components

installer/pkg/components/server/ide/OWNERS

@@ -0,0 +1,9 @@
+
+options:
+  no_parent_owners: true
+
+approvers:
+  - engineering-ide
+
+labels:
+  - "team: IDE"

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

@@ -2,7 +2,7 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License-AGPL.txt in the project root for license information.
 
-package server
+package ide
 
 import (
 	"encoding/json"
@@ -17,22 +17,10 @@ import (
 	"k8s.io/utils/pointer"
 )
 
-func ideconfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
+func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 	typeBrowser := "browser"
 	typeDesktop := "desktop"
 	idecfg := IDEConfig{
-		IDEVersion:   workspace.CodeIDEImageStableVersion,
-		IDEImageRepo: common.RepoName(ctx.Config.Repository, workspace.CodeIDEImage),
-		IDEImageAliases: map[string]string{
-			"code":        common.ImageName(ctx.Config.Repository, workspace.CodeIDEImage, workspace.CodeIDEImageStableVersion),
-			"code-latest": common.ImageName(ctx.Config.Repository, workspace.CodeIDEImage, ctx.VersionManifest.Components.Workspace.CodeImage.Version),
-		},
-		DesktopIDEImageAliases: map[string]string{
-			"code-desktop":          common.ImageName(ctx.Config.Repository, workspace.CodeDesktopIDEImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.CodeDesktopImage.Version),
-			"code-desktop-insiders": common.ImageName(ctx.Config.Repository, workspace.CodeDesktopInsidersIDEImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.CodeDesktopImageInsiders.Version),
-			"intellij":              common.ImageName(ctx.Config.Repository, workspace.IntelliJDesktopIDEImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.IntelliJImage.Version),
-			"goland":                common.ImageName(ctx.Config.Repository, workspace.GoLandDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.GoLandImage.Version),
-		},
 		SupervisorImage: common.ImageName(ctx.Config.Repository, workspace.SupervisorImage, ctx.VersionManifest.Components.Workspace.Supervisor.Version),
 		IDEOptions: IDEOptions{
 			Options: map[string]IDEOption{

installer/pkg/components/server/ide/constants.go

@@ -0,0 +1,13 @@
+// Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package ide
+
+import (
+	"github.com/gitpod-io/gitpod/installer/pkg/common"
+)
+
+const (
+	Component = common.ServerComponent
+)

installer/pkg/components/server/ide/objects.go

@@ -0,0 +1,15 @@
+// Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+// Logically, this package belongs to the server component. However,
+// from an ownership sense, this package belongs to a different team
+// to the server so it's separated out
+
+package ide
+
+import "github.com/gitpod-io/gitpod/installer/pkg/common"
+
+var Objects = common.CompositeRenderFunc(
+	configmap,
+)

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

@@ -0,0 +1,34 @@
+// Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package ide
+
+// These types are from TypeScript files
+
+// IDEConfig RawIDEConfig interface from components/server/src/ide-config.ts
+type IDEConfig struct {
+	SupervisorImage string     `json:"supervisorImage"`
+	IDEOptions      IDEOptions `json:"ideOptions"`
+}
+
+// IDEOptions interface from components/gitpod-protocol/src/ide-protocol.ts
+type IDEOptions struct {
+	Options           map[string]IDEOption `json:"options"`
+	DefaultIDE        string               `json:"defaultIde"`
+	DefaultDesktopIDE string               `json:"defaultDesktopIde"`
+}
+
+// IDEOption interface from components/gitpod-protocol/src/ide-protocol.ts
+type IDEOption struct {
+	OrderKey           *string  `json:"orderKey,omitempty"`
+	Title              string   `json:"title"`
+	Type               string   `json:"type"`
+	Logo               string   `json:"logo"`
+	Tooltip            *string  `json:"tooltip,omitempty"`
+	Label              *string  `json:"label,omitempty"`
+	Notes              []string `json:"notes,omitempty"`
+	Hidden             *bool    `json:"hidden,omitempty"`
+	Image              string   `json:"image"`
+	ResolveImageDigest *bool    `json:"resolveImageDigest,omitempty"`
+}

installer/pkg/components/server/objects.go

@@ -6,12 +6,13 @@ package server
 
 import (
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
+	"github.com/gitpod-io/gitpod/installer/pkg/components/server/ide"
 )
 
 var Objects = common.CompositeRenderFunc(
 	configmap,
 	deployment,
-	ideconfigmap,
+	ide.Objects,
 	networkpolicy,
 	role,
 	rolebinding,

installer/pkg/components/server/types.go

@@ -8,41 +8,6 @@ import "github.com/gitpod-io/gitpod/installer/pkg/config/v1"
 
 // These types are from TypeScript files
 
-// IDEConfig RawIDEConfig interface from components/server/src/ide-config.ts
-type IDEConfig struct {
-	// Deprecated
-	IDEVersion string `json:"ideVersion"`
-	// Deprecated
-	IDEImageRepo string `json:"ideImageRepo"`
-	// Deprecated
-	IDEImageAliases map[string]string `json:"ideImageAliases"`
-	// Deprecated
-	DesktopIDEImageAliases map[string]string `json:"desktopIdeImageAliases"`
-	SupervisorImage        string            `json:"supervisorImage"`
-	IDEOptions             IDEOptions        `json:"ideOptions"`
-}
-
-// IDEOptions interface from components/gitpod-protocol/src/ide-protocol.ts
-type IDEOptions struct {
-	Options           map[string]IDEOption `json:"options"`
-	DefaultIDE        string               `json:"defaultIde"`
-	DefaultDesktopIDE string               `json:"defaultDesktopIde"`
-}
-
-// IDEOption interface from components/gitpod-protocol/src/ide-protocol.ts
-type IDEOption struct {
-	OrderKey           *string  `json:"orderKey,omitempty"`
-	Title              string   `json:"title"`
-	Type               string   `json:"type"`
-	Logo               string   `json:"logo"`
-	Tooltip            *string  `json:"tooltip,omitempty"`
-	Label              *string  `json:"label,omitempty"`
-	Notes              []string `json:"notes,omitempty"`
-	Hidden             *bool    `json:"hidden,omitempty"`
-	Image              string   `json:"image"`
-	ResolveImageDigest *bool    `json:"resolveImageDigest,omitempty"`
-}
-
 // ConfigSerialized interface from components/server/src/config.ts
 type ConfigSerialized struct {
 	Version                           string   `json:"version"`

installer/pkg/config/versions/OWNERS

@@ -0,0 +1,15 @@
+
+options:
+  no_parent_owners: true
+
+approvers:
+  - engineering-ide
+  - engineering-meta
+  - engineering-self-hosted
+  - engineering-workspace
+
+labels:
+  - "team: IDE"
+  - "team: meta"
+  - "team: self-hosted"
+  - "team: workspace"