Update redis deployment to match core components and set top-level affinity to be consistent

Author: nikki-t

airflow/helm/values.tmpl.yaml

@@ -56,10 +56,10 @@ affinity:
           values: ["on-demand"]
         - key: "karpenter.k8s.aws/instance-family"
           operator: "In"
-          values: ["c6i", "c5"]
+          values: ["r5"]
         - key: "karpenter.k8s.aws/instance-cpu"
           operator: "In"
-          values: ["2", "4"]
+          values: ["8"]
 
 topologySpreadConstraints:
 - maxSkew: 1

terraform-unity/modules/terraform-unity-sps-ogc-processes-api/main.tf

@@ -17,6 +17,34 @@ resource "kubernetes_deployment" "redis" {
         }
       }
       spec {
+        affinity {
+          node_affinity {
+            required_during_scheduling_ignored_during_execution {
+              node_selector_term {
+                match_expressions {
+                  key      = "karpenter.sh/nodepool"
+                  operator = "In"
+                  values   = compact([for pool in var.karpenter_node_pools : pool if pool == "airflow-core-components"])
+                }
+                match_expressions {
+                  key      = "karpenter.sh/capacity-type"
+                  operator = "In"
+                  values   = ["on-demand"]
+                }
+                match_expressions {
+                  key      = "karpenter.k8s.aws/instance-family"
+                  operator = "In"
+                  values   = ["r5"]
+                }
+                match_expressions {
+                  key      = "karpenter.k8s.aws/instance-cpu"
+                  operator = "In"
+                  values   = ["8"]
+                }
+              }
+            }
+          }
+        }
         container {
           name  = "redis"
           image = "${var.docker_images.redis.name}:${var.docker_images.redis.tag}"