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

Merge remote-tracking branch 'origin/master' into lens_restructure

Browse Source 
# Conflicts:
#	.eslintrc.js
#	Makefile
This commit is contained in:
Roman 2020-06-26 13:32:56 +03:00
commit 7fe48881d4
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.js
View File

@ -74,7 +74,7 @@ module.exports = {
"@typescript-eslint/ban-ts-ignore": "off", "@typescript-eslint/ban-ts-ignore": "off",
"@typescript-eslint/explicit-module-boundary-types": "off", "@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/ban-types": "off", "@typescript-eslint/ban-types": "off",
"@typescript-eslint/no-empty-interface": "off", "@typescript-eslint/no-empty-function": "off",
"indent": ["error", 2] "indent": ["error", 2]
}, },
} }

18
Makefile
View File

@ -9,14 +9,11 @@ endif
download-bins: download-bins:
yarn download-bins yarn download-bins
install-deps:
yarn install --frozen-lockfile
compile-dev: compile-dev:
yarn compile:main --cache yarn compile:main --cache
yarn compile:renderer --cache yarn compile:renderer --cache
dev: install-deps compile-dev dev: app-deps compile-dev
yarn dev # run electron and watch files yarn dev # run electron and watch files
lint: lint:
@ -37,7 +34,18 @@ integration-win:
yarn build:win yarn build:win
yarn integration yarn integration
build: install-deps lint:
yarn lint
yarn lint-dashboard
test-app:
yarn test
app-deps:
yarn install --frozen-lockfile
build: app-deps
yarn install
ifeq "$(DETECTED_OS)" "Windows" ifeq "$(DETECTED_OS)" "Windows"
yarn dist:win yarn dist:win
else else

2
src/renderer/api/endpoints/pods.api.ts
View File

@ -173,7 +173,7 @@ export class Pod extends WorkloadKubeObject {
}; };
configMap: { configMap: {
name: string; name: string;
} };
secret: { secret: {
secretName: string; secretName: string;
defaultMode: number; defaultMode: number;