feat: add resources requests/limits to values

steadybit · Jun 14, 2024 · e3b3df9 · e3b3df9
1 parent 042cddb
commit e3b3df9
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 81 deletions.
diff --git a/charts/steadybit-shopping-demo/templates/2-gateway-deployment.yml b/charts/steadybit-shopping-demo/templates/2-gateway-deployment.yml
@@ -34,15 +34,7 @@ spec:
         - image: {{ .Values.gateway.image.name}}:{{ .Values.gateway.image.tag }}
           imagePullPolicy: Always
           name: gateway
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "100m"
-              ephemeral-storage: "500Mi"
-            limits:
-              memory: "512Mi"
-              cpu: "1000m"
-              ephemeral-storage: "1Gi"
+          resources: {{ toYaml .Values.gateway.resources | nindent 14 }}
           ports:
             - containerPort: 8080
               protocol: TCP

diff --git a/charts/steadybit-shopping-demo/templates/3-bestseller-fashion-deployment.yml b/charts/steadybit-shopping-demo/templates/3-bestseller-fashion-deployment.yml
@@ -29,15 +29,7 @@ spec:
         - image: {{ .Values.bestsellerFashion.image.name}}:{{ .Values.bestsellerFashion.image.tag }}
           name: fashion-bestseller
           imagePullPolicy: Always
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "100m"
-              ephemeral-storage: "500Mi"
-            limits:
-              memory: "512Mi"
-              cpu: "1000m"
-              ephemeral-storage: "1Gi"
+          resources: {{ toYaml .Values.bestsellerFashion.resources | nindent 14 }}
           ports:
             - containerPort: 8082
               protocol: TCP

diff --git a/charts/steadybit-shopping-demo/templates/4-bestseller-toys-deployment.yml b/charts/steadybit-shopping-demo/templates/4-bestseller-toys-deployment.yml
@@ -44,15 +44,7 @@ spec:
         - image: {{ .Values.bestsellerToys.image.name}}:{{ .Values.bestsellerToys.image.tag }}
           imagePullPolicy: Always
           name: toys-bestseller
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "100m"
-              ephemeral-storage: "500Mi"
-            limits:
-              memory: "512Mi"
-              cpu: "1000m"
-              ephemeral-storage: "1Gi"
+          resources: {{ toYaml .Values.bestsellerToys.resources | nindent 14 }}
           ports:
             - containerPort: 8081
               protocol: TCP

diff --git a/charts/steadybit-shopping-demo/templates/5-hot-deals-deployment.yml b/charts/steadybit-shopping-demo/templates/5-hot-deals-deployment.yml
@@ -113,15 +113,7 @@ spec:
               path: /actuator/health/readiness
               port: 8099
             initialDelaySeconds: 40
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "100m"
-              ephemeral-storage: "500Mi"
-            limits:
-              memory: "512Mi"
-              cpu: "1000m"
-              ephemeral-storage: "1Gi"
+          resources: {{ toYaml .Values.hotDeals.resources | nindent 14 }}
         - name: hot-deals-nginx
           image: nginx:alpine
           imagePullPolicy: Always
@@ -137,15 +129,7 @@ spec:
               path: /actuator/health/readiness
               port: 8083
             initialDelaySeconds: 40
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "100m"
-              ephemeral-storage: "500Mi"
-            limits:
-              memory: "512Mi"
-              cpu: "1000m"
-              ephemeral-storage: "1Gi"
+          resources: {{ toYaml .Values.hotDeals.nginx.resources | nindent 14 }}
           volumeMounts:
             - name: nginx-proxy-config
               mountPath: /etc/nginx/nginx.conf

diff --git a/charts/steadybit-shopping-demo/templates/6-inventory-service-mock-deployment.yml b/charts/steadybit-shopping-demo/templates/6-inventory-service-mock-deployment.yml
@@ -32,15 +32,7 @@ spec:
       serviceAccountName: steadybit-demo
       containers:
         - image: {{ .Values.inventory.image.name}}:{{ .Values.inventory.image.tag }}
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "100m"
-              ephemeral-storage: "500Mi"
-            limits:
-              memory: "512Mi"
-              cpu: "1000m"
-              ephemeral-storage: "1Gi"
+          resources: {{ toYaml .Values.inventory.resources | nindent 14 }}
           imagePullPolicy: Always
           name: inventory
           ports:

diff --git a/charts/steadybit-shopping-demo/templates/7-activemq-deployment.yml b/charts/steadybit-shopping-demo/templates/7-activemq-deployment.yml
@@ -42,15 +42,7 @@ spec:
               topologyKey: "topology.kubernetes.io/zone"
       containers:
         - image: {{ .Values.activemq.image.name}}:{{ .Values.activemq.image.tag }}
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "100m"
-              ephemeral-storage: "500Mi"
-            limits:
-              memory: "512Mi"
-              cpu: "1000m"
-              ephemeral-storage: "1Gi"
+          resources: {{ toYaml .Values.activemq.resources | nindent 14 }}
           imagePullPolicy: Always
           name: activemq
           ports:

