Skip to content

fix: align release-1.1 addon KubeBlocks version constraints - #3238

Merged
leon-ape merged 1 commit into
release-1.1from
support/fix-release-1.1-version-constraints
Jul 21, 2026
Merged

fix: align release-1.1 addon KubeBlocks version constraints#3238
leon-ape merged 1 commit into
release-1.1from
support/fix-release-1.1-version-constraints

Conversation

@shanshanying

Copy link
Copy Markdown
Contributor

What changed

  • Require KubeBlocks >1.0.2 for 15 release-1.1 addon charts that render exclusive replica roles.
  • Require KubeBlocks >=1.0.2 for Elasticsearch because it renders podUpgradePolicy.
  • Keep MySQL unchanged because it already declares the correct >1.0.2 floor.

Why

These release-1.1 charts declared a KubeBlocks version floor that could not accept their rendered custom resources. This allowed incompatible addons to be selected on KubeBlocks 1.0.0 through 1.0.2.

The constraints are derived from full rendered-manifest comparison against structural CRD schemas, rather than from a checker hardcoded to individual API fields.

Release-1.0 backport

The remote release-1.0 snapshot renders the same incompatible fields for every chart common to this PR, so this PR is labeled pick-1.0.

FalkorDB exists on release-1.1 but not on release-1.0. If the automatic cherry-pick reports a modify/delete conflict, omit addons/falkordb/Chart.yaml; the other 15 metadata changes apply to release-1.0.

Validation

  • Rendered and linted all 39 installable release-1.1 addon charts.
  • Compared the rendered resources against KubeBlocks v1.0.1, v1.0.2, v1.0.3-beta.0, and release-1.1 structural CRD schemas.
  • Confirmed Elasticsearch fails v1.0.1 and passes v1.0.2.
  • Confirmed the 16 exclusive-role addons fail v1.0.2 and pass v1.0.3-beta.0; MySQL already had the correct floor.
  • Rendered and linted all 39 installable addons from the remote release-1.0 snapshot and confirmed the same schema requirements for its common charts.
  • Ran git diff --check.
  • Confirmed the final diff changes only one compatibility annotation in each of 16 Chart.yaml files.

Several release-1.1 addon charts render custom-resource fields that are unavailable at their declared KubeBlocks version floor.

- Require KubeBlocks >1.0.2 for 15 charts that render exclusive replica roles.
- Require KubeBlocks >=1.0.2 for Elasticsearch pod upgrade policy support.
- Keep MySQL unchanged because it already declares the correct >1.0.2 floor.

Validated all 39 installable release-1.1 charts with Helm lint and rendering, then compared the rendered custom resources against the KubeBlocks v1.0.1, v1.0.2, v1.0.3-beta.0, and release-1.1 structural CRD schemas. The release-1.0 snapshot has the same API requirements for every common chart; FalkorDB is not present on that branch.
@shanshanying shanshanying added the pick-1.0 Auto cherry-pick to release-1.0 when PR merged label Jul 20, 2026

@leon-ape leon-ape left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@leon-ape
leon-ape merged commit 15c011e into release-1.1 Jul 21, 2026
15 checks passed
@leon-ape
leon-ape deleted the support/fix-release-1.1-version-constraints branch July 21, 2026 02:44
@apecloud-bot

Copy link
Copy Markdown
Collaborator

/cherry-pick release-1.0

@apecloud-bot

Copy link
Copy Markdown
Collaborator

🤖 says: Error cherry-picking.

Auto-merging addons/apecloud-mysql/Chart.yaml
CONFLICT (content): Merge conflict in addons/apecloud-mysql/Chart.yaml
Auto-merging addons/clickhouse/Chart.yaml
Auto-merging addons/elasticsearch/Chart.yaml
Auto-merging addons/etcd/Chart.yaml
CONFLICT (content): Merge conflict in addons/etcd/Chart.yaml
CONFLICT (modify/delete): addons/falkordb/Chart.yaml deleted in HEAD and modified in 15c011e (fix: align release-1.1 addon KubeBlocks version constraints (#3238)). Version 15c011e (fix: align release-1.1 addon KubeBlocks version constraints (#3238)) of addons/falkordb/Chart.yaml left in tree.
Auto-merging addons/influxdb/Chart.yaml
Auto-merging addons/mogdb/Chart.yaml
Auto-merging addons/mongodb/Chart.yaml
CONFLICT (content): Merge conflict in addons/mongodb/Chart.yaml
Auto-merging addons/orchestrator/Chart.yaml
CONFLICT (content): Merge conflict in addons/orchestrator/Chart.yaml
Auto-merging addons/orioledb/Chart.yaml
Auto-merging addons/polardbx/Chart.yaml
Auto-merging addons/postgresql/Chart.yaml
CONFLICT (content): Merge conflict in addons/postgresql/Chart.yaml
Auto-merging addons/redis/Chart.yaml
CONFLICT (content): Merge conflict in addons/redis/Chart.yaml
Auto-merging addons/tidb/Chart.yaml
CONFLICT (content): Merge conflict in addons/tidb/Chart.yaml
Auto-merging addons/vanilla-postgresql/Chart.yaml
Auto-merging addons/zookeeper/Chart.yaml
error: could not apply 15c011e... fix: align release-1.1 addon KubeBlocks version constraints (#3238)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

@apecloud-bot

Copy link
Copy Markdown
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks-addons/actions/runs/29796658991

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pick-1.0 Auto cherry-pick to release-1.0 when PR merged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants