Skip to content

Backport of [NET-9839] fix: add shared version submodule (#4091) into release/1.5.x#4094

Merged
zalimeni merged 1 commit intorelease/1.5.xfrom
backport/zalimeni/shared-version-cli-control-plane-cni--1.5.x
Jun 7, 2024
Merged

Backport of [NET-9839] fix: add shared version submodule (#4091) into release/1.5.x#4094
zalimeni merged 1 commit intorelease/1.5.xfrom
backport/zalimeni/shared-version-cli-control-plane-cni--1.5.x

Conversation

@zalimeni
Copy link
Copy Markdown
Member

@zalimeni zalimeni commented Jun 7, 2024

Manual backport of #4091 to release/1.5.x.

* fix: add shared version submodule

Introduce a new submodule for sharing versioning code across the
binary-producing submodules in `consul-k8s` repo.

This is both an improvement in terms of consolidation, as well as a fix
for incorrect `control-plane` submodule pinning in the
`control-plane/cni` submodule that led to incorrect dev versions being
used in 1.4.2 and 1.4.3 (the first releases that included a valid
version of `control-plane/cni`. See #4054 comments for more context.

* build: fix non-dev prepare script chart version setting
@zalimeni zalimeni requested a review from DanStough June 7, 2024 20:07
@zalimeni zalimeni changed the title Backport of [NET-9839] fix: add shared version submodule (#4091) Backport of [NET-9839] fix: add shared version submodule (#4091) into release/1.5.x Jun 7, 2024
@zalimeni zalimeni added the pr/no-backport signals that a PR will not contain a backport label label Jun 7, 2024
@zalimeni zalimeni enabled auto-merge (squash) June 7, 2024 20:24
@zalimeni zalimeni merged commit b181e7a into release/1.5.x Jun 7, 2024
@zalimeni zalimeni deleted the backport/zalimeni/shared-version-cli-control-plane-cni--1.5.x branch June 7, 2024 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport signals that a PR will not contain a backport label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants