Merge pull request #2 from projectsyn/resource_limits

Support configuring container memory and CPU limits
projectsyn · Aug 26, 2021 · 3736857 · 3736857
2 parents 13d7a7f + 833e425
commit 3736857
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 4 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -16,6 +16,14 @@ parameters:
       monitor_user: maxscale
       service_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/service_pwd}
       monitor_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/monitor_pwd}
+    containers:
+      resources:
+        requests:
+          cpu: 1000m
+          memory: 128Mi
+        limits:
+          cpu: 2000m
+          memory: 512Mi
     images:
       maxscale:
         image: docker.io/mariadb/maxscale

diff --git a/component/main.jsonnet b/component/main.jsonnet
@@ -75,8 +75,14 @@ local deployment = kube.Deployment('maxscale') {
               initialDelaySeconds: 15,
             },
             resources: {
-              requests: { cpu: '1000m', memory: '128Mi' },
-              limits: { cpu: '2000m', memory: '512Mi' },
+              requests: {
+                cpu: params.containers.resources.requests.cpu,
+                memory: params.containers.resources.requests.memory,
+              },
+              limits: {
+                cpu: params.containers.resources.limits.cpu,
+                memory: params.containers.resources.limits.memory,
+              },
             },
             volumeMounts: [
               {

diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -1,6 +1,6 @@
-= Parameters
+= Maxscale Parameters
 
-The parent key for all of the following parameters is `maxscale`.
+The parent key for the following parameters is `maxscale` and they affect MaxScale itself:
 
 == `namespace`
 
@@ -82,6 +82,37 @@ default:: `?{vaultkv:${customer:name}/${cluster:name}/maxscale/service_pwd}`
 type:: string
 default:: `?{vaultkv:${customer:name}/${cluster:name}/maxscale/monitor_pwd}`
 
+
+= Container Parameters
+
+The parent key for the following parameters is `containers` and they affect the MaxScale containers:
+
+
+== `resources.requests.cpu`
+
+[horizontal]
+type:: string
+default:: `1000m`
+
+== `resources.requests.memory`
+
+[horizontal]
+type:: string
+default:: `128Mi`
+
+== `resources.limits.cpu`
+
+[horizontal]
+type:: string
+default:: `2000m`
+
+== `resources.limits.memory`
+
+[horizontal]
+type:: string
+default:: `512Mi`
+
+
 == Example
 
 [source,yaml]
@@ -96,4 +127,12 @@ maxscale:
   db3_port: 3305
   monitor_user: mymonitoruser
   service_user: myserviceuser
+containers:
+  resources:
+    requests:
+      cpu: 1000m
+      memory: 128Mi
+    limits:
+      cpu: 2000m
+      memory: 512Mi
 ----