Skip to content

build: prepare for 1.6.0 dev #4054

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.

Sign up for GitHub

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

Merged
zalimeni merged 1 commit into from
May 29, 2024
Merged

build: prepare for 1.6.0 dev #4054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...workflows/weekly-acceptance-1-4-0-rc1.yml → ...hub/workflows/weekly-acceptance-1-5-x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dispatch to the consul-k8s-workflows with a weekly cron
#
# A separate file is needed for each release because the cron schedules are different for each release.
name: weekly-acceptance-1-4-0-rc1
name: weekly-acceptance-1-5-x
on:
schedule:
# * is a special character in YAML so you have to quote this string
Expand All @@ -10,7 +10,7 @@ on:

# these should be the only settings that you will ever need to change
env:
BRANCH: "release/1.4.0-rc1"
BRANCH: "release/1.5.x"
CONTEXT: "weekly"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ ifndef CONSUL_K8S_RELEASE_DATE
$(error CONSUL_K8S_RELEASE_DATE is required, use format <Month> <Day>, <Year> (ex. October 4, 2022))
endif
ifndef CONSUL_K8S_NEXT_RELEASE_VERSION
$(error CONSUL_K8S_RELEASE_VERSION is required)
$(error CONSUL_K8S_NEXT_RELEASE_VERSION is required)
endif
ifndef CONSUL_K8S_CONSUL_VERSION
$(error CONSUL_K8S_CONSUL_VERSION is required)
Expand Down
10 changes: 5 additions & 5 deletions charts/consul/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

apiVersion: v2
name: consul
version: 1.5.0-dev
appVersion: 1.19-dev
version: 1.6.0-dev
appVersion: 1.20-dev
kubeVersion: ">=1.22.0-0"
description: Official HashiCorp Consul Chart
home: https://www.consul.io
Expand All @@ -16,11 +16,11 @@ annotations:
artifacthub.io/prerelease: true
artifacthub.io/images: |
- name: consul
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.19-dev
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.20-dev
- name: consul-k8s-control-plane
image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.5-dev
image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.6-dev
- name: consul-dataplane
image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.5-dev
image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.6-dev
- name: envoy
image: envoyproxy/envoy:v1.25.11
artifacthub.io/license: MPL-2.0
Expand Down
6 changes: 3 additions & 3 deletions charts/consul/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ global:
# image: "hashicorp/consul-enterprise:1.10.0-ent"
# ```
# @default: hashicorp/consul:<latest version>
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.19-dev
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.20-dev

# Array of objects containing image pull secret names that will be applied to each service account.
# This can be used to reference image pull secrets if using a custom consul or consul-k8s-control-plane Docker image.
Expand All @@ -86,7 +86,7 @@ global:
# image that is used for functionality such as catalog sync.
# This can be overridden per component.
# @default: hashicorp/consul-k8s-control-plane:<latest version>
imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.5-dev
imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.6-dev

# The image pull policy used globally for images controlled by Consul (consul, consul-dataplane, consul-k8s, consul-telemetry-collector).
# One of "IfNotPresent", "Always", "Never", and "". Refer to https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
Expand Down Expand Up @@ -793,7 +793,7 @@ global:
# The name (and tag) of the consul-dataplane Docker image used for the
# connect-injected sidecar proxies and mesh, terminating, and ingress gateways.
# @default: hashicorp/consul-dataplane:<latest supported version>
imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.5-dev
imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.6-dev

# Configuration for running this Helm chart on the Red Hat OpenShift platform.
# This Helm chart currently supports OpenShift v4.x+.
Expand Down
2 changes: 1 addition & 1 deletion cli/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
//
// 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"

// A pre-release marker for the version. If this is "" (empty string)
// then it means that it is a final release. Otherwise, this is a pre-release
Expand Down
2 changes: 1 addition & 1 deletion control-plane/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
//
// 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"
Copy link
Copy Markdown
Member

@tgross tgross May 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@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.

Copy link
Copy Markdown
Member Author

@zalimeni zalimeni May 29, 2024

Choose a reason for hiding this comment

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

@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).

Copy link
Copy Markdown
Member

@tgross tgross May 29, 2024

Choose a reason for hiding this comment

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

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.

Copy link
Copy Markdown
Member Author

@zalimeni zalimeni May 29, 2024

Choose a reason for hiding this comment

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

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 🙏🏻

Copy link
Copy Markdown

@flyinprogrammer flyinprogrammer Jun 4, 2024

Choose a reason for hiding this comment

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

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! )

Copy link
Copy Markdown
Member Author

@zalimeni zalimeni Jun 4, 2024

Choose a reason for hiding this comment

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

@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.)

Copy link
Copy Markdown
Member

@tgross tgross Jun 4, 2024

Choose a reason for hiding this comment

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

@flyinprogrammer

( @tgross 👋 miss yah! )

Same!

Copy link
Copy Markdown
Member Author

@zalimeni zalimeni Jun 7, 2024

Choose a reason for hiding this comment

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

Closing the loop: #4091 this should address the versioning issues going forward. Thanks again for the report @tgross !


// A pre-release marker for the version. If this is "" (empty string)
// then it means that it is a final release. Otherwise, this is a pre-release
Expand Down