Merge pull request #37 from sparkfabrik/task/pdb

refs platform/1731: Gitaly PDB MaxUnavailable

Author: Monska85

README.md

@@ -59,6 +59,7 @@ Then perform the following commands on the root folder:
 | gitlab\_enable\_restore\_pv | Enable additional storage for TAR Restoration creation of any appreciable size | `bool` | `false` | no |
 | gitlab\_enable\_smtp | Setup Gitlab email address to send email. | `bool` | `false` | no |
 | gitlab\_gitaly\_disk\_size | Setup persistent disk size for gitaly data in GB. Default 100 GB | `number` | `100` | no |
+| gitlab\_gitaly\_max\_unavailable | For PodDisruptionBudget, how many pods can be unavailable at one time for Gitaly StatefulSet | `number` | `0` | no |
 | gitlab\_hpa\_max\_replicas\_kas | Set the maximum hpa pod replicas for the Gitlab Kas. | `number` | `10` | no |
 | gitlab\_hpa\_max\_replicas\_registry | Set the maximum hpa pod replicas for the Gitlab Registry. | `number` | `10` | no |
 | gitlab\_hpa\_max\_replicas\_shell | Set the maximum hpa pod replicas for the Gitlab Shell. | `number` | `10` | no |

main.tf

@@ -528,37 +528,38 @@ locals {
   gitlab_release_helm_values = templatefile(
     "${path.module}/values.yaml",
     {
-      DOMAIN                = local.domain
-      INGRESS_IP            = local.gitlab_address
-      DB_PRIVATE_IP         = google_sql_database_instance.gitlab_db.private_ip_address
-      REDIS_PRIVATE_IP      = google_redis_instance.gitlab.host
-      PROJECT_ID            = var.project_id
-      ENABLE_CERT_MANAGER   = var.gitlab_enable_certmanager
-      CERT_MANAGER_EMAIL    = var.certmanager_email
-      INSTALL_RUNNER        = var.gitlab_install_runner
-      INSTALL_INGRESS_NGINX = var.gitlab_install_ingress_nginx
-      INSTALL_PROMETHEUS    = var.gitlab_install_prometheus
-      INSTALL_GRAFANA       = var.gitlab_install_grafana
-      INSTALL_KAS           = var.gitlab_install_kas
-      ENABLE_REGISTRY       = var.gitlab_enable_registry
-      ENABLE_CRON_BACKUP    = var.gitlab_enable_cron_backup
-      SCHEDULE_CRON_BACKUP  = var.gitlab_schedule_cron_backup
-      GITALY_PV_SIZE        = var.gitlab_gitaly_disk_size
-      PV_STORAGE_CLASS      = var.gke_storage_class
-      ENABLE_SMTP           = var.gitlab_enable_smtp
-      SMTP_USER             = local.gitlab_smtp_user
-      BACKUP_EXTRA          = var.gitlab_backup_extra_args
-      TIMEZONE              = var.gitlab_time_zone
-      ENABLE_OMNIAUTH       = var.gitlab_enable_omniauth
-      ENABLE_BACKUP_PV      = var.gitlab_enable_backup_pv
-      BACKUP_PV_SIZE        = var.gitlab_backup_pv_size
-      ENABLE_RESTORE_PV     = var.gitlab_enable_restore_pv
-      RESTORE_PV_SIZE       = var.gitlab_restore_pv_size
-      BACKUP_PV_SC          = var.gke_sc_gitlab_backup_disk
-      RESTORE_PV_SC         = var.gke_sc_gitlab_restore_disk
-      PV_MATCH_LABEL        = var.gke_gitaly_pv_labels
-      ENABLE_MIGRATIONS     = var.gitab_enable_migrations
-      ENABLE_PROM_EXPORTER  = var.gitab_enable_prom_exporter
+      DOMAIN                 = local.domain
+      INGRESS_IP             = local.gitlab_address
+      DB_PRIVATE_IP          = google_sql_database_instance.gitlab_db.private_ip_address
+      REDIS_PRIVATE_IP       = google_redis_instance.gitlab.host
+      PROJECT_ID             = var.project_id
+      ENABLE_CERT_MANAGER    = var.gitlab_enable_certmanager
+      CERT_MANAGER_EMAIL     = var.certmanager_email
+      INSTALL_RUNNER         = var.gitlab_install_runner
+      INSTALL_INGRESS_NGINX  = var.gitlab_install_ingress_nginx
+      INSTALL_PROMETHEUS     = var.gitlab_install_prometheus
+      INSTALL_GRAFANA        = var.gitlab_install_grafana
+      INSTALL_KAS            = var.gitlab_install_kas
+      ENABLE_REGISTRY        = var.gitlab_enable_registry
+      ENABLE_CRON_BACKUP     = var.gitlab_enable_cron_backup
+      SCHEDULE_CRON_BACKUP   = var.gitlab_schedule_cron_backup
+      GITALY_PV_SIZE         = var.gitlab_gitaly_disk_size
+      PV_STORAGE_CLASS       = var.gke_storage_class
+      ENABLE_SMTP            = var.gitlab_enable_smtp
+      SMTP_USER              = local.gitlab_smtp_user
+      BACKUP_EXTRA           = var.gitlab_backup_extra_args
+      TIMEZONE               = var.gitlab_time_zone
+      ENABLE_OMNIAUTH        = var.gitlab_enable_omniauth
+      ENABLE_BACKUP_PV       = var.gitlab_enable_backup_pv
+      BACKUP_PV_SIZE         = var.gitlab_backup_pv_size
+      ENABLE_RESTORE_PV      = var.gitlab_enable_restore_pv
+      RESTORE_PV_SIZE        = var.gitlab_restore_pv_size
+      BACKUP_PV_SC           = var.gke_sc_gitlab_backup_disk
+      RESTORE_PV_SC          = var.gke_sc_gitlab_restore_disk
+      PV_MATCH_LABEL         = var.gke_gitaly_pv_labels
+      ENABLE_MIGRATIONS      = var.gitab_enable_migrations
+      ENABLE_PROM_EXPORTER   = var.gitab_enable_prom_exporter
+      GITALY_MAX_UNAVAILABLE = var.gitlab_gitaly_max_unavailable
 
       #Bucket Names
       ARTIFACTS_BCKT    = google_storage_bucket.gitlab_bucket["artifacts"].name

values.yaml

@@ -244,6 +244,7 @@ gitlab:
       size: "${RESTORE_PV_SIZE}Gi"
   ## https://docs.gitlab.com/charts/charts/gitlab/gitaly
   gitaly:
+    maxUnavailable: ${GITALY_MAX_UNAVAILABLE}
     persistence:
       size: "${GITALY_PV_SIZE}Gi"
       storageClass: ${PV_STORAGE_CLASS}

variables.tf

@@ -565,3 +565,9 @@ variable "gitlab_monitoring_allowed_cidrs" {
   description = "Set the list of the allowed CIDRs for the Gitlab monitoring paths (readiness, liveness and metrics)."
   default     = []
 }
+
+variable "gitlab_gitaly_max_unavailable" {
+  type        = number
+  description = "For PodDisruptionBudget, how many pods can be unavailable at one time for Gitaly StatefulSet"
+  default     = 0
+}