diff --git a/charts/steadybit-shopping-demo/templates/8-checkout-deployment.yml b/charts/steadybit-shopping-demo/templates/8-checkout-deployment.yml
@@ -32,15 +32,7 @@ spec:
       serviceAccountName: steadybit-demo
       containers:
         - image: {{ .Values.checkout.image.name}}:{{ .Values.checkout.image.tag }}
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "100m"
-              ephemeral-storage: "500Mi"
-            limits:
-              memory: "512Mi"
-              cpu: "1000m"
-              ephemeral-storage: "1Gi"
+          resources: {{ toYaml .Values.checkout.resources | nindent 14 }}
           imagePullPolicy: Always
           name: checkout
           ports:

diff --git a/charts/steadybit-shopping-demo/templates/9-orders-deployment.yml b/charts/steadybit-shopping-demo/templates/9-orders-deployment.yml
@@ -44,15 +44,7 @@ spec:
       {{ end }}
       containers:
         - image: {{ .Values.orders.image.name}}:{{ .Values.orders.image.tag }}
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "100m"
-              ephemeral-storage: "500Mi"
-            limits:
-              memory: "512Mi"
-              cpu: "1000m"
-              ephemeral-storage: "1Gi"
+          resources: {{ toYaml .Values.orders.resources | nindent 14 }}
           livenessProbe:
             httpGet:
               path: /actuator/health/liveness

diff --git a/charts/steadybit-shopping-demo/values.yaml b/charts/steadybit-shopping-demo/values.yaml
@@ -9,6 +9,16 @@ gateway:
     name: steadybit/gateway
     # Container image tag
     tag: develop
+  # Container resources
+  resources:
+    requests:
+      memory: "128Mi"
+      cpu: "100m"
+      ephemeral-storage: "100Mi"
+    limits:
+      memory: "1024Mi"
+      cpu: "500m"
+      ephemeral-storage: "500Mi"
   # Number of gateway replicas
   replicaCount: 1
   # Ingress configuration
@@ -25,6 +35,16 @@ bestsellerFashion:
     name: steadybit/bestseller-fashion
     # Container image tag
     tag: develop
+  # Container resources
+  resources:
+    requests:
+      memory: "128Mi"
+      cpu: "100m"
+      ephemeral-storage: "100Mi"
+    limits:
+      memory: "1024Mi"
+      cpu: "500m"
+      ephemeral-storage: "500Mi"
   # Number of bestsellerFashion replicas
   replicaCount: 1
   # nodeSelector -- Node labels for pod assignment
@@ -35,6 +55,16 @@ bestsellerToys:
     name: steadybit/bestseller-toys
     # Container image tag
     tag: develop
+  # Container resources
+  resources:
+    requests:
+      memory: "128Mi"
+      cpu: "100m"
+      ephemeral-storage: "100Mi"
+    limits:
+      memory: "1024Mi"
+      cpu: "500m"
+      ephemeral-storage: "500Mi"
   # Number of bestsellerToys replicas
   replicaCount: 1
   # nodeSelector -- Node labels for pod assignment
@@ -45,6 +75,27 @@ hotDeals:
     name: steadybit/hot-deals
     # Container image tag
     tag: develop
+  # Container resources
+  resources:
+    requests:
+      memory: "128Mi"
+      cpu: "100m"
+      ephemeral-storage: "100Mi"
+    limits:
+      memory: "1024Mi"
+      cpu: "500m"
+      ephemeral-storage: "500Mi"
+  # Container nginx resources
+  nginx:
+    resources:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+        ephemeral-storage: "100Mi"
+      limits:
+        memory: "1024Mi"
+        cpu: "500m"
+        ephemeral-storage: "500Mi"
   # Number of hotDeals replicas
   replicaCount: 1
   # Enable podAffinity
@@ -62,6 +113,16 @@ inventory:
     name: steadybit/inventory
     # Container image tag
     tag: develop
+  # Container resources
+  resources:
+    requests:
+      memory: "128Mi"
+      cpu: "100m"
+      ephemeral-storage: "100Mi"
+    limits:
+      memory: "1024Mi"
+      cpu: "500m"
+      ephemeral-storage: "500Mi"
   # Number of inventory replicas
   replicaCount: 1
   # nodeSelector -- Node labels for pod assignment
@@ -72,6 +133,16 @@ activemq:
     name: symptoma/activemq
     # Container image tag
     tag: 5.18.3
+  # Container resources
+  resources:
+    requests:
+      memory: "128Mi"
+      cpu: "50m"
+      ephemeral-storage: "100Mi"
+    limits:
+      memory: "1024Mi"
+      cpu: "500m"
+      ephemeral-storage: "500Mi"
   # Number of activemq replicas
   replicaCount: 1
   # nodeSelector -- Node labels for pod assignment
@@ -82,6 +153,16 @@ checkout:
     name: steadybit/checkout
     # Container image tag
     tag: develop
+  # Container resources
+  resources:
+    requests:
+      memory: "128Mi"
+      cpu: "50m"
+      ephemeral-storage: "250Mi"
+    limits:
+      memory: "1024Mi"
+      cpu: "250m"
+      ephemeral-storage: "500Mi"
   # Number of checkout replicas
   replicaCount: 1
   # Enable horizontalPodAutoscaler
@@ -96,6 +177,16 @@ orders:
     name: steadybit/orders
     # Container image tag
     tag: develop
+  # Container resources
+  resources:
+    requests:
+      memory: "128Mi"
+      cpu: "50m"
+      ephemeral-storage: "250Mi"
+    limits:
+      memory: "1024Mi"
+      cpu: "500m"
+      ephemeral-storage: "500Mi"
   # Number of orders replicas
   replicaCount: 1
   # Enable podAffinity