beenull/flame
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #261 from pawelmalak/bug-k3s

Browse source 
Bug k3s
This commit is contained in:
pawelmalak 2021-12-17 12:29:49 +01:00 committed by GitHub
commit 73cf66c592
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package-lock.json generated
View file

@ -13,7 +13,7 @@
"@types/express": "^4.17.13", "@types/express": "^4.17.13",
"axios": "^0.24.0", "axios": "^0.24.0",
"concurrently": "^6.3.0", "concurrently": "^6.3.0",
"docker-secret": "^1.2.3", "docker-secret": "^1.2.4",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"express": "^4.17.1", "express": "^4.17.1",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
@ -1191,9 +1191,9 @@
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
}, },
"node_modules/docker-secret": { "node_modules/docker-secret": {
"version": "1.2.3", "version": "1.2.4",
"resolved": "https://registry.npmjs.org/docker-secret/-/docker-secret-1.2.3.tgz", "resolved": "https://registry.npmjs.org/docker-secret/-/docker-secret-1.2.4.tgz",
"integrity": "sha512-JFUGiZEiNO0Hi9YzZAdCc5MwUpgQOjz0OeZkkcEv+lH6ZBkXNK97w2gcBQCsg5WRsT+Cj9eKFhuYyDxT8j56+A==", "integrity": "sha512-aH3truzfxV8TikMa0wJES8h0v2FAwhuQZYk116ZVOHFZ1vnDTGutgCOvXmBPyLBG1Lo7yv93FdHVRTvhFFaC/g==",
"engines": { "engines": {
"node": ">= 6" "node": ">= 6"
} }
@ -5335,9 +5335,9 @@
} }
}, },
"docker-secret": { "docker-secret": {
"version": "1.2.3", "version": "1.2.4",
"resolved": "https://registry.npmjs.org/docker-secret/-/docker-secret-1.2.3.tgz", "resolved": "https://registry.npmjs.org/docker-secret/-/docker-secret-1.2.4.tgz",
"integrity": "sha512-JFUGiZEiNO0Hi9YzZAdCc5MwUpgQOjz0OeZkkcEv+lH6ZBkXNK97w2gcBQCsg5WRsT+Cj9eKFhuYyDxT8j56+A==" "integrity": "sha512-aH3truzfxV8TikMa0wJES8h0v2FAwhuQZYk116ZVOHFZ1vnDTGutgCOvXmBPyLBG1Lo7yv93FdHVRTvhFFaC/g=="
}, },
"dot-prop": { "dot-prop": {
"version": "5.3.0", "version": "5.3.0",

2
package.json
View file

@ -21,7 +21,7 @@
"@types/express": "^4.17.13", "@types/express": "^4.17.13",
"axios": "^0.24.0", "axios": "^0.24.0",
"concurrently": "^6.3.0", "concurrently": "^6.3.0",
"docker-secret": "^1.2.3", "docker-secret": "^1.2.4",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"express": "^4.17.1", "express": "^4.17.1",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",

14
utils/init/initDockerSecrets.js
View file

@ -3,14 +3,18 @@ const Logger = require('../Logger');
const logger = new Logger(); const logger = new Logger();
const initDockerSecrets = () => { const initDockerSecrets = () => {
const secrets = getSecrets(); try {
const secrets = getSecrets();
for (const property in secrets) { for (const property in secrets) {
const upperProperty = property.toUpperCase(); const upperProperty = property.toUpperCase();
process.env[upperProperty] = secrets[property]; process.env[upperProperty] = secrets[property];
logger.log(`${upperProperty} was overwritten with docker secret value`); logger.log(`${upperProperty} was overwritten with docker secret value`);
}
} catch (e) {
logger.log(`Failed to initialize docker secrets. Error: ${e}`, 'ERROR');
} }
}; };