Skip to content

Commit 09d6121

Browse files
committed
[public-api] Add k8s service definition
1 parent f6d2783 commit 09d6121

File tree

4 files changed

+43
-8
lines changed

4 files changed

+43
-8
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
package public_api_server
66

77
const (
8-
Component = "public-api-server"
9-
ContainerPort = 9000
10-
PortName = "http"
8+
Component = "public-api-server"
9+
10+
HTTPPortName = "http"
11+
HTTPContainerPort = 9000
12+
HTTPServicePort = 9000
13+
14+
GRPCPortName = "grpc"
15+
GRPCContainerPort = 9001
16+
GRPCServicePort = 9001
1117
)

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,16 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
5252
"memory": resource.MustParse("32Mi"),
5353
},
5454
},
55-
Ports: []corev1.ContainerPort{{
56-
ContainerPort: ContainerPort,
57-
Name: PortName,
58-
}},
55+
Ports: []corev1.ContainerPort{
56+
{
57+
ContainerPort: HTTPContainerPort,
58+
Name: HTTPPortName,
59+
},
60+
{
61+
ContainerPort: GRPCContainerPort,
62+
Name: GRPCPortName,
63+
},
64+
},
5965
SecurityContext: &corev1.SecurityContext{
6066
Privileged: pointer.Bool(false),
6167
},
@@ -66,7 +72,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
6672
ProbeHandler: corev1.ProbeHandler{
6773
HTTPGet: &corev1.HTTPGetAction{
6874
Path: "/",
69-
Port: intstr.IntOrString{IntVal: ContainerPort},
75+
Port: intstr.IntOrString{IntVal: HTTPContainerPort},
7076
Scheme: corev1.URISchemeHTTP,
7177
},
7278
},

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ func Objects(ctx *common.RenderContext) ([]runtime.Object, error) {
2121
deployment,
2222
rolebinding,
2323
common.DefaultServiceAccount(Component),
24+
service,
2425
)(ctx)
2526
}
2627

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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/installer/pkg/common"
8+
"k8s.io/apimachinery/pkg/runtime"
9+
)
10+
11+
func service(ctx *common.RenderContext) ([]runtime.Object, error) {
12+
return common.GenerateService(Component, map[string]common.ServicePort{
13+
HTTPPortName: {
14+
ContainerPort: HTTPContainerPort,
15+
ServicePort: HTTPServicePort,
16+
},
17+
GRPCPortName: {
18+
ContainerPort: GRPCContainerPort,
19+
ServicePort: GRPCServicePort,
20+
},
21+
})(ctx)
22+
}

0 commit comments

Comments
 (0)