-
Notifications
You must be signed in to change notification settings - Fork 322
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.
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
[NET-9839] fix: add shared version submodule #4091
Merged
Merged
Conversation
This file contains 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
zalimeni
added
the
pr/no-backport
signals that a PR will not contain a backport label
label
Jun 7, 2024
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.
zalimeni
force-pushed
the
zalimeni/shared-version-cli-control-plane-cni
branch
from
June 7, 2024 17:20
761b5bf
to
ad5dfaf
Compare
zalimeni
force-pushed
the
zalimeni/shared-version-cli-control-plane-cni
branch
from
June 7, 2024 17:57
c0c77f4
to
c5cd1ab
Compare
DanStough
approved these changes
Jun 7, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 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
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-k8s
repo.This is both an improvement in terms of consolidation, as well as a fix for incorrect
control-plane
submodule pinning in thecontrol-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 ofcontrol-plane/cni
. See #4054 comments for more context.I have a separate change (#4093) to move us to using an embedded
VERSION
plaintext 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
.x
branches andrelease/1.5.0
, modifying the versions as needed.Changes proposed in this PR
consul-k8s
binaries into a single shared (private) submoduleprepare-
scripts leaving chart version blank when version is non-devgo.mod
/go.sum
due to runninggo mod tidy
after module swapsHow I've tested this PR
control-plane
Docker in CI:1.6.0-dev
1.6.0-dev+fips1402
Downloaded from CI run above:
Local:
How I expect reviewers to test this PR
👀 + 🧠
Checklist