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

feat: Unfork Enterprise Edition (EE) and require license key for EE features #9168

Merged
merged 20 commits into from
Apr 18, 2024

Conversation

eecsliu
Copy link
Contributor

@eecsliu eecsliu commented Apr 15, 2024

Ticket

DET-10057

Description

This PR contains the squashed contents of EE, which has been secured by a license check. The PR is massive, and here are some of my comments on the contents and things to pay attention to:

Things I changed:

  • .circleci/real_config.yml: lots of merging EE/OSS and creating new workflows and jobs
  • Agent, master, harness, helm, docs, and determined (root dir) have Makefile changes (agent, master, and helm have goreleaser changes too)
  • harness/determined/deploy/local/cluster_utils.py: modified so that enterprise edition is an option the user selects (previously, EE and OSS versions were hard coded in their respective repos)
  • migration plan: one big migration to rule them all (with a blank down migration). EE migrations have been transplanted in under the ee_migrations folder.
  • tools/slurmcluster.sh has been placed in dev-scripts repo and a comment has been left in its place.
  • webui/react stuff - added stuff that switches branding

Things I didnt change (and some commentary):

  • most of the circle CI changes are additions to configs and adding EE features to the configs. After this change we will be testing on EE images in ci, so these additions are ok to be included.
  • Docs contains transplanted EE stuff
  • hpc-ard-launcher-go can be safely ignored
  • master contains mostly EE feature changes (and a function signature change for RequireMockWorkspaceID)
  • tools/scripts/licenses is all different licenses that we probably want to keep

Test Plan

Make sure each of these features work: #9172, #9173, and #9086. In addition, make sure CI is running and doesn't fail on build or setup steps. Lastly, check the license gating feature to make sure it works.

Test license key: Setup devcluster so that it is running some enterprise feature, such as RBAC, SSO, or dispatcher RM. Master should panic and stop you from starting up with these features enabled. Next, use the license generation tool and follow the steps to generate your license. Run devcluster again and verify that the EE features now work.

Checklist

  • Changes have been manually QA'd
  • User-facing API changes need the "User-facing API Change" label.
  • Release notes should be added as a separate file under docs/release-notes/.
    See Release Note for details.
  • Licenses should be included for new code which was copied and/or modified from any external code.

@eecsliu eecsliu requested review from a team as code owners April 15, 2024 21:25
@cla-bot cla-bot bot added the cla-signed label Apr 15, 2024
@eecsliu eecsliu requested review from molinamelendezj and maxrussell and removed request for molinamelendezj April 15, 2024 21:25
@determined-ci determined-ci requested a review from a team April 15, 2024 21:26
@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci determined-ci added the documentation Improvements or additions to documentation label Apr 15, 2024
Copy link

netlify bot commented Apr 15, 2024

Deploy Preview for determined-ui canceled.

Name Link
🔨 Latest commit 2a34971
🔍 Latest deploy log https://app.netlify.com/sites/determined-ui/deploys/6620b976b39388000870ee49

@eecsliu eecsliu marked this pull request as draft April 15, 2024 21:26
@eecsliu eecsliu changed the title feat: Unfork Enterprise Edition (EE) and require license for EE features feat: Unfork Enterprise Edition (EE) and require license key for EE features Apr 15, 2024
@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

1 similar comment
@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

Copy link

codecov bot commented Apr 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 40.39%. Comparing base (f233c95) to head (052274e).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9168      +/-   ##
==========================================
- Coverage   45.47%   40.39%   -5.08%     
==========================================
  Files        1197      748     -449     
  Lines      147637   105203   -42434     
  Branches     2438     2438              
==========================================
- Hits        67138    42498   -24640     
+ Misses      80267    62473   -17794     
  Partials      232      232              
Flag Coverage Δ
backend 34.27% <ø> (-9.44%) ⬇️
harness 49.42% <ø> (-14.60%) ⬇️
web 35.41% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
agent/pkg/podman/podman.go 5.78% <ø> (+0.02%) ⬆️
agent/pkg/singularity/singularity.go 0.00% <ø> (ø)

... and 589 files with indirect coverage changes

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

1 similar comment
@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

1 similar comment
@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@determined-ci
Copy link
Collaborator

Docsite preview being generated for this PR.
You can (eventually) find the generated docsite here.

@eecsliu eecsliu merged commit 283daab into main Apr 18, 2024
90 of 111 checks passed
@eecsliu eecsliu deleted the unfork-ee branch April 18, 2024 06:37
@eecsliu eecsliu restored the unfork-ee branch April 18, 2024 20:10
@eecsliu eecsliu deleted the unfork-ee branch April 18, 2024 20:11
JComins000 pushed a commit that referenced this pull request Apr 22, 2024
…eatures (#9168)

Co-authored-by: Keita Nonaka <keita.nonaka@hpe.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants