Backport of Fix default Ent image tag in acceptance tests into release/1.1.x #2700
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/1.1.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
hashicorppreview
images seamlessly regardless of whether OSS or Ent is being tested.Also add a
make
target to help with testing local images in multi-cluster scenarios.Changes proposed in this PR:
consul-enterprise
image tag derivation with our OSS + Ent tagging schememake
target for loading dev images acrosskind
clustersHow I've tested this PR:
How I expect reviewers to test this PR: 👀
Checklist:
Overview of commits