Skip to content

Commit 2cb8bc6

Browse files
committed
Update built-in KAS to 18.8.4
Sync gitlab-kas config to 18.8.2 - Don't mention IPv4 for localhost since it'll listen on both v4 and v6 anyway https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/merge_requests/2641 Since: v18.2.0 - Improve kas and agentk configuration docs https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/merge_requests/2902 (This sets default value for agent.listen.websocket to false, but this commit just ignored it) Since: v18.4.0 Also, we set non-default value (`debug`) for `observability.logging.level` (default: `info`) and `.grpc_level` (default: `error`) ---- Update to 18.8.4 no changes from v18.8.2 $ git log --oneline v18.8.2..v18.8.4 -- ./pkg/kascfg/kascfg_defaults.yaml
1 parent 2553809 commit 2cb8bc6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
1010
GITLAB_SHELL_VERSION=14.45.5 \
1111
GITLAB_PAGES_VERSION=18.8.4 \
1212
GITALY_SERVER_VERSION=18.8.4 \
13-
GITLAB_AGENT_VERSION=18.5.1 \
13+
GITLAB_AGENT_VERSION=18.8.4 \
1414
GITLAB_USER="git" \
1515
GITLAB_HOME="/home/git" \
1616
GITLAB_LOG_DIR="/var/log/gitlab" \

assets/runtime/config/gitlab-agent/gitlab-kas_config.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ agent:
1717
allowed_agent_cache_error_ttl: 10s
1818
allowed_agent_cache_ttl: 60s
1919
listen:
20-
address: 127.0.0.1:8154
20+
address: :8154
2121
listen_grace_period: 5s
2222
network: tcp
2323
shutdown_grace_period: 3600s
@@ -74,7 +74,7 @@ observability:
7474
usage_reporting_period: 10s
7575
private_api:
7676
listen:
77-
address: 0.0.0.0:8155
77+
address: :8155
7878
listen_grace_period: 5s
7979
max_connection_age: 7200s
8080
network: tcp
@@ -88,8 +88,7 @@ redis:
8888
address: "{{REDIS_HOST}}:{{REDIS_PORT}}" # required
8989
workspaces:
9090
listen:
91-
address: 127.0.0.1:8160
91+
address: :8160
9292
listen_grace_period: 5s
9393
network: tcp
9494
shutdown_grace_period: 3600s
95-

0 commit comments

Comments
 (0)