DaoCloud · weizhoublue · Nov 14, 2024
@@ -3,7 +3,7 @@ export USE_OPENSOURCE_CHART=false
 export REPO_URL=https://charts.gitlab.io/
 export REPO_NAME=gitlab
 export CHART_NAME=gitlab
-export VERSION=7.5.0
+export VERSION=8.5.2
 # push to daocloud repo
 export DAOCLOUD_REPO_PROJECT=community
 export CUSTOM_SHELL=custom.sh

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v16.5.0
+appVersion: v17.5.2
 description: GitLab is the most comprehensive AI-powered DevSecOps Platform.
 home: https://about.gitlab.com/
 icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png
@@ -11,8 +11,8 @@ maintainers:
 name: gitlab
 sources:
   - https://gitlab.com/gitlab-org/charts/gitlab
-version: 7.5.0
+version: 8.5.2
 dependencies:
   - name: gitlab
-    version: "7.5.0"
+    version: "8.5.2"
     repository: "https://charts.gitlab.io/"
@@ -49,7 +49,7 @@ request is as follows:
 1. Write code and charts changes.
 1. If deemed necessary, provide MR to the [Cloud Native GitLab containers][CNG].
     - Provide the related Issue and MR link from that repository.
-1. [Generate a changelog entry with `bin/changelog`][changelog]
+1. [Generate a changelog entry][changelog]
 1. If you have multiple commits please combine them into a few logically
   organized commits by [squashing them][git-squash]
 1. Push the commit(s) to your fork
@@ -67,8 +67,8 @@ request is as follows:
     1. If you are contributing code, fill in the template already provided in the
      "Description" field.
     1. If you are contributing documentation
-      1. Choose `Documentation` from the "Choose a template" menu and fill in the template.
-      1. Ensure the branch name starts with `docs-` or ends with `-docs`
+       1. Choose `Documentation` from the "Choose a template" menu and fill in the template.
+       1. Ensure the branch name starts with `docs-` or ends with `-docs`
     1. Mention the issue(s) your merge request solves, using the `Solves #XXX` or
     `Closes #XXX` syntax to auto-close the issue(s) once the merge request will
     be merged.

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v16.5.0
+appVersion: v17.5.2
 description: GitLab is the most comprehensive AI-powered DevSecOps Platform.
 home: https://about.gitlab.com/
 icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png
@@ -11,4 +11,4 @@ maintainers:
 name: gitlab
 sources:
 - https://gitlab.com/gitlab-org/charts/gitlab
-version: 7.5.0
+version: 8.5.2
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 16.5.0
+appVersion: 17.5.2
 description: Git RPC service for handling all the git calls made by GitLab
 home: https://about.gitlab.com/
 icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg
@@ -13,4 +13,4 @@ name: gitaly
 sources:
 - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/gitaly
 - https://gitlab.com/gitlab-org/build/CNG/tree/master/gitaly
-version: 7.5.0
+version: 8.5.2
@@ -31,22 +31,25 @@ data:
     prometheus_listen_addr = "0.0.0.0:{{ default .Values.metrics.port .Values.metrics.metricsPort }}"
     {{- end }}
 
+    # Graceful shutdown timeout, how long to wait for in-flight requests to complete
+    graceful_restart_timeout = "{{ .Values.gracefulRestartTimeout | toString | duration }}"
+
     {{- if $.Values.global.gitaly.tls.enabled }}
     [tls]
     certificate_path = '/etc/gitlab-secrets/gitaly/gitaly.crt'
     key_path = '/etc/gitlab-secrets/gitaly/gitaly.key'
     {{- end }}
 
+    # Storage configuration
     {{- if .storage }}
 
     {{- /*
     Passing in "skipStorages=true" below prevents changes in the Gitaly replica counts from modifying
     the contents of the ConfigMap, which would cause existing pods to restart unnecessarily.
     */}}
-    {{ if not .skipStorages }}
+    {{- if not .skipStorages }}
     {% $storages := coll.Slice {{ include "gitlab.praefect.gitaly.storageNames" . }} %}
     {{- end }}
-
     {% $hostname := .Env.HOSTNAME | strings.TrimSpace %}
     {% if coll.Has $storages $hostname %}
     [[storage]]
@@ -62,10 +65,9 @@ data:
     Passing in "skipStorages=true" below prevents changes in the Gitaly replica counts from modifying
     the contents of the ConfigMap, which would cause existing pods to restart unnecessarily.
     */}}
-    {{ if not .skipStorages }}
+    {{- if not .skipStorages }}
     {% $storages := coll.Slice {{ include "gitlab.gitaly.storageNames" . }} %}
     {{- end }}
-
     {% $index := index (.Env.HOSTNAME | strings.Split "-" | coll.Reverse) 0 | conv.ToInt64 %}
     {% if len $storages | lt $index %}
     [[storage]]
@@ -161,7 +163,55 @@ data:
     dir = {{ .dir | quote }}
     {{-     end }}
     {{-     if .max_age }}
-    max_age = {{ .max_age }}
+    max_age = {{ .max_age | quote }}
+    {{-     end }}
+    {{-     if .min_occurrences }}
+    min_occurrences = {{ .min_occurrences }}
     {{-     end }}
     {{-   end }}
     {{- end }}
+
+    {{- if .Values.backup.goCloudUrl }}
+    [backup]
+    go_cloud_url = "{{ .Values.backup.goCloudUrl }}"
+    {{- end }}
+
+    {{- if .Values.cgroups.enabled }}
+    {{-   with .Values.cgroups }}
+    [cgroups]
+    {{-     if .mountpoint }}
+    mountpoint = "{{ .mountpoint }}"
+    {{-     end }}
+    {{-     if .hierarchyRoot }}
+    hierarchy_root = {{ .hierarchyRoot | quote }}
+    {{-     end }}
+    {{-     if .memoryBytes }}
+    memory_bytes = {{ .memoryBytes | int64 }}
+    {{-     end }}
+    {{-     if .cpuShares }}
+    cpu_shares = {{ .cpuShares | int64 }}
+    {{-     end }}
+    {{-     if .cpuQuotaUs }}
+    cpu_quota_us = {{ .cpuQuotaUs | int64 }}
+    {{-     end }}
+    {{-  end }}
+
+    {{-   with .Values.cgroups.repositories }}
+    [cgroups.repositories]
+    {{-     if .count }}
+    count = {{ .count | int64 }}
+    {{-     end }}
+    {{-     if .memoryBytes }}
+    memory_bytes = {{ .memoryBytes | int64 }}
+    {{-     end }}
+    {{-     if .cpuShares }}
+    cpu_shares = {{ .cpuShares | int64 }}
+    {{-     end }}
+    {{-     if .cpuQuotaUs }}
+    cpu_quota_us = {{ .cpuQuotaUs | int64 }}
+    {{-     end }}
+    {{-     if .maxCgroupsPerRepo }}
+    max_cgroups_per_repo = {{ .maxCgroupsPerRepo | int64 }}
+    {{-     end }}
+    {{-   end }}
+    {{- end }}
@@ -1,6 +1,11 @@
 spec:
   type: {{ coalesce .Values.service.type .Values.global.gitaly.service.type }}
-  clusterIP: "None"
+  {{- if (or (eq .Values.service.type "ClusterIP") (not (eq .Values.service.clusterIP "None"))) }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{- end }}
+  {{- if (and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP))) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
   ports:
     - port: {{ coalesce .Values.service.externalPort .Values.global.gitaly.service.externalPort }}
       # This port is NOT prefixed with `grpc` due to