Backport of Fix default Ent image tag in acceptance tests into release/0.49.x#2698
Merged
zalimeni merged 1 commit intorelease/0.49.xfrom Jul 31, 2023
Conversation
ce204fd to
396a783
Compare
74c2c5b to
96d13e4
Compare
zalimeni
reviewed
Jul 31, 2023
Comment on lines
+132
to
+134
| kind-load: | ||
| kind load docker-image --name dc1 $(DEV_IMAGE) | ||
| kind load docker-image --name dc2 $(DEV_IMAGE) |
Member
There was a problem hiding this comment.
For this backport, when fixing conflicts, I left out the dc3 and dc4 load commands as the change that introduced those DC's wasn't backported to 0.49.x.
Member
|
@wilkermichael requesting a quick review of this one since unlike the other backports, I technically changed a few lines (removed |
wilkermichael
approved these changes
Jul 31, 2023
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.
Backport
This PR is auto-generated from #2683 to be assessed for backporting due to the inclusion of the label backport/0.49.x.
🚨
The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.
The below text is copied from the body of the original PR.
Rather than hard-coding the Docker repository and parsing the non-Ent image tag for a version, simply replace the image name and retain other coordinates. This is consistent with our tagging scheme introduced in hashicorp/consul#13541 and will allow for using
hashicorppreviewimages seamlessly regardless of whether OSS or Ent is being tested.Also add a
maketarget to help with testing local images in multi-cluster scenarios.Changes proposed in this PR:
consul-enterpriseimage tag derivation with our OSS + Ent tagging schememaketarget for loading dev images acrosskindclustersHow I've tested this PR:
How I expect reviewers to test this PR: 👀
Checklist:
Overview of commits