Skip to content

Commit c5ecccc

Browse files
committed
Fix
1 parent b651570 commit c5ecccc

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
4747
Name: Component,
4848
Image: ctx.ImageName(ctx.Config.Repository, Component, ctx.VersionManifest.Components.PublicAPIServer.Version),
4949
Args: []string{
50-
fmt.Sprintf(`--http-port="%d"`, HTTPContainerPort),
51-
fmt.Sprintf(`--grpc-port="%d"`, GRPCContainerPort),
50+
fmt.Sprintf(`--http-port=%d`, HTTPContainerPort),
51+
fmt.Sprintf(`--grpc-port=%d`, GRPCContainerPort),
5252
fmt.Sprintf(`--gitpod-api-url="wss://%s/api/v1"`, ctx.Config.Domain),
5353
},
5454
ImagePullPolicy: corev1.PullIfNotPresent,

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)