From 9a00be7aff5f74197441cb7458a3c2301ccfcca8 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Fri, 21 May 2021 11:56:07 +0100 Subject: [PATCH] Added better memory limits --- manifests/11-year-anniversary/11-year-anniversary.yaml | 4 ++-- manifests/base64/base64.yaml | 4 ++-- manifests/blackhole/blackhole.yaml | 1 - manifests/dashboard/dashboard.yaml | 6 ++---- manifests/goplayground/goplayground.yaml | 5 +++++ manifests/inlets/inlets.yaml | 5 +++++ manifests/matrix_chart/matrix_chart.yaml | 5 +++++ manifests/qr/qr.yaml | 4 ++-- manifests/rss/rss.yaml | 9 +++++++-- manifests/talks/talks.yaml | 4 ++-- manifests/til/til.yaml | 4 ++-- .../website-to-remarkable/website-to-remarkable.yaml | 9 +++++++-- 12 files changed, 41 insertions(+), 19 deletions(-) diff --git a/manifests/11-year-anniversary/11-year-anniversary.yaml b/manifests/11-year-anniversary/11-year-anniversary.yaml index f4c295c..a4bdff9 100644 --- a/manifests/11-year-anniversary/11-year-anniversary.yaml +++ b/manifests/11-year-anniversary/11-year-anniversary.yaml @@ -51,9 +51,9 @@ spec: name: web resources: limits: - memory: 283Mi + memory: 5Mi requests: - memory: 283Mi + memory: 5Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/base64/base64.yaml b/manifests/base64/base64.yaml index cadcddf..9a90f47 100644 --- a/manifests/base64/base64.yaml +++ b/manifests/base64/base64.yaml @@ -38,9 +38,9 @@ spec: name: web resources: limits: - memory: 10Mi + memory: 5Mi requests: - memory: 10Mi + memory: 5Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/blackhole/blackhole.yaml b/manifests/blackhole/blackhole.yaml index 01dd7e4..df86afb 100644 --- a/manifests/blackhole/blackhole.yaml +++ b/manifests/blackhole/blackhole.yaml @@ -37,7 +37,6 @@ spec: resources: limits: memory: 10Mi - requests: memory: 10Mi diff --git a/manifests/dashboard/dashboard.yaml b/manifests/dashboard/dashboard.yaml index 14bd28b..91e7ede 100644 --- a/manifests/dashboard/dashboard.yaml +++ b/manifests/dashboard/dashboard.yaml @@ -89,11 +89,9 @@ spec: name: auth resources: limits: - memory: 125Mi + memory: 50Mi requests: - memory: 125Mi - - + memory: 50Mi - name: web image: docker.cluster.fun/private/dashboard:latest imagePullPolicy: Always diff --git a/manifests/goplayground/goplayground.yaml b/manifests/goplayground/goplayground.yaml index ebda35e..1ff8d33 100644 --- a/manifests/goplayground/goplayground.yaml +++ b/manifests/goplayground/goplayground.yaml @@ -34,6 +34,11 @@ spec: ports: - containerPort: 8000 name: web + resources: + limits: + memory: 20Mi + requests: + memory: 20Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/inlets/inlets.yaml b/manifests/inlets/inlets.yaml index 03c83b3..ff50dc4 100644 --- a/manifests/inlets/inlets.yaml +++ b/manifests/inlets/inlets.yaml @@ -53,6 +53,11 @@ spec: volumeMounts: - name: inlets-token-volume mountPath: /var/inlets/ + resources: + limits: + memory: 50Mi + requests: + memory: 50Mi volumes: - name: inlets-token-volume secret: diff --git a/manifests/matrix_chart/matrix_chart.yaml b/manifests/matrix_chart/matrix_chart.yaml index cc4d265..745e9a8 100644 --- a/manifests/matrix_chart/matrix_chart.yaml +++ b/manifests/matrix_chart/matrix_chart.yaml @@ -220,6 +220,11 @@ spec: volumeMounts: - name: well-known mountPath: /usr/share/nginx/html/.well-known/matrix + resources: + limits: + memory: 5Mi + requests: + memory: 5Mi volumes: - name: well-known configMap: diff --git a/manifests/qr/qr.yaml b/manifests/qr/qr.yaml index c73af1b..c158366 100644 --- a/manifests/qr/qr.yaml +++ b/manifests/qr/qr.yaml @@ -36,9 +36,9 @@ spec: name: web resources: limits: - memory: 100Mi + memory: 20Mi requests: - memory: 100Mi + memory: 20Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/rss/rss.yaml b/manifests/rss/rss.yaml index 701bd9c..2092c85 100644 --- a/manifests/rss/rss.yaml +++ b/manifests/rss/rss.yaml @@ -93,9 +93,9 @@ spec: protocol: TCP resources: limits: - memory: 125Mi + memory: 50Mi requests: - memory: 125Mi + memory: 50Mi - name: web image: docker.cluster.fun/averagemarcus/gopherss:latest env: @@ -114,6 +114,11 @@ spec: volumeMounts: - mountPath: /data name: storage + resources: + limits: + memory: 100Mi + requests: + memory: 100Mi volumes: - name: storage persistentVolumeClaim: diff --git a/manifests/talks/talks.yaml b/manifests/talks/talks.yaml index 8784840..35c2da8 100644 --- a/manifests/talks/talks.yaml +++ b/manifests/talks/talks.yaml @@ -36,9 +36,9 @@ spec: name: web resources: limits: - memory: 100Mi + memory: 50Mi requests: - memory: 100Mi + memory: 50Mi --- apiVersion: networking.k8s.io/v1 kind: Ingress diff --git a/manifests/til/til.yaml b/manifests/til/til.yaml index bf2c330..fbc7a00 100644 --- a/manifests/til/til.yaml +++ b/manifests/til/til.yaml @@ -36,9 +36,9 @@ spec: name: web resources: limits: - memory: 100Mi + memory: 20Mi requests: - memory: 100Mi + memory: 20Mi --- apiVersion: extensions/v1beta1 kind: Ingress diff --git a/manifests/website-to-remarkable/website-to-remarkable.yaml b/manifests/website-to-remarkable/website-to-remarkable.yaml index ea6da7b..88aa3c6 100644 --- a/manifests/website-to-remarkable/website-to-remarkable.yaml +++ b/manifests/website-to-remarkable/website-to-remarkable.yaml @@ -92,9 +92,9 @@ spec: protocol: TCP resources: limits: - memory: 125Mi + memory: 50Mi requests: - memory: 125Mi + memory: 50Mi - name: web image: docker.cluster.fun/averagemarcus/website-to-remarkable:latest imagePullPolicy: Always @@ -107,6 +107,11 @@ spec: ports: - containerPort: 8000 name: web + resources: + limits: + memory: 50Mi + requests: + memory: 50Mi --- apiVersion: extensions/v1beta1 kind: Ingress