From 243f840c778bce6e89807e003f166c55920cc5f0 Mon Sep 17 00:00:00 2001 From: Rahul Duvedi Date: Mon, 18 Aug 2025 13:31:18 +0530 Subject: [PATCH 1/6] fix: wrong ldflags for gitlab agent casuing UI issues --- gitlab-kas-18.2.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gitlab-kas-18.2.yaml b/gitlab-kas-18.2.yaml index 4038d7282b8..3b11e3e37fc 100644 --- a/gitlab-kas-18.2.yaml +++ b/gitlab-kas-18.2.yaml @@ -1,7 +1,7 @@ package: name: gitlab-kas-18.2 version: "18.2.2" - epoch: 0 # CVE-2025-47907 + epoch: 1 # CVE-2025-47907 description: GitLab KAS is a component installed together with GitLab. It is required to manage the GitLab agent for Kubernetes. copyright: - license: MIT @@ -27,9 +27,8 @@ pipeline: packages: ./cmd/kas output: kas ldflags: | - -w -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v17/cmd.Version=v${{package.version}} - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v17/cmd.Commit=v${{package.version}} - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v17/cmd.BuildTime=$(date -d@${SOURCE_DATE_EPOCH} +%F-%T) + -w -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.Version=v${{package.version}} + -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.GitRef=v${{package.version}} subpackages: - name: gitlab-agent-${{vars.major-minor-version}} @@ -44,9 +43,8 @@ subpackages: output: agentk ldflags: | -w - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v17/cmd.Version=v${{package.version}} - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v17/cmd.Commit=v${{package.version}} - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v17/cmd.BuildTime=$(date -d@${SOURCE_DATE_EPOCH} +%F-%T) + -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.Version=v${{package.version}} + -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.GitRef=v${{package.version}} test: pipeline: - runs: agentk --version From 666f64c381739735319318270ad2d13ef062ad93 Mon Sep 17 00:00:00 2001 From: Rahul Duvedi Date: Mon, 18 Aug 2025 13:53:54 +0530 Subject: [PATCH 2/6] fix: use git commit hash for GitRef in ldflags --- gitlab-kas-18.2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-kas-18.2.yaml b/gitlab-kas-18.2.yaml index 3b11e3e37fc..3d6172a1f32 100644 --- a/gitlab-kas-18.2.yaml +++ b/gitlab-kas-18.2.yaml @@ -28,7 +28,7 @@ pipeline: output: kas ldflags: | -w -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.Version=v${{package.version}} - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.GitRef=v${{package.version}} + -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.GitRef=$(git rev-parse HEAD) subpackages: - name: gitlab-agent-${{vars.major-minor-version}} From 386694b87910ed0044595f67a00b046ddd7951a7 Mon Sep 17 00:00:00 2001 From: Rahul Duvedi Date: Mon, 18 Aug 2025 13:56:35 +0530 Subject: [PATCH 3/6] fix: use git commit hash for GitRef in ldflags for agent subpackage --- gitlab-kas-18.2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-kas-18.2.yaml b/gitlab-kas-18.2.yaml index 3d6172a1f32..78c1ed18243 100644 --- a/gitlab-kas-18.2.yaml +++ b/gitlab-kas-18.2.yaml @@ -44,7 +44,7 @@ subpackages: ldflags: | -w -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.Version=v${{package.version}} - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.GitRef=v${{package.version}} + -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.GitRef=$(git rev-parse HEAD) test: pipeline: - runs: agentk --version From 2c75baa4999cb931f58c61d3402a7c615d6f175c Mon Sep 17 00:00:00 2001 From: Rahul Duvedi Date: Tue, 19 Aug 2025 00:48:45 +0530 Subject: [PATCH 4/6] feat: Add major-version var-transform to dynamically set in case of version updates and extended tests --- gitlab-kas-18.2.yaml | 107 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 87 insertions(+), 20 deletions(-) diff --git a/gitlab-kas-18.2.yaml b/gitlab-kas-18.2.yaml index 78c1ed18243..0926f16f466 100644 --- a/gitlab-kas-18.2.yaml +++ b/gitlab-kas-18.2.yaml @@ -1,7 +1,7 @@ package: name: gitlab-kas-18.2 - version: "18.2.2" - epoch: 1 # CVE-2025-47907 + version: "18.2.4" + epoch: 2 # CVE-2025-47907 description: GitLab KAS is a component installed together with GitLab. It is required to manage the GitLab agent for Kubernetes. copyright: - license: MIT @@ -14,21 +14,25 @@ var-transforms: match: ^(\d+\.\d+)\.\d+$ replace: "$1" to: major-minor-version + - from: ${{package.version}} + match: ^(\d+)\.\d+\.\d+$ + replace: "$1" + to: major-version pipeline: - uses: git-checkout with: repository: https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent tag: v${{package.version}} - expected-commit: 0efd39ba033590adf7d8326127cdef9220607e60 + expected-commit: aa1b6f9f80359df0a30cfca92646227ee5acdf2e - uses: go/build with: packages: ./cmd/kas output: kas ldflags: | - -w -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.Version=v${{package.version}} - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.GitRef=$(git rev-parse HEAD) + -w -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v${{vars.major-version}}/internal/cmd.Version=v${{package.version}} + -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v${{vars.major-version}}/internal/cmd.GitRef=$(git rev-parse HEAD) subpackages: - name: gitlab-agent-${{vars.major-minor-version}} @@ -43,26 +47,89 @@ subpackages: output: agentk ldflags: | -w - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.Version=v${{package.version}} - -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18/internal/cmd.GitRef=$(git rev-parse HEAD) + -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v${{vars.major-version}}/internal/cmd.Version=v${{package.version}} + -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v${{vars.major-version}}/internal/cmd.GitRef=$(git rev-parse HEAD) test: pipeline: - - runs: agentk --version - -update: - enabled: true - git: - strip-prefix: v - tag-filter-prefix: v18.2 + - name: "Test agentk version and help" + runs: | + set -euo pipefail + agentk --version | grep "${{package.version}}" + agentk --help | grep "GitLab Agent for Kubernetes" + agentk --help | grep "kas-address" + agentk --help | grep "token-file" test: environment: contents: packages: - - gitlab-kas-${{vars.major-minor-version}} - - gitlab-agent-${{vars.major-minor-version}} + - wait-for-it + - curl + - valkey + - valkey-cli pipeline: - - runs: | - kas --version - agentk --version - kas --help + - name: "Version and help tests for KAS and Agent" + runs: | + set -euo pipefail + kas --version | grep "${{package.version}}" + kas --help | grep "GitLab Kubernetes Agent Server" + - name: "Test KAS daemon with Valkey (Redis)" + uses: test/daemon-check-output + with: + setup: | + openssl rand -base64 32 > /tmp/auth_secret + openssl rand -base64 48 > /tmp/websocket_secret + + valkey-server --port 6379 --daemonize yes --pidfile /tmp/valkey.pid --logfile /tmp/valkey.log + + sleep 5 + + # Create KAS configuration with Redis + cat > /tmp/kas-config.yaml < Date: Tue, 19 Aug 2025 00:52:13 +0530 Subject: [PATCH 5/6] fix: setting correct epoch --- gitlab-kas-18.2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-kas-18.2.yaml b/gitlab-kas-18.2.yaml index 0926f16f466..12df04d4792 100644 --- a/gitlab-kas-18.2.yaml +++ b/gitlab-kas-18.2.yaml @@ -1,7 +1,7 @@ package: name: gitlab-kas-18.2 version: "18.2.4" - epoch: 2 # CVE-2025-47907 + epoch: 1 # CVE-2025-47907 description: GitLab KAS is a component installed together with GitLab. It is required to manage the GitLab agent for Kubernetes. copyright: - license: MIT From 9009efdd7675f0099938a8e540769cb277d474bc Mon Sep 17 00:00:00 2001 From: Rahul Duvedi Date: Tue, 19 Aug 2025 01:09:37 +0530 Subject: [PATCH 6/6] fix: using spaces in place of tabs --- gitlab-kas-18.2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-kas-18.2.yaml b/gitlab-kas-18.2.yaml index 12df04d4792..078a22ee2d4 100644 --- a/gitlab-kas-18.2.yaml +++ b/gitlab-kas-18.2.yaml @@ -54,10 +54,10 @@ subpackages: - name: "Test agentk version and help" runs: | set -euo pipefail - agentk --version | grep "${{package.version}}" - agentk --help | grep "GitLab Agent for Kubernetes" agentk --help | grep "kas-address" + agentk --version | grep "${{package.version}}" agentk --help | grep "token-file" + agentk --help | grep "GitLab Agent for Kubernetes" test: environment: