Skip to content

Commit 376f6c9

Browse files
authored
[installer] Fix slowserver replicas (to 1) (#16531)
1 parent 2c45284 commit 376f6c9

File tree

2 files changed

+1
-50
lines changed

2 files changed

+1
-50
lines changed

install/installer/pkg/components/slowserver/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
381381
},
382382
Spec: appsv1.DeploymentSpec{
383383
Selector: &metav1.LabelSelector{MatchLabels: common.DefaultLabels(Component)},
384-
Replicas: common.Replicas(ctx, common.ServerComponent),
384+
Replicas: common.Replicas(ctx, Component),
385385
Strategy: common.DeploymentStrategy,
386386
Template: corev1.PodTemplateSpec{
387387
ObjectMeta: metav1.ObjectMeta{

install/installer/pkg/components/slowserver/render_test.go

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ import (
99

1010
"github.com/stretchr/testify/require"
1111
appsv1 "k8s.io/api/apps/v1"
12-
"k8s.io/apimachinery/pkg/api/resource"
1312
"k8s.io/utils/pointer"
1413

1514
"github.com/gitpod-io/gitpod/installer/pkg/common"
1615
"github.com/gitpod-io/gitpod/installer/pkg/components/toxiproxy"
1716
config "github.com/gitpod-io/gitpod/installer/pkg/config/v1"
1817
"github.com/gitpod-io/gitpod/installer/pkg/config/v1/experimental"
1918
"github.com/gitpod-io/gitpod/installer/pkg/config/versions"
20-
corev1 "k8s.io/api/core/v1"
2119
v1 "k8s.io/api/core/v1"
2220
)
2321

@@ -79,53 +77,6 @@ func TestServerDeployment_DbWaiterUsesToxiproxyDbHost(t *testing.T) {
7977
}
8078
}
8179

82-
func TestSlowServerDeployment_UsesServerReplicaCountAndResources(t *testing.T) {
83-
resources := map[string]*v1.ResourceRequirements{
84-
common.ServerComponent: {
85-
Limits: corev1.ResourceList{
86-
"cpu": resource.MustParse("300m"),
87-
"memory": resource.MustParse("300Mi"),
88-
},
89-
Requests: corev1.ResourceList{
90-
"cpu": resource.MustParse("200m"),
91-
"memory": resource.MustParse("200Mi"),
92-
},
93-
},
94-
}
95-
96-
podConfig := map[string]*config.PodConfig{
97-
common.ServerComponent: {
98-
Replicas: pointer.Int32(5),
99-
Resources: resources,
100-
},
101-
}
102-
103-
slowDbHost := toxiproxy.Component
104-
ctx := renderContext(t, podConfig, slowDbHost)
105-
106-
objects, err := deployment(ctx)
107-
require.NoError(t, err)
108-
109-
require.Len(t, objects, 1, "must render only one object")
110-
111-
deployment := objects[0].(*appsv1.Deployment)
112-
113-
require.NotNil(t, deployment.Spec.Replicas, "replica count must be specified")
114-
require.Equal(t, int32(5), *deployment.Spec.Replicas, "unexpected number of replicas")
115-
116-
for _, c := range deployment.Spec.Template.Spec.Containers {
117-
if c.Name == Component {
118-
expectedResources := *resources[common.ServerComponent]
119-
actualResources := c.Resources
120-
121-
require.Equal(t, expectedResources.Limits["cpu"], actualResources.Limits["cpu"], "cpu limit not set correctly")
122-
require.Equal(t, expectedResources.Limits["memory"], actualResources.Limits["memory"], "memory limit not set correctly")
123-
require.Equal(t, expectedResources.Requests["cpu"], actualResources.Requests["cpu"], "cpu request not set correctly")
124-
require.Equal(t, expectedResources.Requests["memory"], actualResources.Requests["memory"], "memory request not set correctly")
125-
}
126-
}
127-
}
128-
12980
func TestServerDeployment_MountsGithubAppSecret(t *testing.T) {
13081
ctx := renderContext(t, nil, "")
13182

0 commit comments

Comments
 (0)