Skip to content
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.

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

Support trial licenses inside enterprise_trial orchestration licenses #5097

Merged
merged 1 commit into from
Dec 15, 2021

Conversation

pebrc
Copy link
Collaborator

@pebrc pebrc commented Nov 29, 2021

Currently enterprise_trial orchestration licenses can only contain short-lived enterprise or platinum licenses (which one is applied depends on the version of Elasticsearch). This is confusing to users which expect a trial to be running if they apply a trial license. This PR prepares the ground to remedy this confusion by consistently using trial license across both the orchestrator and the Elastic stack.

I have adjusted the existing e2e test to cover both cases, which means we no longer test the "I can apply the same enterprise_trial multiple times (as long as it's valid)". But I would argue that this is only about being able to apply a regular enterprise license to Elasticsearch which we are already covering in another test. So instead we now testing once the old-style enterprise_trial with short-lived enterprise and platinum stack licenses and once the new-style enterprise_trial with a stack trial license inside.

@pebrc pebrc added >enhancement Enhancement of existing functionality v2.0.0 labels Nov 29, 2021
Copy link
Contributor

@barkbay barkbay left a comment

Choose a reason for hiding this comment

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

LGTM

@pebrc pebrc merged commit 3016db4 into elastic:master Dec 15, 2021
fantapsody pushed a commit to fantapsody/cloud-on-k8s that referenced this pull request Feb 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>enhancement Enhancement of existing functionality v2.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants