Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[installer]: put component ownership under webapp/workspace teams #7839

Merged
merged 1 commit into from
Feb 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions installer/cmd/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ func renderKubernetesObjects(cfgVersion string, cfg *configv1.Config) ([]string,
renderable = components.FullObjects
helmCharts = components.FullHelmDependencies
case configv1.InstallationMeta:
renderable = components.MetaObjects
helmCharts = components.MetaHelmDependencies
renderable = components.WebAppObjects
helmCharts = components.WebAppHelmDependencies
case configv1.InstallationWorkspace:
renderable = components.WorkspaceObjects
helmCharts = components.WorkspaceHelmDependencies
Expand Down
9 changes: 9 additions & 0 deletions installer/pkg/components/components-webapp/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

options:
no_parent_owners: true

approvers:
- engineering-webapp

labels:
- "team: webapp"
44 changes: 44 additions & 0 deletions installer/pkg/components/components-webapp/components.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Copyright (c) 2022 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 componentswebapp

import (
"github.com/gitpod-io/gitpod/installer/pkg/common"
contentservice "github.com/gitpod-io/gitpod/installer/pkg/components/content-service"
"github.com/gitpod-io/gitpod/installer/pkg/components/dashboard"
"github.com/gitpod-io/gitpod/installer/pkg/components/database"
ide_proxy "github.com/gitpod-io/gitpod/installer/pkg/components/ide-proxy"
imagebuildermk3 "github.com/gitpod-io/gitpod/installer/pkg/components/image-builder-mk3"
jaegeroperator "github.com/gitpod-io/gitpod/installer/pkg/components/jaeger-operator"
"github.com/gitpod-io/gitpod/installer/pkg/components/migrations"
"github.com/gitpod-io/gitpod/installer/pkg/components/minio"
openvsxproxy "github.com/gitpod-io/gitpod/installer/pkg/components/openvsx-proxy"
"github.com/gitpod-io/gitpod/installer/pkg/components/proxy"
"github.com/gitpod-io/gitpod/installer/pkg/components/rabbitmq"
"github.com/gitpod-io/gitpod/installer/pkg/components/server"
wsmanagerbridge "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager-bridge"
)

var Objects = common.CompositeRenderFunc(
contentservice.Objects,
dashboard.Objects,
database.Objects,
ide_proxy.Objects,
imagebuildermk3.Objects,
migrations.Objects,
minio.Objects,
openvsxproxy.Objects,
proxy.Objects,
rabbitmq.Objects,
server.Objects,
wsmanagerbridge.Objects,
)

var Helm = common.CompositeHelmFunc(
database.Helm,
jaegeroperator.Helm,
minio.Helm,
rabbitmq.Helm,
)
9 changes: 9 additions & 0 deletions installer/pkg/components/components-workspace/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

options:
no_parent_owners: true

approvers:
- engineering-workspace

labels:
- "team: workspace"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: new line. And other files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ordinarily I'd agree, but this is the case throughout the OWNERS files - in fact, this is copied directly over from them

28 changes: 28 additions & 0 deletions installer/pkg/components/components-workspace/components.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Copyright (c) 2022 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 componentsworkspace

import (
"github.com/gitpod-io/gitpod/installer/pkg/common"
agentsmith "github.com/gitpod-io/gitpod/installer/pkg/components/agent-smith"
"github.com/gitpod-io/gitpod/installer/pkg/components/blobserve"
registryfacade "github.com/gitpod-io/gitpod/installer/pkg/components/registry-facade"
"github.com/gitpod-io/gitpod/installer/pkg/components/workspace"
wsdaemon "github.com/gitpod-io/gitpod/installer/pkg/components/ws-daemon"
wsmanager "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager"
wsproxy "github.com/gitpod-io/gitpod/installer/pkg/components/ws-proxy"
)

var Objects = common.CompositeRenderFunc(
agentsmith.Objects,
blobserve.Objects,
registryfacade.Objects,
workspace.Objects,
wsdaemon.Objects,
wsmanager.Objects,
wsproxy.Objects,
)

var Helm = common.CompositeHelmFunc()
60 changes: 12 additions & 48 deletions installer/pkg/components/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,72 +6,36 @@ package components

import (
"github.com/gitpod-io/gitpod/installer/pkg/common"
agentsmith "github.com/gitpod-io/gitpod/installer/pkg/components/agent-smith"
"github.com/gitpod-io/gitpod/installer/pkg/components/blobserve"
"github.com/gitpod-io/gitpod/installer/pkg/components/cluster"
contentservice "github.com/gitpod-io/gitpod/installer/pkg/components/content-service"
"github.com/gitpod-io/gitpod/installer/pkg/components/dashboard"
"github.com/gitpod-io/gitpod/installer/pkg/components/database"
componentswebapp "github.com/gitpod-io/gitpod/installer/pkg/components/components-webapp"
componentsworkspace "github.com/gitpod-io/gitpod/installer/pkg/components/components-workspace"
dockerregistry "github.com/gitpod-io/gitpod/installer/pkg/components/docker-registry"
"github.com/gitpod-io/gitpod/installer/pkg/components/gitpod"
ide_proxy "github.com/gitpod-io/gitpod/installer/pkg/components/ide-proxy"
imagebuildermk3 "github.com/gitpod-io/gitpod/installer/pkg/components/image-builder-mk3"
jaegeroperator "github.com/gitpod-io/gitpod/installer/pkg/components/jaeger-operator"
"github.com/gitpod-io/gitpod/installer/pkg/components/migrations"
"github.com/gitpod-io/gitpod/installer/pkg/components/minio"
openvsxproxy "github.com/gitpod-io/gitpod/installer/pkg/components/openvsx-proxy"
"github.com/gitpod-io/gitpod/installer/pkg/components/proxy"
"github.com/gitpod-io/gitpod/installer/pkg/components/rabbitmq"
registryfacade "github.com/gitpod-io/gitpod/installer/pkg/components/registry-facade"
"github.com/gitpod-io/gitpod/installer/pkg/components/server"
"github.com/gitpod-io/gitpod/installer/pkg/components/workspace"
wsdaemon "github.com/gitpod-io/gitpod/installer/pkg/components/ws-daemon"
wsmanager "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager"
wsmanagerbridge "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager-bridge"
wsproxy "github.com/gitpod-io/gitpod/installer/pkg/components/ws-proxy"
)

var MetaObjects = common.CompositeRenderFunc(
contentservice.Objects,
proxy.Objects,
dashboard.Objects,
database.Objects,
ide_proxy.Objects,
imagebuildermk3.Objects,
migrations.Objects,
minio.Objects,
openvsxproxy.Objects,
rabbitmq.Objects,
server.Objects,
wsmanagerbridge.Objects,
var WebAppObjects = common.CompositeRenderFunc(
componentswebapp.Objects,
)

var WorkspaceObjects = common.CompositeRenderFunc(
agentsmith.Objects,
blobserve.Objects,
registryfacade.Objects,
workspace.Objects,
wsdaemon.Objects,
wsmanager.Objects,
wsproxy.Objects,
componentsworkspace.Objects,
)

var FullObjects = common.CompositeRenderFunc(
MetaObjects,
WebAppObjects,
WorkspaceObjects,
)

var MetaHelmDependencies = common.CompositeHelmFunc(
database.Helm,
jaegeroperator.Helm,
minio.Helm,
rabbitmq.Helm,
var WebAppHelmDependencies = common.CompositeHelmFunc(
componentswebapp.Helm,
)

var WorkspaceHelmDependencies = common.CompositeHelmFunc()
var WorkspaceHelmDependencies = common.CompositeHelmFunc(
componentsworkspace.Helm,
)

var FullHelmDependencies = common.CompositeHelmFunc(
MetaHelmDependencies,
WebAppHelmDependencies,
WorkspaceHelmDependencies,
)

Expand Down