From 421e7b1a71cc2c5f5995b0ea2dd85e3130c3a22d Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Tue, 4 Jul 2023 22:50:09 +0300 Subject: [PATCH 1/4] feat(runner): add codefreshToken as output for helm-based installation --- lib/interface/cli/commands/hybrid/init.cmd.js | 13 +++++++------ package.json | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/interface/cli/commands/hybrid/init.cmd.js b/lib/interface/cli/commands/hybrid/init.cmd.js index 21f95ba9b..3e53f84b0 100644 --- a/lib/interface/cli/commands/hybrid/init.cmd.js +++ b/lib/interface/cli/commands/hybrid/init.cmd.js @@ -67,14 +67,14 @@ function printInstallationOptionsSummary({ dryRun, shouldUseHelm, }) { - let summary = `\n${colors.green('Installation options summary:')} + let summary = `\n${colors.green('Installation options summary:')} 1. Kubernetes Context: ${colors.cyan(kubeContextName)} 2. Kubernetes Namespace: ${colors.cyan(kubeNamespace)} 3. Set this as default account runtime-environment: ${colors.cyan(!!shouldMakeDefaultRe)} 4. Execute demo pipeline after install: ${colors.cyan(!!shouldExecutePipeline)} 5. HTTP proxy: ${httpProxy ? colors.cyan(httpProxy) : 'none'} - 6. HTTPS proxy: ${httpsProxy ? colors.cyan(httpsProxy) : 'none'} - 7. No proxy: ${noProxy ? colors.cyan(noProxy) : 'none'} + 6. HTTPS proxy: ${httpsProxy ? colors.cyan(httpsProxy) : 'none'} + 7. No proxy: ${noProxy ? colors.cyan(noProxy) : 'none'} `; if (appProxy) { @@ -845,7 +845,7 @@ const initCmd = new Command({ return true; } - const monitoringToken = _.get(sdk, 'config.context.token'); + const userToken = _.get(sdk, 'config.context.token'); // install monitoring installationPlan.addStep({ @@ -862,7 +862,7 @@ const initCmd = new Command({ 'set-file': setFile, 'dry-run': dryRun, 'bypass-download': bypassDownload, - token: monitoringToken, + token: userToken, verbose, noExit: true, // to prevent if from calling inner: process.exit() url, @@ -891,7 +891,7 @@ const initCmd = new Command({ const monitor = { enabled: shouldInstallMonitoringFn(), clusterId: kubeContextName, - token: monitoringToken, + token: userToken, }; const global = { @@ -902,6 +902,7 @@ const initCmd = new Command({ agentName: agent.name, accountId: agent.account, runtimeName: runtimeNameContext, + codefreshToken: userToken, keys, }; diff --git a/package.json b/package.json index 9db2f9fcf..34be90ce0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codefresh", - "version": "0.84.6", + "version": "0.84.7", "description": "Codefresh command line utility", "main": "index.js", "preferGlobal": true, @@ -115,4 +115,4 @@ "./test-setup.js" ] } -} +} \ No newline at end of file From 7ba53064628f484d466d52b5f3f36ae3a34013d2 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Tue, 4 Jul 2023 23:02:08 +0300 Subject: [PATCH 2/4] codeowners --- .github/CODEOWNERS | 1 + .github/pull_request_template.md | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 .github/CODEOWNERS create mode 100644 .github/pull_request_template.md diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..1b7d05e7b --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* yaroslav@codefresh.io ziv@codefresh.io daniel.soifer@codefresh.io daniel.maizel@codefresh.io pasha@codefresh.io diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..40fcca8d0 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,5 @@ +## What + +## Why + +## Notes From d38482288b34e8d9159d91873c01fbb6a2770945 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Tue, 4 Jul 2023 23:06:33 +0300 Subject: [PATCH 3/4] codeowners --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1b7d05e7b..28f817cb2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* yaroslav@codefresh.io ziv@codefresh.io daniel.soifer@codefresh.io daniel.maizel@codefresh.io pasha@codefresh.io +* yaroslav@codefresh.io ziv@codefresh.io daniel.soifer@codefresh.io daniel.maizel@codefresh.io From 68d220e0f2b1ced4d5ded8b3e4f7d7e0617a8fa4 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Tue, 25 Jul 2023 00:38:58 +0300 Subject: [PATCH 4/4] bump version Signed-off-by: mikhail-klimko --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34be90ce0..1f6225932 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codefresh", - "version": "0.84.7", + "version": "0.84.8", "description": "Codefresh command line utility", "main": "index.js", "preferGlobal": true,