From 2780766229eef24cee5b54a40f6bb58e84a170b2 Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Wed, 26 Jan 2022 10:34:24 +0000 Subject: [PATCH] [installer]: put component ownership under webapp/workspace teams --- installer/cmd/render.go | 4 +- .../pkg/components/components-webapp/OWNERS | 9 +++ .../components-webapp/components.go | 44 ++++++++++++++ .../components/components-workspace/OWNERS | 9 +++ .../components-workspace/components.go | 28 +++++++++ installer/pkg/components/components.go | 60 ++++--------------- 6 files changed, 104 insertions(+), 50 deletions(-) create mode 100644 installer/pkg/components/components-webapp/OWNERS create mode 100644 installer/pkg/components/components-webapp/components.go create mode 100644 installer/pkg/components/components-workspace/OWNERS create mode 100644 installer/pkg/components/components-workspace/components.go diff --git a/installer/cmd/render.go b/installer/cmd/render.go index 92abcc0784a750..dd0140be5e3eef 100644 --- a/installer/cmd/render.go +++ b/installer/cmd/render.go @@ -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 diff --git a/installer/pkg/components/components-webapp/OWNERS b/installer/pkg/components/components-webapp/OWNERS new file mode 100644 index 00000000000000..3732db2834a0cf --- /dev/null +++ b/installer/pkg/components/components-webapp/OWNERS @@ -0,0 +1,9 @@ + +options: + no_parent_owners: true + +approvers: + - engineering-webapp + +labels: + - "team: webapp" \ No newline at end of file diff --git a/installer/pkg/components/components-webapp/components.go b/installer/pkg/components/components-webapp/components.go new file mode 100644 index 00000000000000..63f34db06ba2b9 --- /dev/null +++ b/installer/pkg/components/components-webapp/components.go @@ -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, +) diff --git a/installer/pkg/components/components-workspace/OWNERS b/installer/pkg/components/components-workspace/OWNERS new file mode 100644 index 00000000000000..cd8b31399c625f --- /dev/null +++ b/installer/pkg/components/components-workspace/OWNERS @@ -0,0 +1,9 @@ + +options: + no_parent_owners: true + +approvers: + - engineering-workspace + +labels: + - "team: workspace" \ No newline at end of file diff --git a/installer/pkg/components/components-workspace/components.go b/installer/pkg/components/components-workspace/components.go new file mode 100644 index 00000000000000..f425440ee54769 --- /dev/null +++ b/installer/pkg/components/components-workspace/components.go @@ -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() diff --git a/installer/pkg/components/components.go b/installer/pkg/components/components.go index 9fd994b8975f8b..b4ac45c8e5d229 100644 --- a/installer/pkg/components/components.go +++ b/installer/pkg/components/components.go @@ -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, )