Merge pull request #89 from metalmatze/no-resources

Remove resource requests and limits
thanos-io · Jan 28, 2020 · 14ecdd5 · 14ecdd5
2 parents b6a6a41 + b571301
commit 14ecdd5
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 71 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-vendor/
+jb
+vendor/
diff --git a/Makefile b/Makefile
@@ -26,9 +26,13 @@ manifests: vendor example.jsonnet build.sh
 	rm -rf manifests
 	./build.sh
 
-vendor: jsonnetfile.json jsonnetfile.lock.json
+jb:
+	curl -L -o jb "https://github.com/jsonnet-bundler/jsonnet-bundler/releases/download/v0.2.0/jb-$(shell go env GOOS)-$(shell go env GOARCH)"
+	chmod +x jb
+
+vendor: jb jsonnetfile.json jsonnetfile.lock.json
 	rm -rf vendor
-	jb install
+	./jb install
 
 .PHONY: fmt
 fmt:

diff --git a/examples/all/manifests/thanos-bucket-deployment.yaml b/examples/all/manifests/thanos-bucket-deployment.yaml
@@ -45,11 +45,4 @@ spec:
             port: 8080
             scheme: HTTP
           periodSeconds: 5
-        resources:
-          limits:
-            cpu: 250m
-            memory: 512Mi
-          requests:
-            cpu: 100m
-            memory: 256Mi
       terminationGracePeriodSeconds: 120
diff --git a/examples/all/manifests/thanos-compactor-statefulSet.yaml b/examples/all/manifests/thanos-compactor-statefulSet.yaml
@@ -50,13 +50,6 @@ spec:
             port: 10902
             scheme: HTTP
           periodSeconds: 5
-        resources:
-          limits:
-            cpu: 500m
-            memory: 2Gi
-          requests:
-            cpu: 100m
-            memory: 1Gi
         volumeMounts:
         - mountPath: /var/thanos/compactor
           name: thanos-compactor-data

diff --git a/examples/all/manifests/thanos-querier-deployment.yaml b/examples/all/manifests/thanos-querier-deployment.yaml
@@ -61,11 +61,4 @@ spec:
             port: 9090
             scheme: HTTP
           periodSeconds: 5
-        resources:
-          limits:
-            cpu: "1"
-            memory: 1Gi
-          requests:
-            cpu: 100m
-            memory: 256Mi
       terminationGracePeriodSeconds: 120
diff --git a/examples/all/manifests/thanos-receive-statefulSet.yaml b/examples/all/manifests/thanos-receive-statefulSet.yaml
@@ -73,13 +73,6 @@ spec:
             port: 10902
             scheme: HTTP
           periodSeconds: 5
-        resources:
-          limits:
-            cpu: "1"
-            memory: 1Gi
-          requests:
-            cpu: 100m
-            memory: 512Mi
         volumeMounts:
         - mountPath: /var/thanos/receive
           name: thanos-receive-data

diff --git a/examples/all/manifests/thanos-ruler-statefulSet.yaml b/examples/all/manifests/thanos-ruler-statefulSet.yaml
@@ -58,13 +58,6 @@ spec:
             scheme: HTTP
           initialDelaySeconds: 10
           periodSeconds: 5
-        resources:
-          limits:
-            cpu: "1"
-            memory: 1Gi
-          requests:
-            cpu: 100m
-            memory: 256Mi
         volumeMounts:
         - mountPath: /var/thanos/ruler
           name: thanos-ruler-data

diff --git a/examples/all/manifests/thanos-store-statefulSet.yaml b/examples/all/manifests/thanos-store-statefulSet.yaml
@@ -50,13 +50,6 @@ spec:
             port: 10902
             scheme: HTTP
           periodSeconds: 5
-        resources:
-          limits:
-            cpu: "2"
-            memory: 8Gi
-          requests:
-            cpu: 500m
-            memory: 1Gi
         volumeMounts:
         - mountPath: /var/thanos/store
           name: thanos-store-data

diff --git a/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet b/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet
@@ -46,8 +46,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
               tb.objectStorageConfig.key,
             ),
           ]) +
-          container.mixin.resources.withRequests({ cpu: '100m', memory: '256Mi' }) +
-          container.mixin.resources.withLimits({ cpu: '250m', memory: '512Mi' }) +
           container.withPorts([
             { name: 'http', containerPort: tb.ports.http },
           ]) +

