[NET-9839] fix: add shared version submodule#4091
Merged
Conversation
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.
761b5bf to
ad5dfaf
Compare
c0c77f4 to
c5cd1ab
Compare
Member
Author
DanStough
approved these changes
Jun 7, 2024
Contributor
DanStough
left a comment
There was a problem hiding this comment.
👍 Thank you for the fix!
2 tasks
zalimeni
added a commit
that referenced
this pull request
Jun 7, 2024
* 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
added a commit
that referenced
this pull request
Jun 7, 2024
* 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
added a commit
that referenced
this pull request
Jun 7, 2024
* 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
added a commit
that referenced
this pull request
Jun 7, 2024
* 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
added a commit
that referenced
this pull request
Jun 7, 2024
… release/1.5.x (#4094) Backport of [NET-9839] fix: add shared version submodule (#4091) * 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
added a commit
that referenced
this pull request
Jun 7, 2024
* 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
added a commit
that referenced
this pull request
Jun 7, 2024
* 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
added a commit
that referenced
this pull request
Jun 7, 2024
… release/1.5.0 (#4095) Backport of [NET-9839] fix: add shared version submodule (#4091) * 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
added a commit
that referenced
this pull request
Jun 7, 2024
… release/1.4.x (#4096) Backport of [NET-9839] fix: add shared version submodule (#4091) * 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
added a commit
that referenced
this pull request
Jun 7, 2024
… release/1.3.x (#4097) Backport of [NET-9839] fix: add shared version submodule (#4091) * 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
added a commit
that referenced
this pull request
Jun 7, 2024
… release/1.1.x (#4098) Backport of [NET-9839] fix: add shared version submodule (#4091) * 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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

Introduce a new submodule for sharing versioning code across the binary-producing submodules in
consul-k8srepo.This is both an improvement in terms of consolidation, as well as a fix for incorrect
control-planesubmodule pinning in thecontrol-plane/cnisubmodule that led to incorrect dev versions being used in 1.4.2 and 1.4.3 (the first releases that included a valid version ofcontrol-plane/cni. See #4054 comments for more context.I have a separate change (#4093) to move us to using an embedded
VERSIONplaintext file likeconsul, but splitting that out from this change for brevity and to reduce risk before the upcoming release. The follow-up is lower priority and may not be worth pushing through soon, but would be a nice simplification.Once merged, I plan to manually backport this change to
.xbranches andrelease/1.5.0, modifying the versions as needed.Changes proposed in this PR
consul-k8sbinaries into a single shared (private) submoduleprepare-scripts leaving chart version blank when version is non-devgo.mod/go.sumdue to runninggo mod tidyafter module swapsHow I've tested this PR
control-planeDocker in CI:1.6.0-dev1.6.0-dev+fips1402Downloaded from CI run above:
Local:
How I expect reviewers to test this PR
👀 + 🧠
Checklist