chore: remove hardcoded node affinity (#131)

juspay · Feb 6, 2025 · 3b95a74 · 3b95a74
1 parent 0ebe932
commit 3b95a74
Show file tree

Hide file tree

Showing 19 changed files with 755 additions and 870 deletions.
diff --git a/charts/incubator/hyperswitch-app/README.md b/charts/incubator/hyperswitch-app/README.md
diff --git a/charts/incubator/hyperswitch-app/README.md.gotmpl b/charts/incubator/hyperswitch-app/README.md.gotmpl
@@ -23,7 +23,6 @@ cd hyperswitch-helm/charts/incubator/hyperswitch-stack
 Before installing the service make sure you labels your kubernetes nodes and create a namespace `hyperswitch`
 Note: minimum --memory 6000 --cpus 4 needed
 ```bash
-kubectl label nodes <your-node-name> node-type=generic-compute
 kubectl create namespace hyperswitch
 ```
 Use below command to install hyperswitch services with above configs

diff --git a/charts/incubator/hyperswitch-app/values.yaml b/charts/incubator/hyperswitch-app/values.yaml
@@ -49,15 +49,7 @@ application:
     tolerations: []
     # Specify affinity for nodes to which the pods should start on
     # @ignored
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-type
-                  operator: In
-                  values:
-                    - generic-compute
+    affinity: {}
     # nodeSelector to be used by the application
     nodeSelector: {}
     # -- The time kubernetes will wait after sending the termination signal to the pods
@@ -128,15 +120,7 @@ application:
       timeoutSeconds: 1
     # Specify affinity for nodes to which the pods should start on
     # @ignored
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-type
-                  operator: In
-                  values:
-                    - generic-compute
+    affinity: {}
     # -- The time kubernetes will wait after sending the termination signal to the pods
     terminationGracePeriodSeconds: 30
     # -- Annotations that are to be added to the pods (extends global configuration)
@@ -613,15 +597,7 @@ application:
       type: RollingUpdate
     # Specify affinity for nodes to which the pods should start on
     # @ignored
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-type
-                  operator: In
-                  values:
-                    - generic-compute
+    affinity: {}
     # -- The time kubernetes will wait after sending the termination signal to the pods
     # @ignored
     terminationGracePeriodSeconds: 30
@@ -658,15 +634,7 @@ application:
       type: RollingUpdate
     # -- Specify affinity for nodes to which the pods should start on
     # @ignored
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-type
-                  operator: In
-                  values:
-                    - generic-compute
+    affinity: {}
     # -- The time kubernetes will wait after sending the termination signal to the pods
     terminationGracePeriodSeconds: 30
     # -- Annotations that are to be added to the pods (extends global configuration)
@@ -700,15 +668,7 @@ application:
       type: RollingUpdate
     # -- Specify affinity for nodes to which the pods should start on
     # @ignored
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-type
-                  operator: In
-                  values:
-                    - generic-compute
+    affinity: {}
     # -- The time kubernetes will wait after sending the termination signal to the pods
     # @ignored
     terminationGracePeriodSeconds: 30

diff --git a/charts/incubator/hyperswitch-card-vault/README.md b/charts/incubator/hyperswitch-card-vault/README.md
@@ -20,9 +20,7 @@ A Helm chart for creating Hyperswitch Card Vault
 | external.postgresql.config.port | string | `nil` |  |
 | external.postgresql.config.username | string | `nil` |  |
 | external.postgresql.enabled | bool | `false` |  |
-| global.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"node-type"` |  |
-| global.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator | string | `"In"` |  |
-| global.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0] | string | `"generic-compute"` |  |
+| global.affinity | object | `{}` |  |
 | global.annotations | object | `{}` |  |
 | global.tolerations | list | `[]` |  |
 | initDB.checkPGisUp.image | string | `"postgres:16-alpine3.19"` |  |
@@ -38,9 +36,7 @@ A Helm chart for creating Hyperswitch Card Vault
 | postgresql.primary.name | string | `""` |  |
 | postgresql.primary.resources.requests.cpu | string | `"100m"` |  |
 | postgresql.primary.tolerations | list | `[]` |  |
-| server.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"node-type"` |  |
-| server.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator | string | `"In"` |  |
-| server.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0] | string | `"generic-compute"` |  |
+| server.affinity | object | `{}` |  |
 | server.annotations | object | `{}` |  |
 | server.extra.env | object | `{}` |  |
 | server.image | string | `"juspaydotin/hyperswitch-card-vault:v0.4.0"` |  |

diff --git a/charts/incubator/hyperswitch-card-vault/values.yaml b/charts/incubator/hyperswitch-card-vault/values.yaml
@@ -5,15 +5,7 @@ global:
   tolerations: []
 
   # Node affinity to be added to all resources
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-                - key: node-type
-                  operator: In
-                  values:
-                    - generic-compute
+  affinity: {}
 
 
 # Values for hyperswitch-card-vault.
@@ -30,15 +22,7 @@ server:
     annotations: {}
 
   # Node affinity to be added to hyperswitch-card-vault.
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-                - key: node-type
-                  operator: In
-                  values:
-                    - generic-compute
+  affinity: {}
       # matchExpression:
       # - key: spot-instance
       #   operator: NotIn

diff --git a/charts/incubator/hyperswitch-keymanager/README.md b/charts/incubator/hyperswitch-keymanager/README.md
@@ -15,9 +15,7 @@ A Helm chart for deploying Hyperswitch Keymanager
 | external.postgresql.config.port | string | `nil` |  |
 | external.postgresql.config.username | string | `nil` |  |
 | external.postgresql.enabled | bool | `false` |  |
-| global.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"node-type"` |  |
-| global.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator | string | `"In"` |  |
-| global.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0] | string | `"generic-compute"` |  |
+| global.affinity | object | `{}` |  |
 | global.annotations | object | `{}` |  |
 | global.image | string | `"juspaydotin/hyperswitch-encryption-service:v0.1.3"` |  |
 | initDB.checkPGisUp.image | string | `"postgres:16-alpine3.19"` |  |

diff --git a/charts/incubator/hyperswitch-keymanager/values.yaml b/charts/incubator/hyperswitch-keymanager/values.yaml
@@ -7,15 +7,7 @@ replicaCount: 1
 global:
   image: juspaydotin/hyperswitch-encryption-service:v0.1.3
   annotations: {}
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-        - matchExpressions:
-          - key: node-type
-            operator: In
-            values:
-            - generic-compute
+  affinity: {}
 
 autoscaling:
   enabled: false