Merge pull request #35 from metalmatze/resources

Add resource requests and limits to receive-controller container
observatorium · Nov 12, 2019 · 47c08cc · 47c08cc
2 parents 117290c + 20861be
commit 47c08cc
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 52 deletions.
diff --git a/examples/manifests/deployment.yaml b/examples/manifests/deployment.yaml
@@ -31,4 +31,11 @@ spec:
         ports:
         - containerPort: 8080
           name: http
+        resources:
+          limits:
+            cpu: 64m
+            memory: 128Mi
+          requests:
+            cpu: 10m
+            memory: 24Mi
       serviceAccount: thanos-receive-controller
diff --git a/jsonnet/jsonnetfile.json b/jsonnet/jsonnetfile.json
@@ -1,53 +1,53 @@
 {
-    "dependencies": [
-        {
-            "name": "ksonnet",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/ksonnet/ksonnet-lib",
-                    "subdir": ""
-                }
-            },
-            "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f"
-        },
-        {
-            "name": "thanos-receive-controller-mixin",
-            "source": {
-                "local": {
-                    "directory": "thanos-receive-controller-mixin"
-                }
-            },
-            "version": "."
-        },
-        {
-            "name": "thanos-mixin",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/metalmatze/kube-thanos",
-                    "subdir": "jsonnet/thanos-mixin"
-                }
-            },
-            "version": "master"
-        },
-        {
-            "name": "grafonnet",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/grafana/grafonnet-lib",
-                    "subdir": "grafonnet"
-                }
-            },
-            "version": "master"
-        },
-        {
-            "name": "grafana-builder",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/grafana/jsonnet-libs",
-                    "subdir": "grafana-builder"
-                }
-            },
-            "version": "master"
+  "dependencies": [
+    {
+      "name": "grafana-builder",
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs",
+          "subdir": "grafana-builder"
         }
-    ]
+      },
+      "version": "master"
+    },
+    {
+      "name": "grafonnet",
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/grafonnet-lib",
+          "subdir": "grafonnet"
+        }
+      },
+      "version": "master"
+    },
+    {
+      "name": "ksonnet",
+      "source": {
+        "git": {
+          "remote": "https://github.com/ksonnet/ksonnet-lib",
+          "subdir": ""
+        }
+      },
+      "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f"
+    },
+    {
+      "name": "thanos-mixin",
+      "source": {
+        "git": {
+          "remote": "https://github.com/metalmatze/kube-thanos",
+          "subdir": "jsonnet/thanos-mixin"
+        }
+      },
+      "version": "master"
+    },
+    {
+      "name": "thanos-receive-controller-mixin",
+      "source": {
+        "local": {
+          "directory": "thanos-receive-controller-mixin"
+        }
+      },
+      "version": "."
+    }
+  ]
 }
diff --git a/jsonnet/lib/thanos-receive-controller.libsonnet b/jsonnet/lib/thanos-receive-controller.libsonnet
@@ -90,9 +90,13 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
             '--configmap-generated-name=%s-generated' % $.thanos.receiveController.configmap.metadata.name,
             '--file-name=hashrings.json',
             '--namespace=$(NAMESPACE)',
-          ]) + container.withEnv([
+          ]) +
+          container.withEnv([
             env.fromFieldPath('NAMESPACE', 'metadata.namespace'),
-          ]) + container.withPorts(
+          ]) +
+          container.mixin.resources.withRequests({ cpu: '10m', memory: '24Mi' }) +
+          container.mixin.resources.withLimits({ cpu: '64m', memory: '128Mi' }) +
+          container.withPorts(
             containerPort.newNamed(8080, 'http')
           );