feat: Adjust memory of plug-in registry container based on openVSXURL settings (#1485)

pull/1487/head
Anatolii Bazko 2022-08-17 15:34:54 +03:00 committed by GitHub
parent 0b8913ae04
commit bb7dd51325
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 5 deletions

View File

@ -33,10 +33,12 @@ const (
DefaultDashboardCpuRequest = "100m"
// PluginRegistry
DefaultPluginRegistryMemoryLimit = "1536Mi"
DefaultPluginRegistryMemoryRequest = "32Mi"
DefaultPluginRegistryCpuLimit = "500m"
DefaultPluginRegistryCpuRequest = "100m"
DefaultPluginRegistryMemoryLimit = "256Mi"
DefaultPluginRegistryMemoryLimitEmbeddedOpenVSXRegistry = "2Gi"
DefaultPluginRegistryMemoryRequest = "32Mi"
DefaultPluginRegistryMemoryRequestEmbeddedOpenVSXRegistry = "512Mi"
DefaultPluginRegistryCpuLimit = "500m"
DefaultPluginRegistryCpuRequest = "100m"
// DevfileRegistry
DefaultDevfileRegistryMemoryLimit = "256Mi"

View File

@ -41,6 +41,11 @@ func (p *PluginRegistryReconciler) getPluginRegistryDeploymentSpec(ctx *chetypes
},
}
if ctx.CheCluster.Spec.Components.PluginRegistry.OpenVSXURL == "" {
resources.Requests[corev1.ResourceMemory] = resource.MustParse(constants.DefaultPluginRegistryMemoryRequestEmbeddedOpenVSXRegistry)
resources.Limits[corev1.ResourceMemory] = resource.MustParse(constants.DefaultPluginRegistryMemoryLimitEmbeddedOpenVSXRegistry)
}
deployment := registry.GetSpecRegistryDeployment(
ctx,
registryType,

View File

@ -36,7 +36,21 @@ func TestGetPluginRegistryDeploymentSpec(t *testing.T) {
testCases := []testCase{
{
name: "Test default limits",
name: "Test default limits for embedded OpenVSX registry",
initObjects: []runtime.Object{},
memoryLimit: constants.DefaultPluginRegistryMemoryLimitEmbeddedOpenVSXRegistry,
memoryRequest: constants.DefaultPluginRegistryMemoryRequestEmbeddedOpenVSXRegistry,
cpuLimit: constants.DefaultPluginRegistryCpuLimit,
cpuRequest: constants.DefaultPluginRegistryCpuRequest,
cheCluster: &chev2.CheCluster{
ObjectMeta: metav1.ObjectMeta{
Namespace: "eclipse-che",
Name: "eclipse-che",
},
},
},
{
name: "Test default limits for external openVSX registry",
initObjects: []runtime.Object{},
memoryLimit: constants.DefaultPluginRegistryMemoryLimit,
memoryRequest: constants.DefaultPluginRegistryMemoryRequest,
@ -47,6 +61,13 @@ func TestGetPluginRegistryDeploymentSpec(t *testing.T) {
Namespace: "eclipse-che",
Name: "eclipse-che",
},
Spec: chev2.CheClusterSpec{
Components: chev2.CheClusterComponents{
PluginRegistry: chev2.PluginRegistry{
OpenVSXURL: "open-vsx-url",
},
},
},
},
},
{