diff --git a/jsonnet/kube-thanos/kube-thanos-compactor.libsonnet b/jsonnet/kube-thanos/kube-thanos-compactor.libsonnet
@@ -51,8 +51,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
           container.withPorts([
             { name: 'http', containerPort: $.thanos.compactor.service.spec.ports[0].port },
           ]) +
-          container.mixin.resources.withRequests({ cpu: '100m', memory: '1Gi' }) +
-          container.mixin.resources.withLimits({ cpu: '500m', memory: '2Gi' }) +
           container.withVolumeMounts([
             containerVolumeMount.new('thanos-compactor-data', '/var/thanos/compactor', false),
           ]) +

diff --git a/jsonnet/kube-thanos/kube-thanos-querier.libsonnet b/jsonnet/kube-thanos/kube-thanos-querier.libsonnet
@@ -42,8 +42,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
             '--grpc-address=0.0.0.0:%d' % $.thanos.querier.service.spec.ports[0].port,
             '--http-address=0.0.0.0:%d' % $.thanos.querier.service.spec.ports[1].port,
           ]) +
-          container.mixin.resources.withRequests({ cpu: '100m', memory: '256Mi' }) +
-          container.mixin.resources.withLimits({ cpu: '1', memory: '1Gi' }) +
           container.withPorts([
             { name: 'grpc', containerPort: $.thanos.querier.service.spec.ports[0].port },
             { name: 'http', containerPort: $.thanos.querier.service.spec.ports[1].port },

diff --git a/jsonnet/kube-thanos/kube-thanos-receive.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive.libsonnet
@@ -61,8 +61,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
             { name: 'http', containerPort: $.thanos.receive.service.spec.ports[1].port },
             { name: 'remote-write', containerPort: $.thanos.receive.service.spec.ports[2].port },
           ]) +
-          container.mixin.resources.withRequests({ cpu: '100m', memory: '512Mi' }) +
-          container.mixin.resources.withLimits({ cpu: '1', memory: '1Gi' }) +
           container.withVolumeMounts([
             containerVolumeMount.new(tr.name + '-data', '/var/thanos/receive', false),
           ]) +

diff --git a/jsonnet/kube-thanos/kube-thanos-ruler.libsonnet b/jsonnet/kube-thanos/kube-thanos-ruler.libsonnet
@@ -72,8 +72,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
               tr.objectStorageConfig.key,
             ),
           ]) +
-          container.mixin.resources.withRequests({ cpu: '100m', memory: '256Mi' }) +
-          container.mixin.resources.withLimits({ cpu: '1', memory: '1Gi' }) +
           container.withVolumeMounts([
             containerVolumeMount.new('thanos-ruler-data', '/var/thanos/ruler', false),
           ]) +

diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet
@@ -59,8 +59,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
             { name: 'grpc', containerPort: $.thanos.store.service.spec.ports[0].port },
             { name: 'http', containerPort: $.thanos.store.service.spec.ports[1].port },
           ]) +
-          container.mixin.resources.withRequests({ cpu: '500m', memory: '1Gi' }) +
-          container.mixin.resources.withLimits({ cpu: '2', memory: '8Gi' }) +
           container.withVolumeMounts([
             containerVolumeMount.new(ts.name + '-data', '/var/thanos/store', false),
           ]) +

diff --git a/manifests/thanos-querier-deployment.yaml b/manifests/thanos-querier-deployment.yaml
@@ -57,11 +57,4 @@ spec:
             port: 9090
             scheme: HTTP
           periodSeconds: 5
-        resources:
-          limits:
-            cpu: "1"
-            memory: 1Gi
-          requests:
-            cpu: 100m
-            memory: 256Mi
       terminationGracePeriodSeconds: 120
diff --git a/manifests/thanos-store-statefulSet.yaml b/manifests/thanos-store-statefulSet.yaml
@@ -50,13 +50,6 @@ spec:
             port: 10902
             scheme: HTTP
           periodSeconds: 5
-        resources:
-          limits:
-            cpu: "2"
-            memory: 8Gi
-          requests:
-            cpu: 500m
-            memory: 1Gi
         volumeMounts:
         - mountPath: /var/thanos/store
           name: thanos-store-data