From cdd3ea6ab0fcc3710ff60694f43254361d69fd7e Mon Sep 17 00:00:00 2001 From: Dmitry Makovey Date: Mon, 17 May 2021 15:32:36 -0600 Subject: [PATCH 1/4] remove unicorn traces from webservice Changelog: removed --- charts/gitlab/charts/webservice/Chart.yaml | 2 -- charts/gitlab/charts/webservice/templates/_datamodel.tpl | 2 -- .../gitlab/charts/webservice/templates/deployment.yaml | 9 --------- charts/gitlab/charts/webservice/values.yaml | 5 ----- 4 files changed, 18 deletions(-) diff --git a/charts/gitlab/charts/webservice/Chart.yaml b/charts/gitlab/charts/webservice/Chart.yaml index 2d734bf453..1c5de38c5d 100644 --- a/charts/gitlab/charts/webservice/Chart.yaml +++ b/charts/gitlab/charts/webservice/Chart.yaml @@ -7,13 +7,11 @@ description: HTTP server for Gitlab keywords: - gitlab - webservice -- unicorn - puma home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/webservice -- https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-unicorn - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitlab-puma maintainers: - name: GitLab Inc. diff --git a/charts/gitlab/charts/webservice/templates/_datamodel.tpl b/charts/gitlab/charts/webservice/templates/_datamodel.tpl index e6246d4a49..9fecaea34e 100644 --- a/charts/gitlab/charts/webservice/templates/_datamodel.tpl +++ b/charts/gitlab/charts/webservice/templates/_datamodel.tpl @@ -96,8 +96,6 @@ resources: # resources for `webservice` container {{- .Values.resources | toYaml | nindent 2 }} workhorse: {{- .Values.workhorse | toYaml | nindent 2 }} -unicorn: - {{- .Values.unicorn | toYaml | nindent 2 }} extraEnv: {{- .Values.extraEnv | toYaml | nindent 2 }} puma: diff --git a/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/charts/webservice/templates/deployment.yaml index ac8dc7f47f..fc7fe3515c 100644 --- a/charts/gitlab/charts/webservice/templates/deployment.yaml +++ b/charts/gitlab/charts/webservice/templates/deployment.yaml @@ -212,11 +212,6 @@ spec: value: "{{ .puma.workerMaxMemory }}" - name: DISABLE_PUMA_WORKER_KILLER value: "{{ .puma.disableWorkerKiller }}" - {{- else }} - - name: UNICORN_MEMORY_MIN - value: "{{ .unicorn.memory.min }}" - - name: UNICORN_MEMORY_MAX - value: "{{ .unicorn.memory.max }}" {{- end }} - name: SHUTDOWN_BLACKOUT_SECONDS value: "{{ .shutdown.blackoutSeconds }}" @@ -279,11 +274,7 @@ spec: lifecycle: preStop: exec: - {{- if eq (lower $.Values.webServer) "unicorn" }} - command: ["/bin/bash", "-c", "pkill -SIGQUIT -f 'unicorn master'"] - {{- else }} command: ["/bin/bash", "-c", "pkill -SIGINT -o ruby"] - {{- end }} resources: {{- toYaml .resources | nindent 12 }} - name: gitlab-workhorse diff --git a/charts/gitlab/charts/webservice/values.yaml b/charts/gitlab/charts/webservice/values.yaml index 9e7afc1433..c12ffd668b 100644 --- a/charts/gitlab/charts/webservice/values.yaml +++ b/charts/gitlab/charts/webservice/values.yaml @@ -85,11 +85,6 @@ ingress: workerProcesses: 2 -unicorn: - memory: # in MB units - min: 1024 - max: 1280 - puma: workerMaxMemory: 1024 # in MB units threads: -- GitLab From de77f511d988024a635b1972b1c00826dddd539e Mon Sep 17 00:00:00 2001 From: Dmitry Makovey Date: Wed, 19 May 2021 11:24:47 -0600 Subject: [PATCH 2/4] remove Unicorn references outside of 'webservice' Changelog: removed --- .../external-db/external-omnibus-psql.md | 1 - .../external-redis/external-omnibus-redis.md | 1 - doc/advanced/geo/index.md | 2 -- doc/charts/gitlab/webservice/index.md | 18 +----------- doc/development/checkconfig.md | 4 +-- doc/development/deprecations.md | 8 ++--- doc/installation/command-line-options.md | 2 +- spec/integration/check_config_spec.rb | 29 ------------------- 8 files changed, 8 insertions(+), 57 deletions(-) diff --git a/doc/advanced/external-db/external-omnibus-psql.md b/doc/advanced/external-db/external-omnibus-psql.md index 83ccd543aa..b8eb348621 100644 --- a/doc/advanced/external-db/external-omnibus-psql.md +++ b/doc/advanced/external-db/external-omnibus-psql.md @@ -53,7 +53,6 @@ gitlab_rails['db_password'] = "DB_PASSSWORD" ## Disable everything else sidekiq['enable'] = false -unicorn['enable'] = false puma['enable'] = false registry['enable'] = false gitaly['enable'] = false diff --git a/doc/advanced/external-redis/external-omnibus-redis.md b/doc/advanced/external-redis/external-omnibus-redis.md index f5e5af0c18..9b68d999a7 100644 --- a/doc/advanced/external-redis/external-omnibus-redis.md +++ b/doc/advanced/external-redis/external-omnibus-redis.md @@ -39,7 +39,6 @@ redis['password'] = 'REDIS_PASSWORD' ## Disable everything else gitlab_rails['enable'] = false sidekiq['enable'] = false -unicorn['enable'] = false registry['enable'] = false gitaly['enable'] = false gitlab_workhorse['enable'] = false diff --git a/doc/advanced/geo/index.md b/doc/advanced/geo/index.md index 4f5176e47a..e07dc95862 100644 --- a/doc/advanced/geo/index.md +++ b/doc/advanced/geo/index.md @@ -141,7 +141,6 @@ gitlab_rails['geo_node_name'] = 'gitlab-primary.example.com' gitlab_rails['auto_migrate'] = false ## turn off everything but the DB sidekiq['enable']=false -unicorn['enable']=false puma['enable']=false gitlab_workhorse['enable']=false nginx['enable']=false @@ -331,7 +330,6 @@ gitlab_rails['auto_migrate'] = false geo_secondary['auto_migrate'] = false ## turn off everything but the DB sidekiq['enable']=false -unicorn['enable']=false puma['enable']=false gitlab_workhorse['enable']=false nginx['enable']=false diff --git a/doc/charts/gitlab/webservice/index.md b/doc/charts/gitlab/webservice/index.md index b87bdf0dac..091f1181c1 100644 --- a/doc/charts/gitlab/webservice/index.md +++ b/doc/charts/gitlab/webservice/index.md @@ -62,8 +62,6 @@ to the `helm install` command using the `--set` flags. | `image.tag` | | Webservice image tag | | `init.image.repository` | | initContainer image | | `init.image.tag` | | initContainer image tag | -| `unicorn.memory.min` | `1024` | The minimum memory threshold (in megabytes) for the Unicorn worker killer | -| `unicorn.memory.max` | `1280` | The maximum memory threshold (in megabytes) for the Unicorn worker killer | | `metrics.enabled` | `true` | Toggle Prometheus metrics exporter | | `minio.bucket` | `git-lfs` | Name of storage bucket, when using MinIO | | `minio.port` | `9000` | Port for MinIO service | @@ -273,8 +271,6 @@ deployments: # inherits `resources` workhorse: # map # inherits `workhorse` - unicorn: # map - # inherits `unicorn` extraEnv: # # inherits `extraEnv` puma: # map @@ -366,16 +362,6 @@ you can set the body size with either of the following two parameters too: ## Resources -### Unicorn Worker Killer memory settings - -Memory thresholds for the [unicorn-worker-killer](https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer) -can be customized using the `unicorn.memory.min` and `unicorn.memory.max` chart values. While the -default values are sane, you can increase (or lower) these values to fine-tune -them for your environment or troubleshoot performance issues. - -NOTE: -These settings are effective on a _per process basis_, not for an entire Pod. - ### Memory requests/limits Each pod spawns an amount of workers equal to `workerProcesses`, who each use @@ -505,9 +491,7 @@ shell: ### WebServer options -Current version of chart supports both Unicorn and Puma web servers. -Puma is the default, however you can switch to the Unicorn -server by setting `webServer: unicorn` +Current version of chart supports Puma web server. Puma unique options: diff --git a/doc/development/checkconfig.md b/doc/development/checkconfig.md index 3a6ee59019..5175a59f7e 100644 --- a/doc/development/checkconfig.md +++ b/doc/development/checkconfig.md @@ -37,8 +37,8 @@ chart: ``` - The `if` statement preceding the message _should not_ trim the newline after it. (`}}` not `-}}`) This ensures the formatting and readability for the user. -- The message should declare which chart, relative to the global chart, that is affected. This helps the user understand where the property came from in the charts, and configuration properties. Example: `gitlab.unicorn`, `minio`, `registry`. -- The message should inform the user of the properties that cause the failure, and what action should be taken. Name the property relative to the affected chart(s). For example, `gitlab.unicorn.minio.enabled` would be referenced as `minio.enabled` because the chart affected by the deprecation is `gitlab.unicorn`. If more than one chart are affected, use complete property names. +- The message should declare which chart, relative to the global chart, that is affected. This helps the user understand where the property came from in the charts, and configuration properties. Example: `gitlab.puma`, `minio`, `registry`. +- The message should inform the user of the properties that cause the failure, and what action should be taken. Name the property relative to the affected chart(s). For example, `gitlab.puma.minio.enabled` would be referenced as `minio.enabled` because the chart affected by the deprecation is `gitlab.puma`. If more than one chart are affected, use complete property names. - The message _should not_ contain hard line breaks to wrap paragraphs. This is because the message may interpolate configuration values, and those will break the hard wrapping. Example message: diff --git a/doc/development/deprecations.md b/doc/development/deprecations.md index d3b4a5c5f3..67e84e4184 100644 --- a/doc/development/deprecations.md +++ b/doc/development/deprecations.md @@ -37,15 +37,15 @@ chart: ``` - The `if` statement preceding the message _should not_ trim the newline after it. (`}}` not `-}}`) This ensures the formatting and readability for the user. -- The message should declare which chart, relative to the global chart, that is affected. This helps the user understand where the property came from in the charts, and configuration properties. Example: `gitlab.unicorn`, `minio`, `registry`. -- The message should inform the user of the property that has been altered / relocated / deprecated, and what action should be taken. Name the property relative to the affected chart. For example, `gitlab.unicorn.minio.enabled` would be referenced as `minio.enabled` because the chart affected by the deprecation is `gitlab.unicorn`. +- The message should declare which chart, relative to the global chart, that is affected. This helps the user understand where the property came from in the charts, and configuration properties. Example: `gitlab.puma`, `minio`, `registry`. +- The message should inform the user of the property that has been altered / relocated / deprecated, and what action should be taken. Name the property relative to the affected chart. For example, `gitlab.puma.minio.enabled` would be referenced as `minio.enabled` because the chart affected by the deprecation is `gitlab.puma`. Example message: ```plaintext -gitlab.unicorn: - Chart-local configuration of Minio features has been moved to global. Please remove `gitlab.unicorn.minio.enabled` from your properties, and set `global.minio.enabled` instead. +gitlab.puma: + Chart-local configuration of Minio features has been moved to global. Please remove `gitlab.puma.minio.enabled` from your properties, and set `global.minio.enabled` instead. ``` ## Activating new deprecations diff --git a/doc/installation/command-line-options.md b/doc/installation/command-line-options.md index 9f1b1749f7..b841b8554a 100644 --- a/doc/installation/command-line-options.md +++ b/doc/installation/command-line-options.md @@ -316,7 +316,7 @@ GitLab external URL | | `gitlab.gitlab-shell.service.internalPort` | Shell internal port | `2222` | | `gitlab.gitlab-shell.service.name` | Shell service name | `gitlab-shell` | | `gitlab.gitlab-shell.service.type` | Shell service type | `ClusterIP` | -| `gitlab.gitlab-shell.webservice.serviceName` | Webservice service name | `unicorn` | +| `gitlab.gitlab-shell.webservice.serviceName` | Webservice service name | `puma` | | `gitlab.mailroom.securityContext.fsGroup` | Group ID under which the pod should be started | `1000` | | `gitlab.mailroom.securityContext.runAsUser` | User ID under which the pod should be started | `1000` | | `gitlab.migrations.bootsnap.enabled` | Migrations Bootsnap enable flag | true | diff --git a/spec/integration/check_config_spec.rb b/spec/integration/check_config_spec.rb index 43ac4f5b75..bbbf92a930 100644 --- a/spec/integration/check_config_spec.rb +++ b/spec/integration/check_config_spec.rb @@ -732,35 +732,6 @@ describe 'checkConfig template' do error_description: 'when Redis is set to install with multiple Redis instances' end - describe 'dependencyProxy.puma' do - let(:success_values) do - YAML.safe_load(%( - global: - appConfig: - dependencyProxy: - enabled: true - )).merge(default_required_values) - end - - let(:error_values) do - YAML.safe_load(%( - global: - appConfig: - dependencyProxy: - enabled: true - gitlab: - webservice: - webServer: unicorn - )).merge(default_required_values) - end - - let(:error_output) { 'You must be using the Puma webservice in order to use Dependency Proxy.' } - - include_examples 'config validation', - success_description: 'when dependencyProxy is enabled with a default install', - error_description: 'when dependencyProxy is enabled with the unicorn webservice' - end - describe 'webserviceTermination' do let(:success_values) do YAML.safe_load(%( -- GitLab From 1269ad28917ea71b2edf4c05fed1fff8937e0afa Mon Sep 17 00:00:00 2001 From: Dmitry Makovey Date: Wed, 19 May 2021 16:29:32 -0600 Subject: [PATCH 3/4] remove unicorn deprecation messages Changelog: removed --- templates/NOTES.txt | 5 --- templates/_checkConfig.tpl | 11 ------- templates/_deprecations.tpl | 62 ------------------------------------- 3 files changed, 78 deletions(-) diff --git a/templates/NOTES.txt b/templates/NOTES.txt index 640717e5e4..07d0cb739d 100644 --- a/templates/NOTES.txt +++ b/templates/NOTES.txt @@ -117,11 +117,6 @@ WARNING: GitLab Pages configured to use disk storage via `{{ $component }}.extra {{- end }} {{- end }} -{{/* WARN: Unicorn is deprecated and will be removed in 14.0 */}} -{{- if eq .Values.gitlab.webservice.webServer "unicorn" -}} -WARNING: Starting with GitLab 14.0, Unicorn is no longer supported and users must switch to Puma by setting `gitlab.webservice.webServer` value to `puma`. Check https://docs.gitlab.com/ee/administration/operations/puma.html for details. -{{- end }} - {{/* run deprecations */}} {{ include "gitlab.deprecations" . }} {{/* run checkConfig */}} diff --git a/templates/_checkConfig.tpl b/templates/_checkConfig.tpl index 6bcc9da4b7..714c4f5cdb 100644 --- a/templates/_checkConfig.tpl +++ b/templates/_checkConfig.tpl @@ -52,7 +52,6 @@ Due to gotpl scoping, we can't make use of `range`, so we have to add action lin {{- $messages = append $messages (include "gitlab.checkConfig.registry.database" .) -}} {{- $messages = append $messages (include "gitlab.checkConfig.registry.gc" .) -}} {{- $messages = append $messages (include "gitlab.checkConfig.registry.migration" .) -}} -{{- $messages = append $messages (include "gitlab.checkConfig.dependencyProxy.puma" .) -}} {{- $messages = append $messages (include "gitlab.checkConfig.webservice.gracePeriod" .) -}} {{- $messages = append $messages (include "gitlab.checkConfig.objectStorage.consolidatedConfig" .) -}} {{- $messages = append $messages (include "gitlab.checkConfig.objectStorage.typeSpecificConfig" .) -}} @@ -603,16 +602,6 @@ registry: {{- end -}} {{/* END gitlab.checkConfig.registry.gc */}} -{{/* -Ensure Puma is used when the dependency proxy is enabled -*/}} -{{- define "gitlab.checkConfig.dependencyProxy.puma" -}} -{{- if and $.Values.global.appConfig.dependencyProxy.enabled (ne .Values.gitlab.webservice.webServer "puma") }} -You must be using the Puma webservice in order to use Dependency Proxy. Set `gitlab.webservice.webServer` to `puma`. -{{ end -}} -{{- end -}} -{{/* END gitlab.checkConfig.dependencyProxy.puma */}} - {{/* Ensure terminationGracePeriodSeconds is longer than blackoutSeconds */}} diff --git a/templates/_deprecations.tpl b/templates/_deprecations.tpl index 2cea1627c8..79dc322d15 100644 --- a/templates/_deprecations.tpl +++ b/templates/_deprecations.tpl @@ -30,8 +30,6 @@ Due to gotpl scoping, we can't make use of `range`, so we have to add action lin {{- $deprecated := append $deprecated (include "gitlab.deprecate.registryHttpSecret" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.registry.replicas" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.registry.updateStrategy" .) -}} -{{- $deprecated := append $deprecated (include "gitlab.deprecate.unicorn" .) -}} -{{- $deprecated := append $deprecated (include "gitlab.deprecate.unicornWorkhorse.image" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.webservice.omniauth" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.webservice.ldap" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.global.appConfig.ldap.password" .) -}} @@ -44,10 +42,8 @@ Due to gotpl scoping, we can't make use of `range`, so we have to add action lin {{- $deprecated := append $deprecated (include "gitlab.deprecate.initContainerImage" .) -}} {{- $deprecated := append $deprecated (include "external.deprecate.initContainerImage" .) -}} {{- $deprecated := append $deprecated (include "external.deprecate.initContainerPullPolicy" .) -}} -{{- $deprecated := append $deprecated (include "gitlab.deprecate.webservice.workerTimeout" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.redis-ha.enabled" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.redis.enabled" .) -}} -{{- $deprecated := append $deprecated (include "gitlab.deprecate.webservice.service.name" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.gitlab.webservice.service.configuration" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.gitlab.gitaly.serviceName" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.global.psql.pool" .) -}} @@ -152,46 +148,6 @@ registry: {{- end -}} {{/* END deprecate.registry.replicas */}} -{{/* Migration from unicorn subchart to webservice */}} -{{- define "gitlab.deprecate.unicorn" -}} -{{- if hasKey .Values.gitlab "unicorn" -}} -unicorn: - Unicorn chart was deprecated in favour of Webservice. Please remove `gitlab.unicorn.*` settings from your properties, and set `gitlab.webservice.*` instead. -{{- end -}} -{{- if hasKey .Values.global "unicorn" -}} -unicorn: - Unicorn chart was deprecated in favour of Webservice. Please remove `global.unicorn.*` settings from your properties, and set `global.webservice.*` instead. -{{- end -}} -{{- if hasKey .Values.gitlab.webservice "memory" -}} -webservice: - The `gitlab.webservice.memory.*` properties have been moved under the unicorn specific section. - You can move the configuration to `gitlab.webservice.unicorn.memory.*` when you've set the `gitlab.webservice.webServer` to `unicorn`, or remove the `gitlab.webservice.memory` configuration and instead use `gitlab.webservice.puma.workerMaxMemory` to configure Puma's worker memory limits. -{{- end -}} -{{- end -}} -{{/* END gitlab.deprecate.unicorn */}} - -{{/* Migration from `global.enterpriseImages.unicorn.workhorse` to global.enterpriseImages.workhorse` */}} -{{- define "gitlab.deprecate.unicornWorkhorse.image" -}} -{{- if hasKey .Values.global "enterpriseImages" -}} -{{- if hasKey .Values.global.enterpriseImages "unicorn" -}} -{{- if hasKey .Values.global.enterpriseImages.unicorn "workhorse" -}} -workhorse: - The `global.enterpriseImages.unicorn.workhorse.*` properties has been moved from the unicorn specific section. Please create a configuration with the new path: `global.enterpriseImages.workhorse.*`. -{{- end -}} -{{- end -}} -{{- end -}} - -{{- if hasKey .Values.global "communityImages" -}} -{{- if hasKey .Values.global.communityImages "unicorn" -}} -{{- if hasKey .Values.global.communityImages.unicorn "workhorse" -}} -workhorse: - The `global.communityImages.unicorn.workhorse.*` properties has been moved from the unicorn specific section. Please create a configuration with the new path: `global.communityImages.workhorse.*`. -{{- end -}} -{{- end -}} -{{- end -}} -{{- end -}} -{{/* END gitlab.deprecate.unicornWorkhorse.image */}} - {{/* Deprecation behaviors for configuration of Omniauth */}} {{- define "gitlab.deprecate.webservice.omniauth" -}} {{- if hasKey .Values.gitlab.webservice "omniauth" -}} @@ -302,15 +258,6 @@ gitlab.{{ $chart }}: {{- end -}} {{/* END external.deprecate.initContainerPullPolicy*/}} -{{/* Deprecation behaviors for configuration of webservice worker timeout*/}} -{{- define "gitlab.deprecate.webservice.workerTimeout" -}} -{{- if hasKey .Values.gitlab.webservice "workerTimeout" -}} -webservice: - Chart-local configuration of Unicorn's worker timeout has been moved to global. Please remove `webservice.workerTimeout` setting from your properties, and set `global.webservice.workerTimeout` instead. -{{- end -}} -{{- end -}} -{{/* END deprecate.webservice.workerTimeout */}} - {{/* Deprecation behaviors for redis-ha.enabled */}} {{- define "gitlab.deprecate.redis-ha.enabled" -}} {{- if hasKey (index .Values "redis-ha") "enabled" -}} @@ -329,15 +276,6 @@ redis: {{- end -}} {{/* END gitlab.deprecate.redis.enabled */}} -{{/* Deprecation behaviors for webservice.service.name */}} -{{- define "gitlab.deprecate.webservice.service.name" -}} -{{- if hasKey .Values.gitlab.webservice.service "name" -}} -webservice: - Chart-local configuration of Unicorn's service name has been deprecated. -{{- end -}} -{{- end -}} -{{/* END gitlab.deprecate.redis.enabled */}} - {{- define "gitlab.deprecate.gitlab.webservice.service.configuration" -}} {{- range $chart := list "gitaly" "gitlab-shell" -}} {{- if index $.Values.gitlab $chart -}} -- GitLab From 0f9ea88eb7f803b27dd1f3dea45cd58222fa8f9a Mon Sep 17 00:00:00 2001 From: Dmitry Makovey Date: Tue, 25 May 2021 15:32:14 -0600 Subject: [PATCH 4/4] Add deprecation error for unicorn-based deployments Changelog: removed --- templates/_deprecations.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/templates/_deprecations.tpl b/templates/_deprecations.tpl index 79dc322d15..fc38ae5e3b 100644 --- a/templates/_deprecations.tpl +++ b/templates/_deprecations.tpl @@ -32,6 +32,7 @@ Due to gotpl scoping, we can't make use of `range`, so we have to add action lin {{- $deprecated := append $deprecated (include "gitlab.deprecate.registry.updateStrategy" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.webservice.omniauth" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.webservice.ldap" .) -}} +{{- $deprecated := append $deprecated (include "gitlab.deprecate.webservice.webServer.unicorn" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.global.appConfig.ldap.password" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.sidekiq.cronJobs" .) -}} {{- $deprecated := append $deprecated (include "gitlab.deprecate.sidekiq.updateStrategy" .) -}} @@ -366,3 +367,11 @@ geo: The configuration of `global.geo.registry.syncEnabled` has moved. Please use `global.geo.registry.replication.enabled` instead. {{- end -}} {{- end -}} + +{{- define "gitlab.deprecate.webservice.webServer.unicorn" -}} +{{/* WARN: Unicorn is deprecated and is removed in 14.0 */}} +{{- if eq .Values.gitlab.webservice.webServer "unicorn" -}} +webservice: + Starting with GitLab 14.0, Unicorn is no longer supported and users must switch to Puma by setting `gitlab.webservice.webServer` value to `puma`. Check https://docs.gitlab.com/ee/administration/operations/puma.html for details. +{{- end }} +{{- end }} -- GitLab