Split the affinities for each workload

harshakrithvikk · Nov 9, 2022 · 643ce37 · 643ce37
1 parent 81deed0
commit 643ce37
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 47 deletions.
diff --git a/K8s/helm/templates/cart-deployment.yaml b/K8s/helm/templates/cart-deployment.yaml
@@ -36,15 +36,15 @@ spec:
           requests:
             cpu: 100m
             memory: 50Mi
-      {{- with .Values.affinity }}
+      {{- with .Values.cart.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.cart.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.cart.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/catalogue-deployment.yaml b/K8s/helm/templates/catalogue-deployment.yaml
@@ -36,15 +36,15 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.catalogue.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.catalogue.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.catalogue.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/dispatch-deployment.yaml b/K8s/helm/templates/dispatch-deployment.yaml
@@ -35,15 +35,15 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.dispatch.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.dispatch.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.dispatch.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/mongodb-deployment.yaml b/K8s/helm/templates/mongodb-deployment.yaml
@@ -31,15 +31,15 @@ spec:
             cpu: 100m
             memory: 100Mi
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.mongodb.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.mongodb.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.mongodb.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/mysql-deployment.yaml b/K8s/helm/templates/mysql-deployment.yaml
@@ -35,15 +35,15 @@ spec:
             cpu: 100m
             memory: 700Mi
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.mysql.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.mysql.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.mysql.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/payment-deployment.yaml b/K8s/helm/templates/payment-deployment.yaml
@@ -44,15 +44,15 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.payment.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.payment.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.payment.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/rabbitmq-deployment.yaml b/K8s/helm/templates/rabbitmq-deployment.yaml
@@ -32,15 +32,15 @@ spec:
             cpu: 100m
             memory: 256Mi
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.rabbitmq.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.rabbitmq.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.rabbitmq.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/ratings-deployment.yaml b/K8s/helm/templates/ratings-deployment.yaml
@@ -39,15 +39,15 @@ spec:
           failureThreshold: 30
           successThreshold: 1
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.ratings.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.ratings.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.ratings.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/redis-statefulset.yaml b/K8s/helm/templates/redis-statefulset.yaml
@@ -35,15 +35,15 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.redis.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.redis.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.redis.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}

diff --git a/K8s/helm/templates/shipping-deployment.yaml b/K8s/helm/templates/shipping-deployment.yaml
@@ -40,15 +40,15 @@ spec:
           failureThreshold: 30
           successThreshold: 1
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.shipping.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.shipping.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.shipping.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/user-deployment.yaml b/K8s/helm/templates/user-deployment.yaml
@@ -37,15 +37,15 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.user.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.user.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.user.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/templates/web-deployment.yaml b/K8s/helm/templates/web-deployment.yaml
@@ -38,15 +38,15 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-      {{- with .Values.affinity }}
+      {{- with .Values.web.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.web.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.web.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/K8s/helm/values.yaml b/K8s/helm/values.yaml
@@ -5,12 +5,6 @@ image:
   version: latest
   pullPolicy: IfNotPresent
 
-# Alternative payment gateway URL
-# Default is https://www.paypal.com
-payment:
-  gateway: null
-  #gateway: https://www.worldpay.com
-
 # EUM configuration
 # Provide your key and set the endpoint
 eum:
@@ -28,14 +22,70 @@ nodeport: false
 # "special" Openshift. Set to true when deploying to any openshift flavour
 openshift: false
 
-# Storage class to use with redis statefulset.
+ocCreateRoute: false
+
+payment:
+  # Alternative payment gateway URL
+  # Default is https://www.paypal.com
+  gateway: null
+  #gateway: https://www.worldpay.com
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+
 redis:
+  # Storage class to use with redis statefulset.
   storageClassName: standard
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
 
-ocCreateRoute: false
+cart:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+
+catalogue:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+
+dispatch:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+
+mongodb:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+
+mysql:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+
+rabbitmq:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+
+ratings:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
 
-affinity: {}
+shipping:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
 
-nodeSelector: {}
+user:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
 
-tolerations: []
+web:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []