refactor gitlab chart

Author: slamdev

charts/gitlab-omnibus/Chart.yaml

@@ -3,7 +3,7 @@ name: gitlab-omnibus
 description: |-
   Helm chart to deploy [Omnibus Gitlab](https://docs.gitlab.com/omnibus/).
 type: application
-version: 0.1.0
+version: 0.1.1
 # https://hub.docker.com/r/gitlab/gitlab-ee/tags
 appVersion: "15.2.1-ee.0"
 home: https://github.com/slamdev/helm-charts/tree/master/charts/gitlab-omnibus

charts/gitlab-omnibus/README.md

@@ -1,6 +1,6 @@
 # gitlab-omnibus
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 15.2.1-ee.0](https://img.shields.io/badge/AppVersion-15.2.1--ee.0-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 15.2.1-ee.0](https://img.shields.io/badge/AppVersion-15.2.1--ee.0-informational?style=flat-square)
 
 Helm chart to deploy [Omnibus Gitlab](https://docs.gitlab.com/omnibus/).
 
@@ -24,6 +24,7 @@ Helm chart to deploy [Omnibus Gitlab](https://docs.gitlab.com/omnibus/).
 | backupCronJob.resources | object | `{"requests":{"cpu":"10m","memory":"32Mi"}}` | custom resource configuration |
 | backupCronJob.schedule | string | `"@daily"` | how often to run backaup job |
 | containerPorts | list | `[{"containerPort":8005,"name":"http"},{"containerPort":22,"name":"ssh"}]` | ports exposed by the container |
+| disableProbes | bool | `false` | flag to disable livenessProbe/readinessProbe/startupProbe probes; turn on before restoring from backup |
 | env | list | `[]` | environment variables for the container |
 | envFrom | list | `[]` | environment variable sources for the container |
 | fullnameOverride | string | `""` | full name of the chart. |
@@ -36,6 +37,7 @@ Helm chart to deploy [Omnibus Gitlab](https://docs.gitlab.com/omnibus/).
 | nameOverride | string | `""` | override name of the chart |
 | nodeSelector | object | `{}` | node for scheduler pod assignment |
 | podSecurityContext | object | `{}` | specifies security settings for a pod |
+| postReconfigureCode | string | `""` | ruby code block for GITLAB_POST_RECONFIGURE_CODE |
 | resources | object | `{}` | custom resource configuration |
 | securityContext | object | `{}` | specifies security settings for a container |
 | service.annotations | object | `{}` | service annotations |

charts/gitlab-omnibus/templates/statefulset.yaml

@@ -35,6 +35,7 @@ spec:
           ports:
             {{- toYaml . | nindent 12 }}
         {{- end }}
+        {{- if not .Values.disableProbes }}
           livenessProbe:
             httpGet:
               path: /-/liveness?token={{.Values.healthCheckToken}}
@@ -50,6 +51,7 @@ spec:
             httpGet:
               path: /-/readiness?token={{.Values.healthCheckToken}}
               port: http
+        {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
@@ -59,6 +61,7 @@ spec:
               value: |
                 include Gitlab::CurrentSettings
                 Gitlab::CurrentSettings.current_application_settings.update_attribute(:health_check_access_token, '{{.Values.healthCheckToken}}')
+                {{- .Values.postReconfigureCode | nindent 16 }}
             - name: GITLAB_POST_RECONFIGURE_SCRIPT
               value: |
                 /opt/gitlab/bin/gitlab-rails runner -e production "$GITLAB_POST_RECONFIGURE_CODE"

charts/gitlab-omnibus/values.yaml

@@ -124,9 +124,15 @@ volumeClaimTemplates: []
 #        requests:
 #          storage: 1Gi
 
+# disableProbes -- flag to disable livenessProbe/readinessProbe/startupProbe probes; turn on before restoring from backup
+disableProbes: false
+
 # healthCheckToken -- predefined health check token for status probes; should be changed to a random value
 healthCheckToken: CHANGE_ME
 
+# postReconfigureCode -- ruby code block for GITLAB_POST_RECONFIGURE_CODE
+postReconfigureCode: ""
+
 # env -- environment variables for the container
 env: []
 #  - name: PG_USER