Merge pull request #38 from sparkfabrik/task/service_ping_enabled

refs platform/1716: Enabled Service Ping - Email sender changed.

Author: paolomainardi

README.md

@@ -57,6 +57,7 @@ Then perform the following commands on the root folder:
 | gitlab\_enable\_omniauth | Choose whether to enable Gitlab Omniauth integration. Default to false. | `bool` | `false` | no |
 | gitlab\_enable\_registry | Choose whether to enable Gitlab Container registry. Default to false. | `bool` | `false` | no |
 | gitlab\_enable\_restore\_pv | Enable additional storage for TAR Restoration creation of any appreciable size | `bool` | `false` | no |
+| gitlab\_enable\_service\_ping | Enable Gitlab Service Ping | `bool` | `true` | 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 |

main.tf

@@ -560,6 +560,7 @@ locals {
       ENABLE_MIGRATIONS      = var.gitab_enable_migrations
       ENABLE_PROM_EXPORTER   = var.gitab_enable_prom_exporter
       GITALY_MAX_UNAVAILABLE = var.gitlab_gitaly_max_unavailable
+      ENABLE_SERVICE_PING    = var.gitlab_enable_service_ping
 
       #Bucket Names
       ARTIFACTS_BCKT    = google_storage_bucket.gitlab_bucket["artifacts"].name

values.yaml

@@ -48,7 +48,7 @@ global:
   ## Rails based portions of this chart share many settings
   appConfig:
     ## doc/charts/globals.md#general-application-settings
-    enableUsagePing: false
+    enableUsagePing: ${ENABLE_SERVICE_PING}
 
     ## https://docs.gitlab.com/charts/charts/globals#cron-jobs-related-settings
     cron_jobs: {}
@@ -118,8 +118,11 @@ global:
       secret: gitlab-smtp-secret
       key: password
     starttls_auto: true
-    email:
-      from: ${SMTP_USER}
+
+  ## GLOBAL Outgoing email server settings
+  email:
+    from: ${SMTP_USER}
+    reply_to: ${SMTP_USER}
 
   ## Timezone for containers.
   time_zone: ${TIMEZONE}

variables.tf

@@ -493,6 +493,12 @@ variable "gitab_enable_prom_exporter" {
   default     = false
 }
 
+variable "gitlab_enable_service_ping" {
+  type        = bool
+  description = "Enable Gitlab Service Ping"
+  default     = true
+}
+
 # Peformance optimization. Max and min pod replicas for HPA.
 variable "gitlab_hpa_min_replicas_registry" {
   type        = number