Skip to content

Fix make consul-enterprise-version to work for both dev and prod images#2488

Closed
t-eckert wants to merge 1 commit intomainfrom
fix-consul-enterprise-version
Closed

Fix make consul-enterprise-version to work for both dev and prod images#2488
t-eckert wants to merge 1 commit intomainfrom
fix-consul-enterprise-version

Conversation

@t-eckert
Copy link
Copy Markdown
Contributor

Changes proposed in this PR:

  • We run a make command to set the enterprise Consul image when running unit tests. For development images the delta from non-enterprise images to enterprise images is to just change the image name from consul to consul-enterprise. In prod, you must also add a -ent to the end of the image tag. This change takes that difference into account so that we can use the make command when releasing to production.

@t-eckert t-eckert requested review from a team, erichaberkorn and zalimeni and removed request for a team June 28, 2023 22:26
@t-eckert t-eckert added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport signals that a PR will not contain a backport label labels Jun 28, 2023
@t-eckert
Copy link
Copy Markdown
Contributor Author

This change does not need to be backported to branches other than release/1.2.x because I already manually cherry-picked it into the release branches in order to get the release out.

@t-eckert t-eckert added backport/1.2.x This release branch is no longer active. and removed pr/no-backport signals that a PR will not contain a backport label labels Jun 28, 2023
Copy link
Copy Markdown
Member

@zalimeni zalimeni left a comment

Choose a reason for hiding this comment

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

Approving since this is status-quo following the last release.

Curious whether in the future we could look at making the dev + prod tagging consistent so this sort of workaround isn't necessary - but happy to not block on that now.

@missylbytes
Copy link
Copy Markdown
Contributor

This has been covered by #2756

@t-eckert t-eckert closed this Aug 25, 2023
@github-actions github-actions bot deleted the fix-consul-enterprise-version branch September 1, 2025 06:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.2.x This release branch is no longer active. pr/no-changelog PR does not need a corresponding .changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants