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

Prepare for adding license auto-retrieval to auto-config in enterprise #10248

Merged
merged 1 commit into from
May 24, 2021

Conversation

mkeeler
Copy link
Member

@mkeeler mkeeler commented May 17, 2021

Consul Enterprise will be changing the code to automatically retrieve a license from the servers in the dc. This code is moving into the auto-config package.

This PR contains the necessary OSS modifications and integration points to allow that to work.

@mkeeler mkeeler added this to the 1.10.0 milestone May 17, 2021
@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from f164306 to 550b4bd Compare May 17, 2021 19:28
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 17, 2021 19:28 Inactive
@vercel vercel bot temporarily deployed to Preview – consul May 17, 2021 19:28 Inactive
@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from 550b4bd to 436fc50 Compare May 17, 2021 19:59
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 17, 2021 19:59 Inactive
@vercel vercel bot temporarily deployed to Preview – consul May 17, 2021 19:59 Inactive
@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from 436fc50 to c659afa Compare May 17, 2021 20:01
@vercel vercel bot temporarily deployed to Preview – consul May 17, 2021 20:01 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 17, 2021 20:01 Inactive
sdk/testutil/testlog.go Outdated Show resolved Hide resolved
@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from c659afa to a041eb2 Compare May 17, 2021 20:11
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 17, 2021 20:11 Inactive
@vercel vercel bot temporarily deployed to Preview – consul May 17, 2021 20:11 Inactive
@mkeeler mkeeler force-pushed the hcs-1935-move-licensemanager branch from bd9824c to ecac21c Compare May 19, 2021 15:52
@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from a041eb2 to b67c887 Compare May 19, 2021 15:56
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 19, 2021 15:56 Inactive
@vercel vercel bot temporarily deployed to Preview – consul May 19, 2021 15:56 Inactive
@mkeeler mkeeler changed the title HCS-1936: Prepare for adding license auto-retrieval to auto-config in enterprise Prepare for adding license auto-retrieval to auto-config in enterprise May 20, 2021
@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from b67c887 to 72c031f Compare May 20, 2021 19:54
@vercel vercel bot temporarily deployed to Preview – consul May 20, 2021 19:54 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 20, 2021 19:55 Inactive
@mkeeler mkeeler requested a review from dnephin May 21, 2021 14:43
@mkeeler mkeeler force-pushed the hcs-1935-move-licensemanager branch from ecac21c to 7e67388 Compare May 21, 2021 17:40
@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from 72c031f to 580d9f0 Compare May 21, 2021 17:43
@vercel vercel bot temporarily deployed to Preview – consul May 21, 2021 17:43 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 21, 2021 17:43 Inactive
Base automatically changed from hcs-1935-move-licensemanager to master May 24, 2021 14:19
@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from 580d9f0 to 53ed6d6 Compare May 24, 2021 14:20
@vercel vercel bot temporarily deployed to Preview – consul May 24, 2021 14:20 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 24, 2021 14:20 Inactive
@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from 53ed6d6 to 9bf0515 Compare May 24, 2021 14:29
@vercel vercel bot temporarily deployed to Preview – consul May 24, 2021 14:29 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 24, 2021 14:29 Inactive
Copy link
Member

@banks banks left a comment

Choose a reason for hiding this comment

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

LGTM!

@mkeeler mkeeler force-pushed the hcs-1936-license-retrieval branch from 9bf0515 to 9aa3c9e Compare May 24, 2021 16:50
@vercel vercel bot temporarily deployed to Preview – consul May 24, 2021 16:50 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 24, 2021 16:50 Inactive
@mkeeler mkeeler merged commit caafc02 into master May 24, 2021
@mkeeler mkeeler deleted the hcs-1936-license-retrieval branch May 24, 2021 17:20
@hc-github-team-consul-core
Copy link
Collaborator

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/373519.

@hc-github-team-consul-core
Copy link
Collaborator

🍒✅ Cherry pick of commit caafc02 onto release/1.10.x succeeded!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants