[Installer]: add license key to Installer config #7120
Merged
Conversation
This file contains 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
roboquat
added
do-not-merge/work-in-progress
do-not-merge/release-note-label-needed
team: webapp
mrsimonemms
force-pushed
the
sje/installer-license-key
branch
from
f8181e2 to
d4a698f
Compare
roboquat
added
team: workspace
mrsimonemms
changed the title
mrsimonemms
force-pushed
the
sje/installer-license-key
branch
from
d4a698f to
cd5fec0
Compare
|
/werft run 👍 started the job as gitpod-build-sje-installer-license-key.3 |
mrsimonemms
force-pushed
the
sje/installer-license-key
branch
from
8735b79 to
c69ecf3
Compare
This includes secret validation if it's present in the config
mrsimonemms
force-pushed
the
sje/installer-license-key
branch
from
c69ecf3 to
a9fcc08
Compare
Codecov Report
@@ Coverage Diff @@
## main #7120 +/- ##
==========================================
- Coverage 19.04% 5.76% -13.29%
==========================================
Files 2 13 +11
Lines 168 1162 +994
==========================================
+ Hits 32 67 +35
- Misses 134 1094 +960
+ Partials 2 1 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
geropl
reviewed
Dec 8, 2021
geropl
reviewed
Dec 8, 2021
| license?: string; | ||
| licenseFile?: string; |
mrsimonemms
force-pushed
the
sje/installer-license-key
branch
from
a9fcc08 to
e67b493
Compare
|
/hold |
|
/unhold |
geropl
reviewed
Dec 8, 2021
| let license = config.license | ||
| const licenseFile = config.licenseFile | ||
| if (licenseFile) { | ||
| license = fs.readFileSync(licenseFile, "utf-8") |
|
/lgtm nice! 👍 |
|
LGTM label has been added. Git tree hash: 7ece5094d633533ba47e010b07470c0415a53bb9
|
princerachit
approved these changes
Dec 9, 2021
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: geropl, princerachit Associated issue: #6868 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
roboquat
added
deployed: workspace
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.
Description
Allows an enterprise license key to be added to the Installer config surface. This creates an optional Kubernetes secret from the volume and loads it into the server config. Also adds cluster validation to ensure that a license secret is set if included in the config YAML.
In the server, this adds
licenseFileto the config interface and, if set, it loads it from that location and sets the value tolicense.Related Issue(s)
Fixes #6868
How to test
Create a license, load it into a secret and deploy it to your cluster, adding the following block to your config YAML:
Happy to demo it to the approver(s) if required
Release Notes
Documentation