Skip to content

Commit 5b5e661

Browse files
don't register cluster on inCluster mode (#599)
* don't register cluster on inCluster mode * wip
1 parent c9341f7 commit 5b5e661

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

lib/interface/cli/commands/hybrid/init.cmd.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const inquirer = require('inquirer');
55
const colors = require('colors');
66
const _ = require('lodash');
77
const { addProxyVariables, detectProxy, keyValueArrayToObject } = require('../../helpers/general');
8-
const { getAllKubeContexts, getKubeContext } = require('../../helpers/kubernetes');
8+
const { getAllKubeContexts, getKubeContext, isInCluster } = require('../../helpers/kubernetes');
99
const installMonitoring = require('../monitor/install.cmd');
1010
const createClusterCmd = require('../cluster/create.cmd');
1111
const createContext = require('../auth/create-context.cmd');
@@ -635,6 +635,10 @@ const initCmd = new Command({
635635
},
636636
installationEvent: installationProgress.events.CLUSTER_INTEGRATION_ADDED,
637637
condition: async () => {
638+
if (isInCluster()) {
639+
console.log('Cluster integration was not added , please add it via codefresh create clusters [name] ');
640+
return false;
641+
}
638642
const clusters = await sdk.clusters.list() || [];
639643
if (clusters.find(cluster => cluster.selector === kubeContextName)) {
640644
return false; // cluster already exists

lib/interface/cli/helpers/kubernetes.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ const _getKubeConfig = (kubeconfigPath) => {
1717
return kc;
1818
};
1919

20+
const isInCluster = () => {
21+
return fs.existsSync('/var/run/secrets/kubernetes.io/serviceaccount');
22+
};
23+
2024
const getKubeContext = (kubeconfigPath) => {
2125
const kubeconfig = _getKubeConfig(kubeconfigPath);
2226
return kubeconfig.currentContext;
@@ -49,4 +53,5 @@ module.exports = {
4953
getKubeContext,
5054
getAllKubeContexts,
5155
getAllNamespaces,
56+
isInCluster,
5257
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codefresh",
3-
"version": "0.73.23",
3+
"version": "0.73.24",
44
"description": "Codefresh command line utility",
55
"main": "index.js",
66
"preferGlobal": true,

0 commit comments

Comments
 (0)