Merge pull request #586 from mojaloop/fix/calico

improve Redis topologySpreadConstraints to be zone aware

Author: kalinkrustev

terraform/gitlab/ci-templates/k8s-cluster/.gitlab-ci.yml

@@ -183,6 +183,9 @@ deploy-infra:
     when: always
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TITLE =~ /^deploy-infra:.*/
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TITLE == "update generated configs to project"
+      when: manual
+      allow_failure: true
     - when: manual
 
 deploy-managed-srvcs:
@@ -212,7 +215,12 @@ refresh-templates:
   script:
     - !reference [.source, script]
     - .gitlab/scripts/refresh-repo.sh $cluster_name $TMP_GIT_REPO $TMP_TEMPLATES_DIR $GITLAB_CI_PAT $iac_terraform_modules_tag
-  when: manual
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TITLE =~ /^refresh:.*/
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TITLE == "update generated configs to project"
+      when: manual
+      allow_failure: true
+    - when: manual
 
 destroy:
   extends: .terraform:destroy
@@ -253,6 +261,9 @@ refresh-deploy-infra:
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TITLE =~ /^deploy:.*/
     - if: $CI_PIPELINE_TRIGGERED && $CI_PIPELINE_SOURCE == "trigger" && $CD_UPDATE_PROFILE
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TITLE == "update generated configs to project"
+      when: manual
+      allow_failure: true
     - when: manual
 
 tf-refresh-deploy-infra:
@@ -276,6 +287,9 @@ tf-refresh-deploy-infra:
     when: always
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TITLE =~ /^tf_trigger.*/
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TITLE == "update generated configs to project"
+      when: manual
+      allow_failure: true
     - when: manual
 
 lint-apps:

terraform/gitops/k8s-cluster-config/base-utils.tf

@@ -14,6 +14,9 @@ module "generate_reflector_files" {
     velero_credentials_secret              = "velero-s3-credentials"
     velero_bsl_credentials_secret          = "velerobsl-s3-credentials"
     external_secret_sync_wave              = var.external_secret_sync_wave
+    cloud_platform                        = local.cloud_platform
+    k8s_cluster_type                      = local.k8s_cluster_type
+    cluster                               = var.app_var_map.cluster
 
   }
   file_list       = [for f in fileset(local.base_utils_template_path, "**/*.tpl") : trimsuffix(f, ".tpl") if !can(regex(local.base_utils_app_file, f))]

terraform/gitops/stateful-resources/templates/stateful-resources/redis/redis-cluster.yaml.tpl

@@ -78,6 +78,21 @@ spec:
                       - follower
               topologyKey: kubernetes.io/hostname
             weight: 10
+    topologySpreadConstraints:
+      - maxSkew: 1
+        topologyKey: kubernetes.io/hostname
+        whenUnsatisfiable: ScheduleAnyway
+        labelSelector:
+          matchLabels:
+            role: leader
+            clusterId: redis-cluster
+      - maxSkew: 1
+        topologyKey: topology.kubernetes.io/zone
+        whenUnsatisfiable: ScheduleAnyway
+        labelSelector:
+          matchLabels:
+            role: leader
+            clusterId: redis-cluster
   redisFollower:
     readinessProbe:
       failureThreshold: 5
@@ -124,6 +139,21 @@ spec:
                       - leader
               topologyKey: kubernetes.io/hostname
             weight: 10
+    topologySpreadConstraints:
+      - maxSkew: 1
+        topologyKey: kubernetes.io/hostname
+        whenUnsatisfiable: ScheduleAnyway
+        labelSelector:
+          matchLabels:
+            role: follower
+            clusterId: redis-cluster
+      - maxSkew: 1
+        topologyKey: topology.kubernetes.io/zone
+        whenUnsatisfiable: ScheduleAnyway
+        labelSelector:
+          matchLabels:
+            role: follower
+            clusterId: redis-cluster
 # %{ endif }
   redisExporter:
     enabled: false