Skip to content

Commit 04195fe

Browse files
committed
[public-api-server] Setup component in installer, behind epxerimental config
1 parent 940edd4 commit 04195fe

File tree

6 files changed

+49
-0
lines changed

6 files changed

+49
-0
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
/install/installer/pkg/components/openvsx-proxy @gitpod-io/engineering-ide
3939
/install/installer/pkg/components/proxy @gitpod-io/engineering-webapp
4040
/install/installer/pkg/components/registry-facade @gitpod-io/engineering-workspace
41+
/install/installer/pkg/components/public-api-server @gitpod-io/engineering-webapp
4142
/install/installer/pkg/components/server @gitpod-io/engineering-webapp
4243
/install/installer/pkg/components/server/ide @gitpod-io/engineering-ide
4344
/install/installer/pkg/components/workspace @gitpod-io/engineering-workspace

install/installer/pkg/components/components-webapp/components.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/gitpod-io/gitpod/installer/pkg/components/minio"
1616
openvsxproxy "github.com/gitpod-io/gitpod/installer/pkg/components/openvsx-proxy"
1717
"github.com/gitpod-io/gitpod/installer/pkg/components/proxy"
18+
public_api_server "github.com/gitpod-io/gitpod/installer/pkg/components/public-api-server"
1819
"github.com/gitpod-io/gitpod/installer/pkg/components/rabbitmq"
1920
"github.com/gitpod-io/gitpod/installer/pkg/components/server"
2021
wsmanagerbridge "github.com/gitpod-io/gitpod/installer/pkg/components/ws-manager-bridge"
@@ -33,6 +34,7 @@ var Objects = common.CompositeRenderFunc(
3334
rabbitmq.Objects,
3435
server.Objects,
3536
wsmanagerbridge.Objects,
37+
public_api_server.Objects,
3638
)
3739

3840
var Helm = common.CompositeHelmFunc(
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
// Licensed under the MIT License. See License-MIT.txt in the project root for license information.
3+
4+
package public_api_server
5+
6+
import (
7+
"github.com/gitpod-io/gitpod/common-go/log"
8+
"github.com/gitpod-io/gitpod/installer/pkg/common"
9+
"github.com/gitpod-io/gitpod/installer/pkg/config/v1/experimental"
10+
"k8s.io/apimachinery/pkg/runtime"
11+
)
12+
13+
func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
14+
var experimentalCfg *experimental.Config
15+
16+
_ = ctx.WithExperimental(func(ucfg *experimental.Config) error {
17+
experimentalCfg = ucfg
18+
return nil
19+
})
20+
21+
if experimentalCfg == nil || experimentalCfg.WebApp == nil || experimentalCfg.WebApp.PublicAPI == nil {
22+
// We don't want to render anything for this deployment
23+
return nil, nil
24+
}
25+
26+
publicAPIConfig := experimentalCfg.WebApp.PublicAPI
27+
log.Debug("Detected experimental.WebApp.PublicApi configuration", publicAPIConfig)
28+
29+
return nil, nil
30+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
// Licensed under the MIT License. See License-MIT.txt in the project root for license information.
3+
4+
package public_api_server
5+
6+
import "github.com/gitpod-io/gitpod/installer/pkg/common"
7+
8+
var Objects = common.CompositeRenderFunc(
9+
deployment,
10+
)

install/installer/pkg/config/v1/experimental/experimental.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ type WorkspaceConfig struct {
4646
}
4747

4848
type WebAppConfig struct {
49+
PublicAPI *PublicAPIConfig `json:"publicApi,omitempty"`
50+
}
51+
52+
type PublicAPIConfig struct {
53+
Enabled bool `json:"enabled"`
4954
}
5055

5156
type IDEConfig struct {

install/installer/pkg/config/versions/versions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ type Components struct {
3333
OpenVSXProxy Versioned `json:"openVSXProxy"`
3434
PaymentEndpoint Versioned `json:"paymentEndpoint"`
3535
Proxy Versioned `json:"proxy"`
36+
PublicAPIServer Versioned `json:"public-api-server"`
3637
RegistryFacade Versioned `json:"registryFacade"`
3738
Server Versioned `json:"server"`
3839
ServiceWaiter Versioned `json:"serviceWaiter"`

0 commit comments

Comments
 (0)