add cpu and memory request for jwtproxy (eclipse-che#18551)

Signed-off-by: Michal Vala <mvala@redhat.com>
xiaochen2050 · Dec 9, 2020 · 55f29d6 · 55f29d6
1 parent f817a51
commit 55f29d6
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 1 deletion.
diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
@@ -606,7 +606,9 @@ che.server.secure_exposer.jwtproxy.token.issuer=wsmaster
 che.server.secure_exposer.jwtproxy.token.ttl=8800h
 che.server.secure_exposer.jwtproxy.auth.loader.path=/_app/loader.html
 che.server.secure_exposer.jwtproxy.image=quay.io/eclipse/che-jwtproxy:0.10.0
+che.server.secure_exposer.jwtproxy.memory_request=15mb
 che.server.secure_exposer.jwtproxy.memory_limit=128mb
+che.server.secure_exposer.jwtproxy.cpu_request=0.03
 che.server.secure_exposer.jwtproxy.cpu_limit=0.5
 
 ### Configuration of major "/websocket" endpoint

diff --git a/...rkspace/infrastructure/kubernetes/server/secure/jwtproxy/AbstractJwtProxyProvisioner.java b/...rkspace/infrastructure/kubernetes/server/secure/jwtproxy/AbstractJwtProxyProvisioner.java
@@ -14,6 +14,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static org.eclipse.che.api.core.model.workspace.config.MachineConfig.CPU_LIMIT_ATTRIBUTE;
+import static org.eclipse.che.api.core.model.workspace.config.MachineConfig.CPU_REQUEST_ATTRIBUTE;
 import static org.eclipse.che.api.core.model.workspace.config.MachineConfig.MEMORY_LIMIT_ATTRIBUTE;
 import static org.eclipse.che.api.core.model.workspace.config.MachineConfig.MEMORY_REQUEST_ATTRIBUTE;
 import static org.eclipse.che.api.workspace.shared.Constants.CONTAINER_SOURCE_ATTRIBUTE;
@@ -103,7 +104,9 @@ abstract class AbstractJwtProxyProvisioner implements ProxyProvisioner {
       CookiePathStrategy cookiePathStrategy,
       MultiHostCookiePathStrategy multihostCookiePathStrategy,
       String jwtProxyImage,
+      String memoryRequestBytes,
       String memoryLimitBytes,
+      String cpuRequestCores,
       String cpuLimitCores,
       String imagePullPolicy,
       String workspaceId,
@@ -120,14 +123,18 @@ abstract class AbstractJwtProxyProvisioner implements ProxyProvisioner {
 
     this.availablePort = FIRST_AVAILABLE_PROXY_PORT;
     long memoryLimitLong = Size.parseSizeToMegabytes(memoryLimitBytes) * MEGABYTES_TO_BYTES_DIVIDER;
+    long memoryRequestLong =
+        Size.parseSizeToMegabytes(memoryRequestBytes) * MEGABYTES_TO_BYTES_DIVIDER;
     this.attributes =
         ImmutableMap.of(
             MEMORY_LIMIT_ATTRIBUTE,
             Long.toString(memoryLimitLong),
             MEMORY_REQUEST_ATTRIBUTE,
-            Long.toString(memoryLimitLong),
+            Long.toString(memoryRequestLong),
             CPU_LIMIT_ATTRIBUTE,
             cpuLimitCores,
+            CPU_REQUEST_ATTRIBUTE,
+            cpuRequestCores,
             CONTAINER_SOURCE_ATTRIBUTE,
             TOOL_CONTAINER_SOURCE);
 

diff --git a/...e/che/workspace/infrastructure/kubernetes/server/secure/jwtproxy/JwtProxyProvisioner.java b/...e/che/workspace/infrastructure/kubernetes/server/secure/jwtproxy/JwtProxyProvisioner.java
@@ -53,7 +53,9 @@ public JwtProxyProvisioner(
       CookiePathStrategy cookiePathStrategy,
       MultiHostCookiePathStrategy multiHostCookiePathStrategy,
       @Named("che.server.secure_exposer.jwtproxy.image") String jwtProxyImage,
+      @Named("che.server.secure_exposer.jwtproxy.memory_request") String memoryRequestBytes,
       @Named("che.server.secure_exposer.jwtproxy.memory_limit") String memoryLimitBytes,
+      @Named("che.server.secure_exposer.jwtproxy.cpu_request") String cpuRequestCores,
       @Named("che.server.secure_exposer.jwtproxy.cpu_limit") String cpuLimitCores,
       @Named("che.workspace.sidecar.image_pull_policy") String imagePullPolicy,
       @Assisted RuntimeIdentity identity)
@@ -66,7 +68,9 @@ public JwtProxyProvisioner(
         cookiePathStrategy,
         multiHostCookiePathStrategy,
         jwtProxyImage,
+        memoryRequestBytes,
         memoryLimitBytes,
+        cpuRequestCores,
         cpuLimitCores,
         imagePullPolicy,
         identity.getWorkspaceId(),

diff --git a/...rkspace/infrastructure/kubernetes/server/secure/jwtproxy/PassThroughProxyProvisioner.java b/...rkspace/infrastructure/kubernetes/server/secure/jwtproxy/PassThroughProxyProvisioner.java
@@ -39,7 +39,9 @@ public PassThroughProxyProvisioner(
       CookiePathStrategy cookiePathStrategy,
       MultiHostCookiePathStrategy multiHostCookiePathStrategy,
       @Named("che.server.secure_exposer.jwtproxy.image") String jwtImage,
+      @Named("che.server.secure_exposer.jwtproxy.memory_request") String memoryRequestBytes,
       @Named("che.server.secure_exposer.jwtproxy.memory_limit") String memoryLimitBytes,
+      @Named("che.server.secure_exposer.jwtproxy.cpu_request") String cpuRequestCores,
       @Named("che.server.secure_exposer.jwtproxy.cpu_limit") String cpuLimitCores,
       @Named("che.workspace.sidecar.image_pull_policy") String imagePullPolicy,
       @Assisted RuntimeIdentity identity)
@@ -52,7 +54,9 @@ public PassThroughProxyProvisioner(
         cookiePathStrategy,
         multiHostCookiePathStrategy,
         jwtImage,
+        memoryRequestBytes,
         memoryLimitBytes,
+        cpuRequestCores,
         cpuLimitCores,
         imagePullPolicy,
         identity.getWorkspaceId(),

diff --git a/...e/workspace/infrastructure/kubernetes/server/secure/jwtproxy/JwtProxyProvisionerTest.java b/...e/workspace/infrastructure/kubernetes/server/secure/jwtproxy/JwtProxyProvisionerTest.java
@@ -116,7 +116,9 @@ public void setUp() throws Exception {
             cookiePathStrategy,
             multiHostCookiePathStrategy,
             "eclipse/che-jwtproxy",
+            "10m",
             "128mb",
+            "0.02",
             "0.5",
             "Always",
             runtimeId);
@@ -237,7 +239,9 @@ public void shouldUseCookiesAuthEnabledFromServersConfigs() throws Exception {
             cookiePathStrategy,
             multiHostCookiePathStrategy,
             "eclipse/che-jwtproxy",
+            "10m",
             "128mb",
+            "0.02",
             "500m",
             "Always",
             runtimeId);
@@ -287,7 +291,9 @@ public void shouldFalseValueAsDefaultForCookiesAuthEnabledAttribute() throws Exc
             cookiePathStrategy,
             multiHostCookiePathStrategy,
             "eclipse/che-jwtproxy",
+            "10m",
             "128mb",
+            "0.02",
             "0.5",
             "Always",
             runtimeId);
@@ -328,7 +334,9 @@ public void shouldBindToLocalhostWhenNoServiceForServerExists() throws Exception
             cookiePathStrategy,
             multiHostCookiePathStrategy,
             "eclipse/che-jwtproxy",
+            "10m",
             "128mb",
+            "0.02",
             "0.5",
             "Always",
             runtimeId);
@@ -369,7 +377,9 @@ public void multiHostStrategiesUsedForServerRequiringSubdomain() throws Exceptio
             cookiePathStrategy,
             multiHostCookiePathStrategy,
             "eclipse/che-jwtproxy",
+            "10m",
             "128mb",
+            "0.02",
             "0.5",
             "Always",
             runtimeId);

diff --git a/...ace/infrastructure/kubernetes/server/secure/jwtproxy/PassThroughProxyProvisionerTest.java b/...ace/infrastructure/kubernetes/server/secure/jwtproxy/PassThroughProxyProvisionerTest.java
@@ -71,7 +71,9 @@ public void shouldConfigureProxyWithExcludes() throws Exception {
             new CookiePathStrategy(MULTI_HOST_STRATEGY),
             new MultiHostCookiePathStrategy(),
             "eclipse/che-jwtproxy",
+            "10m",
             "128mb",
+            "0.02",
             "0.5",
             "Always",
             runtimeId);