Skip to content

Commit ccf5d74

Browse files
committed
[public-api] Set config in installer
1 parent ca76283 commit ccf5d74

File tree

4 files changed

+29
-3
lines changed

4 files changed

+29
-3
lines changed

components/public-api-server/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
github.com/gitpod-io/gitpod/public-api v0.0.0-00010101000000-000000000000
88
github.com/sirupsen/logrus v1.8.1
99
github.com/spf13/cobra v1.4.0
10-
github.com/spf13/pflag v1.0.5
1110
github.com/stretchr/testify v1.7.0
1211
google.golang.org/grpc v1.45.0
1312
google.golang.org/protobuf v1.28.0
@@ -30,6 +29,7 @@ require (
3029
github.com/prometheus/client_model v0.2.0 // indirect
3130
github.com/prometheus/common v0.32.1 // indirect
3231
github.com/prometheus/procfs v0.7.3 // indirect
32+
github.com/spf13/pflag v1.0.5 // indirect
3333
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
3434
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
3535
golang.org/x/text v0.3.7 // indirect

install/installer/pkg/components/public-api-server/deployment.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,13 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
4444
RestartPolicy: "Always",
4545
TerminationGracePeriodSeconds: pointer.Int64(30),
4646
Containers: []corev1.Container{{
47-
Name: Component,
48-
Image: ctx.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.PublicAPIServer.Version),
47+
Name: Component,
48+
Image: ctx.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.PublicAPIServer.Version),
49+
Args: []string{
50+
fmt.Sprintf(`--http-port=%d`, HTTPContainerPort),
51+
fmt.Sprintf(`--grpc-port=%d`, GRPCContainerPort),
52+
fmt.Sprintf(`--gitpod-api-url="wss://%s/api/v1"`, ctx.Config.Domain),
53+
},
4954
ImagePullPolicy: corev1.PullIfNotPresent,
5055
Resources: common.ResourceRequirements(ctx, Component, Component, corev1.ResourceRequirements{
5156
Requests: corev1.ResourceList{

install/installer/pkg/components/public-api-server/deployment_test.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,23 @@ func TestDeployment(t *testing.T) {
2020
dpl := objects[0].(*appsv1.Deployment)
2121
require.Len(t, dpl.Spec.Template.Spec.Containers, 2, "must render 2 containers")
2222
}
23+
24+
func TestDeployment_ServerArguments(t *testing.T) {
25+
ctx := renderContextWithPublicAPIEnabled(t)
26+
27+
objects, err := deployment(ctx)
28+
require.NoError(t, err)
29+
30+
require.Len(t, objects, 1, "must render only one object")
31+
32+
dpl := objects[0].(*appsv1.Deployment)
33+
containers := dpl.Spec.Template.Spec.Containers
34+
require.Equal(t, Component, containers[0].Name)
35+
36+
apiContainer := containers[0]
37+
require.EqualValues(t, []string{
38+
"--http-port=9000",
39+
"--grpc-port=9001",
40+
`--gitpod-api-url="wss://test.domain.everything.awesome.is/api/v1"`,
41+
}, apiContainer.Args)
42+
}

install/installer/pkg/components/public-api-server/objects_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ func TestObjects_RenderedWhenExperimentalConfigSet(t *testing.T) {
3131

3232
func renderContextWithPublicAPIEnabled(t *testing.T) *common.RenderContext {
3333
ctx, err := common.NewRenderContext(config.Config{
34+
Domain: "test.domain.everything.awesome.is",
3435
Experimental: &experimental.Config{
3536
WebApp: &experimental.WebAppConfig{
3637
PublicAPI: &experimental.PublicAPIConfig{Enabled: true},

0 commit comments

Comments
 (0)