From a97efec9177d77f7b87e7a14c1a62694253d4dc6 Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Mon, 24 Apr 2023 11:14:27 +0200 Subject: [PATCH] gitaly: Remove gitaly-ruby configuration Now Gitaly has no Ruby sidecar no more, we can delete all the configuration related to that. Issue: https://gitlab.com/gitlab-org/charts/gitlab/-/issues/4399 Changelog: removed --- .../gitaly/templates/_configmap_spec.yaml | 21 ------------------- charts/gitlab/charts/gitaly/values.yaml | 6 ------ .../charts/praefect/templates/configmap.yaml | 3 --- doc/charts/gitlab/gitaly/index.md | 5 ----- doc/charts/gitlab/praefect/index.md | 1 - 5 files changed, 36 deletions(-) diff --git a/charts/gitlab/charts/gitaly/templates/_configmap_spec.yaml b/charts/gitlab/charts/gitaly/templates/_configmap_spec.yaml index 0095c1c27e..db7e0d5a26 100644 --- a/charts/gitlab/charts/gitaly/templates/_configmap_spec.yaml +++ b/charts/gitlab/charts/gitaly/templates/_configmap_spec.yaml @@ -88,9 +88,6 @@ data: {{- if .sentryDsn }} sentry_dsn = "{{ .sentryDsn }}" {{- end }} - {{- if .rubySentryDsn }} - ruby_sentry_dsn = "{{ .rubySentryDsn }}" - {{- end }} dir = "/var/log/gitaly" {{- if .sentryEnvironment }} sentry_environment = "{{ .sentryEnvironment }}" @@ -125,24 +122,6 @@ data: {{- end }} {{- end }} - [gitaly-ruby] - # The directory where gitaly-ruby is installed - dir = "/srv/gitaly-ruby" - {{- with .Values.ruby }} - {{- if .maxRss }} - max_rss = {{ .maxRss }} - {{- end }} - {{- if .gracefulRestartTimeout }} - graceful_restart_timeout = "{{ .gracefulRestartTimeout }}" - {{- end }} - {{- if .restartDelay }} - restart_delay = "{{ .restartDelay }}" - {{- end }} - {{- if .numWorkers }} - num_workers = {{ .numWorkers }} - {{- end }} - {{- end }} - [gitlab-shell] # The directory where gitlab-shell is installed dir = "/srv/gitlab-shell" diff --git a/charts/gitlab/charts/gitaly/values.yaml b/charts/gitlab/charts/gitaly/values.yaml index e6787b56e0..993f8316f5 100644 --- a/charts/gitlab/charts/gitaly/values.yaml +++ b/charts/gitlab/charts/gitaly/values.yaml @@ -50,7 +50,6 @@ logging: format: "json" # level: # sentryDsn: - # rubySentryDsn: # sentryEnvironment: git: {} # catFileCacheSize: @@ -58,11 +57,6 @@ git: {} ## commands. Accepts configuration as documented in git-config(1). # config: # - {key: "pack.threads", value: 4} -ruby: {} - # maxRss: - # gracefulRestartTimeout: - # restartDelay: - # numWorkers: prometheus: {} # grpcLatencyBuckets: "[1.0, 1.5, 2.0, 2.5]" diff --git a/charts/gitlab/charts/praefect/templates/configmap.yaml b/charts/gitlab/charts/praefect/templates/configmap.yaml index 80a962e59a..55ff1a21a8 100644 --- a/charts/gitlab/charts/praefect/templates/configmap.yaml +++ b/charts/gitlab/charts/praefect/templates/configmap.yaml @@ -59,9 +59,6 @@ data: {{- if .sentryDsn }} sentry_dsn = "{{ .sentryDsn }}" {{- end }} - {{- if .rubySentryDsn }} - ruby_sentry_dsn = "{{ .rubySentryDsn }}" - {{- end }} dir = "/var/log/gitaly" {{- if .sentryEnvironment }} sentry_environment = "{{ .sentryEnvironment }}" diff --git a/doc/charts/gitlab/gitaly/index.md b/doc/charts/gitlab/gitaly/index.md index 8a8af3f8ec..e5bae0f5a8 100644 --- a/doc/charts/gitlab/gitaly/index.md +++ b/doc/charts/gitlab/gitaly/index.md @@ -85,12 +85,7 @@ the `helm install` command using the `--set` flags. | `logging.level` | | Log level | | `logging.format` | `json` | Log format | | `logging.sentryDsn` | | Sentry DSN URL - Exceptions from Go server | -| `logging.rubySentryDsn` | | Sentry DSN URL - Exceptions from `gitaly-ruby` | | `logging.sentryEnvironment` | | Sentry environment to be used for logging | -| `ruby.maxRss` | | Gitaly-Ruby resident set size (RSS) that triggers a memory restart (bytes) | -| `ruby.gracefulRestartTimeout` | | Graceful period before a force restart after exceeding Max RSS | -| `ruby.restartDelay` | | Time that Gitaly-Ruby memory must remain high before a restart (seconds) | -| `ruby.numWorkers` | | Number of Gitaly-Ruby worker processes | | `shell.concurrency[]` | | Concurrency of each RPC endpoint Specified using keys `rpc` and `maxPerRepo` | | `packObjectsCache.enabled` | `false` | Enable the Gitaly pack-objects cache | | `packObjectsCache.dir` | `/home/git/repositories/+gitaly/PackObjectsCache` | Directory where cache files get stored | diff --git a/doc/charts/gitlab/praefect/index.md b/doc/charts/gitlab/praefect/index.md index 741cb671ab..23f1628c64 100644 --- a/doc/charts/gitlab/praefect/index.md +++ b/doc/charts/gitlab/praefect/index.md @@ -289,7 +289,6 @@ the `helm install` command using the `--set` flags. | logging.level | | Log level | | logging.format | `json` | Log format | | logging.sentryDsn | | Sentry DSN URL - Exceptions from Go server | -| logging.rubySentryDsn | | Sentry DSN URL - Exceptions from `gitaly-ruby` | | logging.sentryEnvironment | | Sentry environment to be used for logging | | `metrics.enabled` | `true` | If a metrics endpoint should be made available for scraping | | `metrics.port` | `9236` | Metrics endpoint port | -- GitLab