WIP: A new version of gitlab (14.6.0) is available
current diff:
--- current-deployment.yaml
+++ future-deployment.yaml
@@ -7,7 +7,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.5.2
+ chart: gitaly-5.6.0
release: gitlab-test
heritage: Helm
@@ -28,7 +28,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.5.2
+ chart: gitlab-shell-5.6.0
release: gitlab-test
heritage: Helm
@@ -47,7 +47,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.5.2
+ chart: praefect-5.6.0
release: gitlab-test
heritage: Helm
@@ -66,7 +66,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.5.2
+ chart: sidekiq-5.6.0
release: gitlab-test
heritage: Helm
@@ -87,7 +87,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.5.2
+ chart: webservice-5.6.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -128,16 +128,19 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx-ingress-controller
+ namespace: gitlab
spec:
selector:
matchLabels:
@@ -234,16 +237,20 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx-ingress
+ namespace: gitlab
+automountServiceAccountToken: true
---
# Source: gitlab/charts/nginx-ingress/templates/default-backend-serviceaccount.yaml
apiVersion: v1
@@ -251,16 +258,20 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: default-backend
name: gitlab-test-nginx-ingress-backend
+ namespace: gitlab
+automountServiceAccountToken: true
---
# Source: gitlab/charts/prometheus/templates/node-exporter/serviceaccount.yaml
apiVersion: v1
@@ -356,7 +367,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.5.2
+ chart: gitaly-5.6.0
release: gitlab-test
heritage: Helm
@@ -374,7 +385,8 @@
listen_addr = "0.0.0.0:8075"
# Directory where internal sockets reside
- internal_socket_dir = "/home/git"
+ # note: no value will result in a `/tmp/gitlab-internal-*` path
+ # internal_socket_dir = "/home/git"
# If metrics collection is enabled, inform gitaly about that
prometheus_listen_addr = "0.0.0.0:9236"
@@ -395,7 +407,7 @@
dir = "/var/log/gitaly"
[auth]
- token = "<%= File.read('/etc/gitlab-secrets/gitaly/gitaly_token').strip.dump[1..-2] %>"
+ token = <%= File.read('/etc/gitlab-secrets/gitaly/gitaly_token').strip.to_json %>
[git]
@@ -434,7 +446,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.5.2
+ chart: gitlab-exporter-5.6.0
release: gitlab-test
heritage: Helm
@@ -524,7 +536,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.5.2
+ chart: gitlab-shell-5.6.0
release: gitlab-test
heritage: Helm
@@ -684,7 +696,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.5.2
+ chart: gitlab-shell-5.6.0
release: gitlab-test
heritage: Helm
@@ -744,7 +756,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.5.2
+ chart: gitlab-shell-5.6.0
release: gitlab-test
heritage: Helm
@@ -759,7 +771,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-5.5.2
+ chart: migrations-5.6.0
release: gitlab-test
heritage: Helm
@@ -775,7 +787,7 @@
encoding: unicode
database: gitlab_production
username: gitlab
- password: "<%= File.read('/etc/gitlab/postgres/psql-password-main').strip.dump[1..-2] %>"
+ password: <%= File.read('/etc/gitlab/postgres/psql-password-main').strip.to_json %>
host: "gitlab-test-postgresql.gitlab.svc"
port: 5432
connect_timeout:
@@ -811,14 +823,14 @@
host: gitlab.test.freedesktop.org
gitaly:
client_path: /home/git/gitaly/bin
- token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token').strip.dump[1..-2] %>"
+ token: <%= File.read('/etc/gitlab/gitaly/gitaly_token').strip.to_json %>
repositories:
storages: # You must have at least a `default` storage path.
default:
path: /var/opt/gitlab/repo
gitaly_address: tcp://gitlab-test-praefect.gitlab.svc:8075
- gitaly_token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token_praefect').strip.dump[1..-2] %>"
+ gitaly_token: <%= File.read('/etc/gitlab/gitaly/gitaly_token_praefect').strip.to_json %>
gitaly-1:
path: /var/opt/gitlab/repo
gitaly_address: tcp://gitlab-test-gitlab:8075
@@ -854,7 +866,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.5.2
+ chart: praefect-5.6.0
release: gitlab-test
heritage: Helm
@@ -867,8 +879,8 @@
cp -v -r -L /init-config/${f} /init-secrets/praefect/${f}
done
config.toml.erb: |
- <% gitaly_token = File.read('/etc/gitlab-secrets/praefect/gitaly_token').strip.dump[1..-2] %>
- <% praefect_token = File.read('/etc/gitlab-secrets/praefect/praefect_token').strip.dump[1..-2] %>
+ <% gitaly_token = File.read('/etc/gitlab-secrets/praefect/gitaly_token').strip.to_json %>
+ <% praefect_token = File.read('/etc/gitlab-secrets/praefect/praefect_token').strip.to_json %>
# TCP address to listen on
listen_addr = '0.0.0.0:8075'
prometheus_listen_addr = '0.0.0.0:9236'
@@ -879,7 +891,7 @@
read_only_after_failover = true
[auth]
- token = "<%= praefect_token %>"
+ token = <%= praefect_token %>
transitioning = false
[logging]
@@ -889,22 +901,22 @@
[[virtual_storage.node]]
storage = 'gitlab-test-gitaly-default-0'
address = 'tcp://gitlab-test-gitaly-default-0.gitlab-test-gitaly-default.gitlab.svc:8075'
- token = "<%= gitaly_token %>"
+ token = <%= gitaly_token %>
[[virtual_storage.node]]
storage = 'gitlab-test-gitaly-default-1'
address = 'tcp://gitlab-test-gitaly-default-1.gitlab-test-gitaly-default.gitlab.svc:8075'
- token = "<%= gitaly_token %>"
+ token = <%= gitaly_token %>
[[virtual_storage.node]]
storage = 'gitlab-test-gitaly-default-2'
address = 'tcp://gitlab-test-gitaly-default-2.gitlab-test-gitaly-default.gitlab.svc:8075'
- token = "<%= gitaly_token %>"
+ token = <%= gitaly_token %>
[database]
host = 'gitlab-test-postgresql.gitlab.svc'
port = 5432
user = 'praefect'
- password = '<%= File.read("/etc/gitlab-secrets/praefect/db_password") %>'
+ password = <%= File.read("/etc/gitlab-secrets/praefect/db_password").strip.to_json %>
dbname = 'praefect'
sslmode = 'disable'
---
@@ -916,7 +928,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.5.2
+ chart: sidekiq-5.6.0
release: gitlab-test
heritage: Helm
@@ -931,7 +943,7 @@
encoding: unicode
database: gitlab_production
username: gitlab
- password: "<%= File.read('/etc/gitlab/postgres/psql-password-main').strip.dump[1..-2] %>"
+ password: <%= File.read('/etc/gitlab/postgres/psql-password-main').strip.to_json %>
host: "gitlab-test-postgresql.gitlab.svc"
port: 5432
connect_timeout:
@@ -1000,6 +1012,7 @@
+
artifacts:
enabled: true
object_store:
@@ -1014,8 +1027,8 @@
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
lfs:
enabled: false
object_store:
@@ -1038,8 +1051,8 @@
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
packages:
enabled: false
object_store:
@@ -1080,8 +1093,8 @@
connection:
provider: AWS
region: us-east-1
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
@@ -1114,8 +1127,8 @@
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
local_store:
enabled: false
path:
@@ -1147,14 +1160,14 @@
shared:
gitaly:
client_path: /home/git/gitaly/bin
- token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token').strip.dump[1..-2] %>"
+ token: <%= File.read('/etc/gitlab/gitaly/gitaly_token').strip.to_json %>
repositories:
storages: # You must have at least a `default` storage path.
default:
path: /var/opt/gitlab/repo
gitaly_address: tcp://gitlab-test-praefect.gitlab.svc:8075
- gitaly_token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token_praefect').strip.dump[1..-2] %>"
+ gitaly_token: <%= File.read('/etc/gitlab/gitaly/gitaly_token_praefect').strip.to_json %>
gitaly-1:
path: /var/opt/gitlab/repo
gitaly_address: tcp://gitlab-test-gitlab:8075
@@ -1178,6 +1191,10 @@
enabled: true
address: 0.0.0.0
port: 3807
+ sidekiq_health_checks:
+ enabled: true
+ address: 0.0.0.0
+ port: 3807
configure: |
set -e
config_dir="/init-config"
@@ -1206,7 +1223,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-5.5.2
+ chart: toolbox-5.6.0
release: gitlab-test
heritage: Helm
@@ -1219,7 +1236,7 @@
encoding: unicode
database: gitlab_production
username: gitlab
- password: "<%= File.read('/etc/gitlab/postgres/psql-password-main').strip.dump[1..-2] %>"
+ password: <%= File.read('/etc/gitlab/postgres/psql-password-main').strip.to_json %>
host: "gitlab-test-postgresql.gitlab.svc"
port: 5432
connect_timeout:
@@ -1294,8 +1311,8 @@
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
lfs:
enabled: false
object_store:
@@ -1318,8 +1335,8 @@
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
packages:
enabled: false
object_store:
@@ -1360,8 +1377,8 @@
connection:
provider: AWS
region: us-east-1
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
@@ -1388,8 +1405,8 @@
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
local_store:
enabled: false
path:
@@ -1421,14 +1438,14 @@
shared:
gitaly:
client_path: /home/git/gitaly/bin
- token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token').strip.dump[1..-2] %>"
+ token: <%= File.read('/etc/gitlab/gitaly/gitaly_token').strip.to_json %>
repositories:
storages: # You must have at least a `default` storage path.
default:
path: /var/opt/gitlab/repo
gitaly_address: tcp://gitlab-test-praefect.gitlab.svc:8075
- gitaly_token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token_praefect').strip.dump[1..-2] %>"
+ gitaly_token: <%= File.read('/etc/gitlab/gitaly/gitaly_token_praefect').strip.to_json %>
gitaly-1:
path: /var/opt/gitlab/repo
gitaly_address: tcp://gitlab-test-gitlab:8075
@@ -1486,7 +1503,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.5.2
+ chart: webservice-5.6.0
release: gitlab-test
heritage: Helm
@@ -1501,7 +1518,7 @@
encoding: unicode
database: gitlab_production
username: gitlab
- password: "<%= File.read('/etc/gitlab/postgres/psql-password-main').strip.dump[1..-2] %>"
+ password: <%= File.read('/etc/gitlab/postgres/psql-password-main').strip.to_json %>
host: "gitlab-test-postgresql.gitlab.svc"
port: 5432
connect_timeout:
@@ -1570,6 +1587,7 @@
+
artifacts:
enabled: true
object_store:
@@ -1584,8 +1602,8 @@
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
lfs:
enabled: false
object_store:
@@ -1608,8 +1626,8 @@
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
packages:
enabled: false
object_store:
@@ -1671,8 +1689,8 @@
host: minio.test.freedesktop.org
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
- aws_access_key_id: "<%= File.read('/etc/gitlab/minio/accesskey').strip.dump[1..-2] %>"
- aws_secret_access_key: "<%= File.read('/etc/gitlab/minio/secretkey').strip.dump[1..-2] %>"
+ aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
+ aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
local_store:
enabled: false
path:
@@ -1696,14 +1714,14 @@
shared:
gitaly:
client_path: /home/git/gitaly/bin
- token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token').strip.dump[1..-2] %>"
+ token: <%= File.read('/etc/gitlab/gitaly/gitaly_token').strip.to_json %>
repositories:
storages: # You must have at least a `default` storage path.
default:
path: /var/opt/gitlab/repo
gitaly_address: tcp://gitlab-test-praefect.gitlab.svc:8075
- gitaly_token: "<%= File.read('/etc/gitlab/gitaly/gitaly_token_praefect').strip.dump[1..-2] %>"
+ gitaly_token: <%= File.read('/etc/gitlab/gitaly/gitaly_token_praefect').strip.to_json %>
gitaly-1:
path: /var/opt/gitlab/repo
gitaly_address: tcp://gitlab-test-gitlab:8075
@@ -1774,7 +1792,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.5.2
+ chart: webservice-5.6.0
release: gitlab-test
heritage: Helm
@@ -1785,7 +1803,7 @@
shutdown_timeout = "61s"
[redis]
URL = "redis://gitlab-test-redis-master.gitlab.svc:6379"
- Password = "{% file.Read "/etc/gitlab/redis/redis-password" | strings.TrimSpace %}"
+ Password = {% file.Read "/etc/gitlab/redis/redis-password" | strings.TrimSpace | data.ToJSON %}
{%- $supported_providers := slice "AWS" "AzureRM" -%}
{%- $provider := "" -%}
{%- $aws_access_key_id := "" -%}
@@ -2103,16 +2121,19 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx-ingress-custom-add-headers
+ namespace: gitlab
data:
Referrer-Policy: strict-origin-when-cross-origin
---
@@ -2122,31 +2143,41 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx-ingress-controller
+ namespace: gitlab
data:
+ allow-snippet-annotations: "true"
add-headers: gitlab/gitlab-test-nginx-ingress-custom-add-headers
-
+
hsts: "true"
+
hsts-include-subdomains: "false"
+
hsts-max-age: "63072000"
- log-format-stream: $remote_addr - [$time_local] TCP
- log-format-upstream: $remote_addr - $remote_user [$time_local] "$request" $status
- $body_bytes_sent "$http_referer" "$http_user_agent" $request_length $request_time
- [$proxy_upstream_name] [$proxy_upstream_name] $upstream_addr $upstream_response_length
- $upstream_response_time $upstream_status $req_id
+
+ log-format-stream: "$remote_addr - [$time_local] TCP"
+
+ log-format-upstream: "$remote_addr - $remote_user [$time_local] \"$request\" $status $body_bytes_sent \"$http_referer\" \"$http_user_agent\" $request_length $request_time [$proxy_upstream_name] [$proxy_upstream_name] $upstream_addr $upstream_response_length $upstream_response_time $upstream_status $req_id"
+
server-name-hash-bucket-size: "256"
+
server-tokens: "false"
- ssl-ciphers: ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4
- ssl-protocols: TLSv1.3 TLSv1.2
+
+ ssl-ciphers: "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"
+
+ ssl-protocols: "TLSv1.3 TLSv1.2"
+
use-http2: "true"
---
# Source: gitlab/charts/postgresql/templates/extended-config-configmap.yaml
@@ -2623,13 +2654,13 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.5.2
+ chart: gitlab-5.6.0
release: gitlab-test
heritage: Helm
data:
- gitlabVersion: "14.5.2"
- gitlabChartVersion: "5.5.2"
+ gitlabVersion: "14.6.0"
+ gitlabChartVersion: "5.6.0"
---
# Source: gitlab/templates/initdb-configmap.yaml
apiVersion: v1
@@ -2639,7 +2670,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.5.2
+ chart: gitlab-5.6.0
release: gitlab-test
heritage: Helm
@@ -19144,6 +19175,79 @@
resources: ["subjectaccessreviews"]
verbs: ["create"]
---
+# Source: gitlab/charts/nginx-ingress/templates/clusterrole.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+ labels:
+ app: nginx-ingress
+ chart: nginx-ingress-4.0.6
+ release: gitlab-test
+ heritage: Helm
+
+ component: "controller"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
+ app.kubernetes.io/managed-by: Helm
+ name: gitlab-test-nginx-ingress
+rules:
+ - apiGroups:
+ - ""
+ resources:
+ - configmaps
+ - endpoints
+ - nodes
+ - pods
+ - secrets
+ verbs:
+ - list
+ - watch
+ - apiGroups:
+ - ""
+ resources:
+ - nodes
+ verbs:
+ - get
+ - apiGroups:
+ - ""
+ resources:
+ - services
+ verbs:
+ - get
+ - list
+ - watch
+ - apiGroups:
+ - networking.k8s.io
+ resources:
+ - ingresses
+ verbs:
+ - get
+ - list
+ - watch
+ - apiGroups:
+ - ""
+ resources:
+ - events
+ verbs:
+ - create
+ - patch
+ - apiGroups:
+ - networking.k8s.io
+ resources:
+ - ingresses/status
+ verbs:
+ - update
+ - apiGroups:
+ - networking.k8s.io
+ resources:
+ - ingressclasses
+ verbs:
+ - get
+ - list
+ - watch
+---
# Source: gitlab/charts/prometheus/templates/server/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
@@ -19407,6 +19511,32 @@
name: gitlab-test-certmanager-webhook
namespace: gitlab
---
+# Source: gitlab/charts/nginx-ingress/templates/clusterrolebinding.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+ labels:
+ app: nginx-ingress
+ chart: nginx-ingress-4.0.6
+ release: gitlab-test
+ heritage: Helm
+
+ component: "controller"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
+ app.kubernetes.io/managed-by: Helm
+ name: gitlab-test-nginx-ingress
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: gitlab-test-nginx-ingress
+subjects:
+ - kind: ServiceAccount
+ name: gitlab-test-nginx-ingress
+ namespace: "gitlab"
+---
# Source: gitlab/charts/prometheus/templates/server/clusterrolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
@@ -19538,16 +19668,19 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx-ingress
+ namespace: gitlab
rules:
- apiGroups:
- ""
@@ -19573,11 +19706,9 @@
verbs:
- get
- list
- - update
- watch
- apiGroups:
- - extensions
- - "networking.k8s.io" # k8s 1.14+
+ - networking.k8s.io
resources:
- ingresses
verbs:
@@ -19585,14 +19716,13 @@
- list
- watch
- apiGroups:
- - extensions
- - "networking.k8s.io" # k8s 1.14+
+ - networking.k8s.io
resources:
- ingresses/status
verbs:
- update
- apiGroups:
- - "networking.k8s.io" # k8s 1.14+
+ - networking.k8s.io
resources:
- ingressclasses
verbs:
@@ -19604,7 +19734,7 @@
resources:
- configmaps
resourceNames:
- - ingress-controller-leader-nginx
+ - ingress-controller-leader
verbs:
- get
- update
@@ -19617,14 +19747,6 @@
- apiGroups:
- ""
resources:
- - endpoints
- verbs:
- - create
- - get
- - update
- - apiGroups:
- - ""
- resources:
- events
verbs:
- create
@@ -19731,16 +19853,19 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx-ingress
+ namespace: gitlab
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
@@ -19748,7 +19873,7 @@
subjects:
- kind: ServiceAccount
name: gitlab-test-nginx-ingress
- namespace: gitlab
+ namespace: "gitlab"
---
# Source: gitlab/charts/certmanager/templates/service.yaml
apiVersion: v1
@@ -19810,7 +19935,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.5.2
+ chart: gitaly-5.6.0
release: gitlab-test
heritage: Helm
@@ -19838,7 +19963,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.5.2
+ chart: gitlab-exporter-5.6.0
release: gitlab-test
heritage: Helm
@@ -19864,7 +19989,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.5.2
+ chart: gitlab-shell-5.6.0
release: gitlab-test
heritage: Helm
@@ -19890,7 +20015,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.5.2
+ chart: praefect-5.6.0
release: gitlab-test
heritage: Helm
@@ -19925,7 +20050,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.5.2
+ chart: webservice-5.6.0
release: gitlab-test
heritage: Helm
@@ -19987,21 +20112,25 @@
prometheus.io/scrape: "true"
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx-ingress-controller-metrics
+ namespace: gitlab
spec:
type: ClusterIP
ports:
- name: metrics
- port: 9913
+ port: 10254
+ protocol: TCP
targetPort: metrics
selector:
app: nginx-ingress
@@ -20015,28 +20144,36 @@
annotations:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx-ingress-controller
+ namespace: gitlab
spec:
type: LoadBalancer
externalTrafficPolicy: Local
+ ipFamilyPolicy: SingleStack
+ ipFamilies:
+ - IPv4
ports:
- name: http
port: 80
protocol: TCP
targetPort: http
+ appProtocol: http
- name: https
port: 443
protocol: TCP
targetPort: https
+ appProtocol: https
- name: gitlab-shell
port: 22
protocol: TCP
@@ -20052,16 +20189,19 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
- component: "default-backend"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ component: "defaultbackend"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: default-backend
- name: gitlab-test-nginx-ingress-default-backend
+ name: gitlab-test-nginx-ingress-defaultbackend
+ namespace: gitlab
spec:
type: ClusterIP
ports:
@@ -20069,10 +20209,11 @@
port: 80
protocol: TCP
targetPort: http
+ appProtocol: http
selector:
app: nginx-ingress
release: gitlab-test
- component: "default-backend"
+ component: "defaultbackend"
---
# Source: gitlab/charts/postgresql/templates/metrics-svc.yaml
apiVersion: v1
@@ -20540,7 +20681,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.5.2
+ chart: gitlab-exporter-5.6.0
release: gitlab-test
heritage: Helm
@@ -20557,13 +20698,13 @@
metadata:
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.5.2
+ chart: gitlab-exporter-5.6.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 66a587b0d2c2370524b0d836fdbcad863ca44a5b4fd3c1f89df3a2cbea293f42
+ checksum/config: a0abf17e164b4dff6528f2b6f032a292d57d311cbd3b2c08ca88cea358c823d4
gitlab.com/prometheus_path: /metrics
gitlab.com/prometheus_port: "9168"
gitlab.com/prometheus_scrape: "true"
@@ -20724,7 +20865,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.5.2
+ chart: gitlab-shell-5.6.0
release: gitlab-test
heritage: Helm
@@ -20740,14 +20881,14 @@
metadata:
labels:
app: gitlab-shell
- chart: gitlab-shell-5.5.2
+ chart: gitlab-shell-5.6.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 6c960ab9c350687ea453702fa9531618d2c644b648358ac2765ea0adcdc1c28c
- checksum/config-sshd: 7e1c8d5893fe20f89e4d694f200b7e83914715b189f890a9aa87d71bfe8bfca4
+ checksum/config: 25e599677596e46044497085027c345c49ed6c17c0a4a03623b198d682c07fcc
+ checksum/config-sshd: b4c9afa86bfc173d5240e84ed9e4e47a21b37c060628fc07c30738fe4718dfa6
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
initContainers:
@@ -20887,7 +21028,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.5.2
+ chart: sidekiq-5.6.0
release: gitlab-test
heritage: Helm
@@ -20905,14 +21046,14 @@
metadata:
labels:
app: sidekiq
- chart: sidekiq-5.5.2
+ chart: sidekiq-5.6.0
release: gitlab-test
heritage: Helm
queue-pod-name: native-chart
annotations:
- checksum/configmap: 338e23ecd904283f753a68e424ef3ec4b6dd8c1e06449f88c14e4b681d9944f7
+ checksum/configmap: 65a5bb36c951712a0978f29e5ab4c555c2d1ff85f74b9ddac4877431ca957312
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -20973,7 +21114,7 @@
requests:
cpu: 50m
- name: dependencies
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.5.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.6.0"
args:
- /scripts/wait-for-deps
env:
@@ -21012,7 +21153,7 @@
containers:
- name: sidekiq
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.5.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.6.0"
env:
- name: prometheus_multiproc_dir
value: /metrics
@@ -21195,7 +21336,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-5.5.2
+ chart: toolbox-5.6.0
release: gitlab-test
heritage: Helm
@@ -21214,13 +21355,13 @@
metadata:
labels:
app: toolbox
- chart: toolbox-5.5.2
+ chart: toolbox-5.6.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 1568cc231b1b61ed1e562fdbd528f4dddbed25e0dc0c7a782d97f47d4c9a6690
+ checksum/config: 890f00a40d9bf20a7ff10e5010d4a8aef68b76f007fb8930eb5f5ba4e5ce27b3
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
securityContext:
@@ -21278,7 +21419,7 @@
- /bin/bash
- -c
- sh /var/opt/gitlab/templates/configure-gsutil && while sleep 3600; do :; done
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.5.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.6.0"
env:
- name: ARTIFACTS_BUCKET_NAME
value: gitlab-artifacts
@@ -21446,7 +21587,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.5.2
+ chart: webservice-5.6.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21467,7 +21608,7 @@
metadata:
labels:
app: webservice
- chart: webservice-5.5.2
+ chart: webservice-5.6.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21475,7 +21616,7 @@
annotations:
- checksum/config: e2defa6d8b04f436800d845c72adb65e9a11f6d83203a8797a206b2a428adf48
+ checksum/config: a49921d92ccb9529a128ea4869c0da125f9cd0d18fda9afd293056e9cfc53dda
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -21548,7 +21689,7 @@
requests:
cpu: 50m
- name: dependencies
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.5.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.6.0
args:
- /scripts/wait-for-deps
env:
@@ -21583,7 +21724,7 @@
containers:
- name: webservice
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.5.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.6.0
ports:
- containerPort: 8080
name: webservice
@@ -21676,7 +21817,7 @@
cpu: 300m
memory: 2.5G
- name: gitlab-workhorse
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v14.5.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v14.6.0"
ports:
- containerPort: 8181
name: workhorse
@@ -21941,18 +22082,20 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
component: "controller"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx-ingress-controller
+ namespace: gitlab
annotations:
-
spec:
selector:
matchLabels:
@@ -21970,11 +22113,12 @@
app: nginx-ingress
release: gitlab-test
component: "controller"
+
spec:
dnsPolicy: ClusterFirst
containers:
- name: controller
- image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/ingress-nginx/controller:v0.41.2@sha256:1f4f402b9c14f3ae92b11ada1dfe9893a88f0faeb0b2f4b903e2c67a0c3bf0de"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/ingress-nginx/controller:v1.0.4@sha256:a7fb797e0b1c919a49cf9b3f9bb90ebca39bc85d0edd11c9a5cf897da5eb5a3f"
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -21983,11 +22127,12 @@
- /wait-shutdown
args:
- /nginx-ingress-controller
- - --default-backend-service=$(POD_NAMESPACE)/gitlab-test-nginx-ingress-default-backend
+ - --default-backend-service=$(POD_NAMESPACE)/gitlab-test-nginx-ingress-defaultbackend
- --publish-service=$(POD_NAMESPACE)/gitlab-test-nginx-ingress-controller
- --election-id=ingress-controller-leader
- - --ingress-class=nginx
+ - --controller-class=k8s.io/ingress-nginx
- --configmap=$(POD_NAMESPACE)/gitlab-test-nginx-ingress-controller
+
- --tcp-services-configmap=gitlab/gitlab-test-nginx-ingress-tcp
- --watch-namespace=$(POD_NAMESPACE)
- --enable-ssl-chain-completion=false
@@ -22010,26 +22155,26 @@
fieldPath: metadata.namespace
- name: LD_PRELOAD
value: /usr/local/lib/libmimalloc.so
- livenessProbe:
+ livenessProbe:
+ failureThreshold: 5
httpGet:
path: /healthz
port: 10254
scheme: HTTP
initialDelaySeconds: 10
periodSeconds: 10
- timeoutSeconds: 1
successThreshold: 1
- failureThreshold: 5
- readinessProbe:
+ timeoutSeconds: 1
+ readinessProbe:
+ failureThreshold: 3
httpGet:
path: /healthz
port: 10254
scheme: HTTP
initialDelaySeconds: 10
periodSeconds: 10
- timeoutSeconds: 1
successThreshold: 1
- failureThreshold: 3
+ timeoutSeconds: 1
ports:
- name: http
containerPort: 80
@@ -22047,7 +22192,7 @@
requests:
cpu: 100m
memory: 100Mi
-
+
serviceAccountName: gitlab-test-nginx-ingress
terminationGracePeriodSeconds: 300
---
@@ -22057,24 +22202,25 @@
metadata:
labels:
app: nginx-ingress
- chart: nginx-ingress-3.11.1
+ chart: nginx-ingress-4.0.6
release: gitlab-test
heritage: Helm
- component: "default-backend"
- helm.sh/chart: nginx-ingress-3.11.1
- app.kubernetes.io/version: "0.41.2"
+ component: "defaultbackend"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: default-backend
- name: gitlab-test-nginx-ingress-default-backend
- annotations:
-
+ name: gitlab-test-nginx-ingress-defaultbackend
+ namespace: gitlab
spec:
selector:
matchLabels:
app: nginx-ingress
release: gitlab-test
- component: "default-backend"
+ component: "defaultbackend"
replicas: 1
revisionHistoryLimit: 10
template:
@@ -22082,11 +22228,12 @@
labels:
app: nginx-ingress
release: gitlab-test
- component: "default-backend"
+ component: "defaultbackend"
+
spec:
containers:
- name: nginx-ingress-default-backend
- image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/defaultbackend-amd64:1.5"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/defaultbackend-amd64:1.5@sha256:4dc5e07c8ca4e23bddb3153737d7b8c556e5fb2f29c4558b7cd6e6df99c512c7"
imagePullPolicy: IfNotPresent
securityContext:
capabilities:
@@ -22124,7 +22271,7 @@
requests:
cpu: 5m
memory: 5Mi
-
+
serviceAccountName: gitlab-test-nginx-ingress-backend
terminationGracePeriodSeconds: 60
---
@@ -22304,7 +22451,7 @@
containers:
- name: registry
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.15.0-gitlab"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.19.0-gitlab"
env:
volumeMounts:
@@ -22378,7 +22525,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.5.2
+ chart: gitlab-shell-5.6.0
release: gitlab-test
heritage: Helm
@@ -22403,7 +22550,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.5.2
+ chart: sidekiq-5.6.0
release: gitlab-test
heritage: Helm
@@ -22428,7 +22575,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.5.2
+ chart: webservice-5.6.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -22479,7 +22626,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.5.2
+ chart: gitaly-5.6.0
release: gitlab-test
heritage: Helm
@@ -22499,13 +22646,13 @@
labels:
storage: default
app: gitaly
- chart: gitaly-5.5.2
+ chart: gitaly-5.6.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 1662f05e2decf47b6c61502a156d119988565574c769f0a5f9f5bbc4acac0e3f
+ checksum/config: 8572fcc36e655949a418a546190942784d4903c965dada54a9a24618369609b4
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
gitlab.com/prometheus_scrape: "true"
@@ -22565,7 +22712,7 @@
containers:
- name: gitaly
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.5.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.6.0"
ports:
- containerPort: 8075
name: grcp-gitaly
@@ -22666,7 +22813,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.5.2
+ chart: praefect-5.6.0
release: gitlab-test
heritage: Helm
@@ -22683,13 +22830,13 @@
metadata:
labels:
app: praefect
- chart: praefect-5.5.2
+ chart: praefect-5.6.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: b0f22fe01e1473a212e4188154e79c2acd0c06b5db43a6e90649c9e63cf27738
+ checksum/config: f976385561d4dee7ad02fd842bd2c630b40d202334ac6df97aea86068eeb8053
spec:
affinity:
podAntiAffinity:
@@ -22739,7 +22886,7 @@
containers:
- name: praefect
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.5.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.6.0"
ports:
- containerPort: 8075
- containerPort: 9236
@@ -23175,7 +23322,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-5.5.2
+ chart: migrations-5.6.0
release: gitlab-test
heritage: Helm
@@ -23186,7 +23333,7 @@
metadata:
labels:
app: migrations
- chart: migrations-5.5.2
+ chart: migrations-5.6.0
release: gitlab-test
heritage: Helm
@@ -23234,7 +23381,7 @@
containers:
- name: migrations
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.5.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.6.0"
args:
- /scripts/wait-for-deps
- /scripts/db-migrate
@@ -23387,7 +23534,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.5.2
+ chart: webservice-5.6.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -23404,6 +23551,7 @@
nginx.ingress.kubernetes.io/service-upstream: "true"
nginx.ingress.kubernetes.io/use-regex: "true"
spec:
+
rules:
- host: gitlab.test.freedesktop.org
http:
@@ -23438,6 +23586,7 @@
nginx.ingress.kubernetes.io/proxy-buffering: "off"
cert-manager.io/issuer: "gitlab-test-issuer"
spec:
+
rules:
- host: minio.test.freedesktop.org
http:
@@ -23472,6 +23621,7 @@
nginx.ingress.kubernetes.io/proxy-buffering: "off"
cert-manager.io/issuer: "gitlab-test-issuer"
spec:
+
rules:
- host: registry.test.freedesktop.org
http:
@@ -23485,6 +23635,30 @@
- registry.test.freedesktop.org
secretName: gitlab-test-registry-tls
---
+# Source: gitlab/charts/nginx-ingress/templates/controller-ingressclass.yaml
+# We don't support namespaced ingressClass yet
+# So a ClusterRole and a ClusterRoleBinding is required
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+ labels:
+ app: nginx-ingress
+ chart: nginx-ingress-4.0.6
+ release: gitlab-test
+ heritage: Helm
+
+ component: "controller"
+ helm.sh/chart: nginx-ingress-4.0.6
+ app: nginx-ingress
+ release: gitlab-test
+ app.kubernetes.io/version: "1.0.4"
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/component: controller
+ name: gitlab-test-nginx
+ namespace: gitlab
+spec:
+ controller: k8s.io/ingress-nginx
+---
# Source: gitlab/charts/certmanager/templates/webhook-mutating-webhook.yaml
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
@@ -23624,7 +23798,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.5.2
+ chart: gitlab-5.6.0
release: gitlab-test
heritage: Helm
@@ -23641,7 +23815,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.5.2
+ chart: gitlab-5.6.0
release: gitlab-test
heritage: Helm
@@ -23680,7 +23854,7 @@
kubectl --namespace=$namespace label \
--overwrite \
- secret $secret_name app=gitlab chart=gitlab-5.5.2 release=gitlab-test heritage=Helm
+ secret $secret_name app=gitlab chart=gitlab-5.6.0 release=gitlab-test heritage=Helm
}
# Args: secretname, args
@@ -23837,7 +24011,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.5.2
+ chart: gitlab-5.6.0
release: gitlab-test
heritage: Helm
@@ -23956,7 +24130,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-5.5.2
+ chart: shared-secrets-5.6.0
release: gitlab-test
heritage: Helm
@@ -24004,7 +24178,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-5.5.2
+ chart: shared-secrets-5.6.0
release: gitlab-test
heritage: Helm
@@ -24025,7 +24199,7 @@
apiVersion: v1
kind: Pod
metadata:
- name: gitlab-test-webservice-test-runner-tvdy4
+ name: gitlab-test-webservice-test-runner-u0byb
namespace: gitlab
annotations:
"helm.sh/hook": test
@@ -24033,7 +24207,7 @@
spec:
containers:
- name: test-runner
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.5.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.6.0
command: ['sh', '/tests/test_login']
volumeMounts:
- name: tests
@@ -24104,11 +24278,11 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: gitlab-test-shared-secrets-1-5lw
+ name: gitlab-test-shared-secrets-1-egw
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.5.2
+ chart: gitlab-5.6.0
release: gitlab-test
heritage: Helm
@@ -24120,7 +24294,7 @@
metadata:
labels:
app: gitlab
- chart: gitlab-5.5.2
+ chart: gitlab-5.6.0
release: gitlab-test
heritage: Helm
@@ -24161,7 +24335,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.5.2
+ chart: gitlab-5.6.0
release: gitlab-test
heritage: Helm
@@ -24189,9 +24363,9 @@
command: ['/bin/sh', '/scripts/runcheck']
env:
- name: GITLAB_VERSION
- value: '14.5.2'
+ value: '14.6.0'
- name: CHART_VERSION
- value: '5.5.2'
+ value: '5.6.0'
volumeMounts:
- name: chart-info
mountPath: /chart-info