hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

don't bundle extension with eula on default build

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2021-04-16 08:18:06 +03:00
parent fa531067b2
commit 64a8a977dd
4 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.azure-pipelines.yml
View File

@ -2,6 +2,9 @@ variables:
YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn
pr: none pr: none
trigger: trigger:
branches:
include:
- fix/dont-bundle-extensions-with-eula-by-default
tags: tags:
include: include:
- "*" - "*"
@ -35,6 +38,12 @@ jobs:
yarn | "$(Agent.OS)" yarn | "$(Agent.OS)"
path: $(YARN_CACHE_FOLDER) path: $(YARN_CACHE_FOLDER)
displayName: Cache Yarn packages displayName: Cache Yarn packages
- bash: |
echo $(BUNDLED_EXTENSIONS) > .bundled-extensions.json
cat .bundled-extensions.json
displayName: Override bundled modules
env:
BUNDLED_EXTENSIONS: $(BUNDLED_EXTENSIONS)
- script: make node_modules - script: make node_modules
displayName: Install dependencies displayName: Install dependencies
- script: make build-npm - script: make build-npm
@ -76,6 +85,12 @@ jobs:
yarn | "$(Agent.OS)" yarn | "$(Agent.OS)"
path: $(YARN_CACHE_FOLDER) path: $(YARN_CACHE_FOLDER)
displayName: Cache Yarn packages displayName: Cache Yarn packages
- bash: |
echo $(BUNDLED_EXTENSIONS) > .bundled-extensions.json
cat .bundled-extensions.json
displayName: Override bundled modules
env:
BUNDLED_EXTENSIONS: $(BUNDLED_EXTENSIONS)
- script: make node_modules - script: make node_modules
displayName: Install dependencies displayName: Install dependencies
- script: make build-npm - script: make build-npm
@ -119,6 +134,12 @@ jobs:
yarn | "$(Agent.OS)" yarn | "$(Agent.OS)"
path: $(YARN_CACHE_FOLDER) path: $(YARN_CACHE_FOLDER)
displayName: Cache Yarn packages displayName: Cache Yarn packages
- bash: |
echo $(BUNDLED_EXTENSIONS) > .bundled-extensions.json
cat .bundled-extensions.json
displayName: Override bundled modules
env:
BUNDLED_EXTENSIONS: $(BUNDLED_EXTENSIONS)
- script: make node_modules - script: make node_modules
displayName: Install dependencies displayName: Install dependencies
- script: make build-npm - script: make build-npm

8
.bundled-extensions.json Normal file
View File

@ -0,0 +1,8 @@
{
"extensions": [
"pod-menu",
"node-menu",
"metrics-cluster-feature",
"kube-object-event-status"
]
}

11
package.json
View File

@ -179,17 +179,6 @@
"role": "Viewer" "role": "Viewer"
} }
}, },
"lens": {
"extensions": [
"telemetry",
"pod-menu",
"node-menu",
"metrics-cluster-feature",
"license-menu-item",
"kube-object-event-status",
"survey"
]
},
"dependencies": { "dependencies": {
"@hapi/call": "^8.0.0", "@hapi/call": "^8.0.0",
"@hapi/subtext": "^7.0.3", "@hapi/subtext": "^7.0.3",

3
src/common/utils/app-version.ts
View File

@ -1,5 +1,6 @@
import requestPromise from "request-promise-native"; import requestPromise from "request-promise-native";
import packageInfo from "../../../package.json"; import packageInfo from "../../../package.json";
import extensionInfo from "../../../.bundled-extensions.json";
export function getAppVersion(): string { export function getAppVersion(): string {
return packageInfo.version; return packageInfo.version;
@ -10,7 +11,7 @@ export function getBundledKubectlVersion(): string {
} }
export function getBundledExtensions(): string[] { export function getBundledExtensions(): string[] {
return packageInfo.lens?.extensions || []; return extensionInfo.extensions || [];
} }
export async function getAppVersionFromProxyServer(proxyPort: number): Promise<string> { export async function getAppVersionFromProxyServer(proxyPort: number): Promise<string> {