Skip to content

fix(packages): update TikV builder image version in YAML template #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wuhuizuo wants to merge 1 commit into from
Closed

fix(packages): update TikV builder image version in YAML template #954

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/packages.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3006,7 +3006,7 @@ components:
# binary builder, also we need it when build for mac to get build tools versions and other informations.
builders:
- if: {{ semver.CheckConstraint ">= 6.1.0-0" .Release.version }}
image: "ghcr.io/pingcap-qe/cd/builders/tikv:v2025.4.24-10-g9c32f77-centos7-devtoolset{{ ternary "10" "8" (eq .Release.profile "nextgen") }}"
image: "ghcr.io/pingcap-qe/cd/builders/tikv:v2026.3.29-23-g4eccc5d-centos7-devtoolset{{ ternary "10" "8" (eq .Release.profile "nextgen") }}"
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

While updating the TikV builder image version, there are several issues that should be addressed:

  1. FIPS Builder Oversight: The FIPS builder image at line 3011 was not updated to the v2026.3.29 version. Since the fips.Dockerfile also specifies the new Go toolchain (v1.26.1), this image should be bumped to maintain consistency across build profiles.
  2. Overlapping Constraints: The general builder condition at line 3008 (>= 6.1.0-0) overlaps with the FIPS-specific condition at line 3010 (~6.5.6-0). If the template engine follows a 'first-match' logic (as suggested by the mutually exclusive ranges used in other components like PD or TiDB), FIPS builds for version 6.5.6 will incorrectly use the non-FIPS image. Consider moving the FIPS entry above the general entry.
  3. Toolchain and OS Inconsistency: The tikv Dockerfile uses Go 1.26.1, while other components (PD, TiDB) are using 1.25. Additionally, the centos7-devtoolset suffix in the tag is inconsistent with the rockylinux:8 base used in the Dockerfile provided in the context.

- if: {{ and (semver.CheckConstraint "~6.5.6-0" .Release.version) (eq "fips" .Release.profile) }}
image: ghcr.io/pingcap-qe/cd/builders/tikv:v2025.12.14-1-g33e22ac-fips
routers:
Expand Down
Loading