Merged
Conversation
zalimeni
added
pr/no-changelog
NiniOak
approved these changes
May 29, 2024
tgross
reviewed
May 29, 2024
| // Version must conform to the format expected by | ||
| // github.com/hashicorp/go-version for tests to work. | ||
| Version = "1.5.0" | ||
| Version = "1.6.0" |
Member
There was a problem hiding this comment.
@zalimeni just a heads up that I noticed this morning that the 1.4.x versions of consul-cni from 1.4.2 when this was introduced are all showing 1.5.0-dev rather than the correct version. Not sure if that's something that should be addressed in this PR or is a missing step in the release checklist.
Member
Author
There was a problem hiding this comment.
@tgross thanks for the heads up - I'm guessing a step was accidentally skipped when creating those patch releases. Having a look shortly, but it shouldn't impact this PR as main is ahead of those.
❓ just TBC, are you referring to released artifacts, or local builds from release/1.4.x? If the former, we may want to add a note to the changelog(s) that the version is incorrectly reported (I thought we had checks for this in CRT but perhaps there's a gap somewhere).
Member
There was a problem hiding this comment.
The ones downloaded from https://releases.hashicorp.com/consul-cni, unfortunately:
$ curl -sO https://releases.hashicorp.com/consul-cni/1.4.2/consul-cni_1.4.2_linux_amd64.zip
$ unzip consul-cni_1.4.2_linux_amd64.zip
Archive: consul-cni_1.4.2_linux_amd64.zip
inflating: consul-cni
inflating: LICENSE.txt
$ ./consul-cni --version
CNI consul-cni plugin v1.5.0-dev
CNI protocol versions supported: 0.1.0, 0.2.0, 0.3.0, 0.3.1, 0.4.0, 1.0.0
I can file an issue for this somewhere if you'd like, but I noticed this PR while looking for an existing report.
Member
Author
There was a problem hiding this comment.
Thanks @tgross - appreciate you noticing and reporting. If you want to drop a message in the Consul team Slack for 👀 and tag me, that would be great, and we can decide how to follow up from there 🙏🏻
There was a problem hiding this comment.
1.4.3 was still released as 1.5.0-dev:
curl -L -o consul-cni.zip https://releases.hashicorp.com/consul-cni/1.4.3/consul-cni_1.4.3_linux_amd64.zip
unzip consul-cni.zip
./consul-cni --version
# CNI consul-cni plugin v1.5.0-dev
# CNI protocol versions supported: 0.1.0, 0.2.0, 0.3.0, 0.3.1, 0.4.0, 1.0.0@zalimeni have we validated this is fixed for 1.6.0 ?
( @tgross 👋 miss yah! )
Member
Author
There was a problem hiding this comment.
@flyinprogrammer thank you for the heads up! Unfortunately this was caught just as we were releasing 1.4.3, so we weren't able to address for that release, but are hoping to have this fixed in the next set of releases.
(For posterity: the issue was that we backported some changes to the cni submodule prior to 1.4.2 that instigated a bump to the pinned control-plane submodule introduced recently to consume the common version string; that new SHA had 1.5.0-dev in the version.go file. I think the best approach to avoid this repeating in the future will be to move consul-k8s binaries to the version/VERSION embedded file scheme that consul uses, or introduce a replace for control-plane in cni's go.mod to ensure we're always using the current revision's version.go.)
Member
There was a problem hiding this comment.
Member
Author
zalimeni
added a commit
that referenced
this pull request
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
added a commit
that referenced
this pull request
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.
2 tasks
zalimeni
added a commit
that referenced
this pull request
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
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
* 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
4 participants
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.
No description provided.