@catladder/cli 1.40.1 → 1.40.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/apps/cli/commands/project/commandOpenGit.js +2 -7
- package/dist/apps/cli/commands/project/commandOpenGit.js.map +1 -1
- package/dist/apps/cli/commands/project/setup/setupKubernetes.js +10 -15
- package/dist/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
- package/dist/catenv.js +2 -3
- package/dist/catenv.js.map +1 -1
- package/dist/cli.js +0 -2
- package/dist/cli.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/cluster.d.ts +2 -2
- package/dist/utils/cluster.js +3 -8
- package/dist/utils/cluster.js.map +1 -1
- package/dist/utils/gitlab.js +1 -1
- package/dist/utils/gitlab.js.map +1 -1
- package/dist/utils/projects/index.js +2 -7
- package/dist/utils/projects/index.js.map +1 -1
- package/package.json +3 -4
- package/src/apps/cli/commands/project/commandOpenGit.ts +2 -2
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +27 -21
- package/src/catenv.ts +4 -3
- package/src/cli.ts +1 -2
- package/src/utils/cluster.ts +3 -3
- package/src/utils/gitlab.ts +4 -3
- package/src/utils/projects/index.ts +2 -2
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
|
|
3
|
-
if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
|
|
4
|
-
return cooked;
|
|
5
|
-
};
|
|
6
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
7
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
8
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -40,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
40
36
|
}
|
|
41
37
|
};
|
|
42
38
|
exports.__esModule = true;
|
|
43
|
-
var
|
|
39
|
+
var child_process_promise_1 = require("child-process-promise");
|
|
44
40
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
45
41
|
return __generator(this, function (_a) {
|
|
46
42
|
return [2 /*return*/, vorpal
|
|
@@ -48,7 +44,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
48
44
|
.action(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
49
45
|
return __generator(this, function (_a) {
|
|
50
46
|
switch (_a.label) {
|
|
51
|
-
case 0: return [4 /*yield*/, (0,
|
|
47
|
+
case 0: return [4 /*yield*/, (0, child_process_promise_1.exec)("npx git-open")];
|
|
52
48
|
case 1:
|
|
53
49
|
_a.sent();
|
|
54
50
|
return [2 /*return*/];
|
|
@@ -57,5 +53,4 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
57
53
|
}); })];
|
|
58
54
|
});
|
|
59
55
|
}); });
|
|
60
|
-
var templateObject_1;
|
|
61
56
|
//# sourceMappingURL=commandOpenGit.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandOpenGit.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandOpenGit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commandOpenGit.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandOpenGit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAA6C;AAE7C,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CACN,kBAAkB,EAClB,kDAAkD,CACnD;iBACA,MAAM,CAAC;;;gCACN,qBAAM,IAAA,4BAAI,EAAC,cAAc,CAAC,EAAA;;4BAA1B,SAA0B,CAAC;;;;iBAC5B,CAAC,EAAA;;KAAA,EAAC"}
|
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
|
|
3
|
-
if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
|
|
4
|
-
return cooked;
|
|
5
|
-
};
|
|
6
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
7
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
8
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -45,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
45
41
|
exports.__esModule = true;
|
|
46
42
|
exports.setupKubernetes = void 0;
|
|
47
43
|
var pipeline_1 = require("@catladder/pipeline");
|
|
48
|
-
var
|
|
44
|
+
var child_process_promise_1 = require("child-process-promise");
|
|
49
45
|
var cluster_1 = require("../../../../../utils/cluster");
|
|
50
46
|
var gitlab_1 = require("../../../../../utils/gitlab");
|
|
51
47
|
var ensureNamespace_1 = __importDefault(require("../utils/ensureNamespace"));
|
|
@@ -75,40 +71,40 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
|
|
|
75
71
|
// we currently create one per component to better separate them
|
|
76
72
|
instance.log("ensuring service accounts...");
|
|
77
73
|
serviceAccountName = "cl-".concat(context.componentName, "-deploy");
|
|
78
|
-
return [4 /*yield*/, (0,
|
|
74
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'").then(function (s) { return s.stdout.trim(); })];
|
|
79
75
|
case 3:
|
|
80
76
|
KUBE_URL = _a.sent();
|
|
81
77
|
_a.label = 4;
|
|
82
78
|
case 4:
|
|
83
79
|
_a.trys.push([4, 8, , 9]);
|
|
84
|
-
return [4 /*yield*/, (0,
|
|
80
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl delete serviceaccount --namespace ".concat(namespace, " ").concat(serviceAccountName))];
|
|
85
81
|
case 5:
|
|
86
82
|
_a.sent();
|
|
87
|
-
return [4 /*yield*/, (0,
|
|
83
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl delete rolebinding --namespace ".concat(namespace, " ").concat(serviceAccountName))];
|
|
88
84
|
case 6:
|
|
89
85
|
_a.sent();
|
|
90
|
-
return [4 /*yield*/, (0,
|
|
86
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl delete role --namespace ".concat(namespace, " ").concat(serviceAccountName))];
|
|
91
87
|
case 7:
|
|
92
88
|
_a.sent();
|
|
93
89
|
return [3 /*break*/, 9];
|
|
94
90
|
case 8:
|
|
95
91
|
e_1 = _a.sent();
|
|
96
92
|
return [3 /*break*/, 9];
|
|
97
|
-
case 9: return [4 /*yield*/, (0,
|
|
93
|
+
case 9: return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl create serviceaccount --namespace ".concat(namespace, " ").concat(serviceAccountName))];
|
|
98
94
|
case 10:
|
|
99
95
|
_a.sent();
|
|
100
96
|
// upsert role in the ns
|
|
101
|
-
return [4 /*yield*/, (0,
|
|
97
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("cat <<EOF | kubectl apply -f -\nkind: Role\napiVersion: rbac.authorization.k8s.io/v1\nmetadata:\n namespace: ".concat(namespace, "\n name: ").concat(serviceAccountName, "\nrules:\n- apiGroups: [\"\", \"extensions\", \"apps\", \"networking.k8s.io\", \"batch\", \"autoscaling\", \"rbac.authorization.k8s.io\",\"snapshot.storage.k8s.io\"]\n resources: [\"deployments\", \"replicasets\", \"statefulsets\", \"pods\", \"secrets\", \"configmaps\", \"services\", \"ingresses\", \"serviceaccounts\", \"roles\", \"rolebindings\", \"jobs\", \"cronjobs\", \"horizontalpodautoscalers\", \"persistentvolumeclaims\", \"volumesnapshots\"]\n verbs: [\"*\"]\n---\nkind: RoleBinding\napiVersion: rbac.authorization.k8s.io/v1\nmetadata:\n name: ").concat(serviceAccountName, "\n namespace: ").concat(namespace, "\nsubjects:\n - kind: ServiceAccount\n name: ").concat(serviceAccountName, "\n namespace: ").concat(namespace, "\nroleRef:\n kind: Role\n name: ").concat(serviceAccountName, "\n apiGroup: rbac.authorization.k8s.io\nEOF\n"))];
|
|
102
98
|
case 11:
|
|
103
99
|
// upsert role in the ns
|
|
104
100
|
_a.sent();
|
|
105
|
-
return [4 /*yield*/, (0,
|
|
101
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get serviceaccount --namespace ".concat(namespace, " ").concat(serviceAccountName, " -o jsonpath='{.secrets[0].name}'")).then(function (c) { return c.stdout.trim(); })];
|
|
106
102
|
case 12:
|
|
107
103
|
tokenName = _a.sent();
|
|
108
|
-
return [4 /*yield*/, (0,
|
|
104
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get secret ".concat(tokenName, " --namespace ").concat(namespace, " -o jsonpath=\"{['data']['ca\\.crt']}\"")).then(function (c) { return c.stdout.trim(); })];
|
|
109
105
|
case 13:
|
|
110
106
|
KUBE_CA_PEM = _a.sent();
|
|
111
|
-
return [4 /*yield*/, (0,
|
|
107
|
+
return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl get secret ".concat(tokenName, " --namespace ").concat(namespace, " -o jsonpath=\"{['data']['token']}\" | base64 --decode")).then(function (c) { return c.stdout.trim(); })];
|
|
112
108
|
case 14:
|
|
113
109
|
KUBE_TOKEN = _a.sent();
|
|
114
110
|
vars = {
|
|
@@ -129,5 +125,4 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
|
|
|
129
125
|
});
|
|
130
126
|
}); };
|
|
131
127
|
exports.setupKubernetes = setupKubernetes;
|
|
132
|
-
var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6, templateObject_7, templateObject_8, templateObject_9;
|
|
133
128
|
//# sourceMappingURL=setupKubernetes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAI6B;AAE7B,+DAA6C;AAC7C,wDAAgE;AAChE,sDAAiE;AACjE,6EAAuD;AAEhD,IAAM,eAAe,GAAG,UAC7B,QAAyB,EACzB,OAAgB;;;;;gBAEV,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;gBACpD,IAAI,CAAC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE;oBAC/C,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;iBAC7E;gBAEK,QAAQ,GAAG,IAAA,uCAA4B,EAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACpE,QAAQ,CAAC,GAAG,CAAC,mBAAY,QAAQ,CAAE,CAAC,CAAC;gBAErC,qBAAM,IAAA,0BAAgB,EAAC,QAAQ,CAAC,EAAA;;gBAAhC,SAAgC,CAAC;gBACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;gBACrB,qBAAM,IAAA,4BAAe,EAAC,OAAO,CAAC,EAAA;;gBAA1C,SAAS,GAAG,SAA8B;gBAChD,QAAQ,CAAC,GAAG,CAAC,YAAY,GAAG,SAAS,GAAG,qBAAqB,CAAC,CAAC;gBAC/D,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,mBAAmB;gBAEnB,mFAAmF;gBACnF,gEAAgE;gBAChE,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBACvC,kBAAkB,GAAG,aAAM,OAAO,CAAC,aAAa,YAAS,CAAC;gBAC/C,qBAAM,IAAA,4BAAI,EACzB,kHAAkH,CACnH,CAAC,IAAI,CAAC,UAAC,CAAM,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAf,CAAe,CAAC,EAAA;;gBAF7B,QAAQ,GAAG,SAEkB;;;;gBAIjC,qBAAM,IAAA,4BAAI,EACR,oDAA6C,SAAS,cAAI,kBAAkB,CAAE,CAC/E,EAAA;;gBAFD,SAEC,CAAC;gBACF,qBAAM,IAAA,4BAAI,EACR,iDAA0C,SAAS,cAAI,kBAAkB,CAAE,CAC5E,EAAA;;gBAFD,SAEC,CAAC;gBACF,qBAAM,IAAA,4BAAI,EACR,0CAAmC,SAAS,cAAI,kBAAkB,CAAE,CACrE,EAAA;;gBAFD,SAEC,CAAC;;;;;oBAKJ,qBAAM,IAAA,4BAAI,EACR,oDAA6C,SAAS,cAAI,kBAAkB,CAAE,CAC/E,EAAA;;gBAFD,SAEC,CAAC;gBAEF,wBAAwB;gBAExB,qBAAM,IAAA,4BAAI,EAAC,wHAIE,SAAS,uBACd,kBAAkB,2jBASlB,kBAAkB,4BACb,SAAS,8DAGZ,kBAAkB,+BACZ,SAAS,+CAGjB,kBAAkB,mDAG3B,CAAC,EAAA;;gBA3BA,wBAAwB;gBAExB,SAyBA,CAAC;gBAGiB,qBAAM,IAAA,4BAAI,EAC1B,iDAA0C,SAAS,cAAI,kBAAkB,sCAAmC,CAC7G,CAAC,IAAI,CAAC,UAAC,CAAM,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAf,CAAe,CAAC,EAAA;;gBAF7B,SAAS,GAAG,SAEiB;gBAEf,qBAAM,IAAA,4BAAI,EAC5B,6BAAsB,SAAS,0BAAgB,SAAS,4CAAuC,CAChG,CAAC,IAAI,CAAC,UAAC,CAAM,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAf,CAAe,CAAC,EAAA;;gBAF7B,WAAW,GAAG,SAEe;gBAChB,qBAAM,IAAA,4BAAI,EAC3B,6BAAsB,SAAS,0BAAgB,SAAS,2DAAsD,CAC/G,CAAC,IAAI,CAAC,UAAC,CAAM,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAf,CAAe,CAAC,EAAA;;gBAF7B,UAAU,GAAG,SAEgB;gBAE7B,IAAI,GAAG;oBACX,UAAU,YAAA;oBACV,WAAW,aAAA;oBACX,QAAQ,UAAA;iBACT,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAEpD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAE5C,qBAAM,IAAA,2BAAkB,EACtB,QAAQ,EACR,IAAI,EACJ,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,EACrB,KAAK,CAAC,YAAY;qBACnB,EAAA;;gBAND,SAMC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;;;;KACvB,CAAC;AA3GW,QAAA,eAAe,mBA2G1B"}
|
package/dist/catenv.js
CHANGED
|
@@ -4,10 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
var catenv_1 = __importDefault(require("./apps/catenv/catenv"));
|
|
7
|
-
var zx_1 = require("zx");
|
|
8
7
|
var getProjectConfig_1 = require("./config/getProjectConfig");
|
|
9
|
-
var choice =
|
|
10
|
-
|
|
8
|
+
var choice = process.argv[2] ? (0, getProjectConfig_1.parseChoice)(process.argv[2]) : null;
|
|
9
|
+
console.log(process.argv, choice);
|
|
11
10
|
(0, catenv_1["default"])(choice).then(function () {
|
|
12
11
|
// we have to exit manually, because we have some file watches
|
|
13
12
|
process.exit();
|
package/dist/catenv.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;
|
|
1
|
+
{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAE1C,8DAAwD;AAExD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,8BAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAErE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAElC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAClB,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -6,8 +6,6 @@ exports.__esModule = true;
|
|
|
6
6
|
var update_notifier_1 = __importDefault(require("update-notifier"));
|
|
7
7
|
var cli_1 = __importDefault(require("./apps/cli/cli"));
|
|
8
8
|
var packageInfos_1 = __importDefault(require("./packageInfos"));
|
|
9
|
-
var zx_1 = require("zx");
|
|
10
|
-
zx_1.$.verbose = false;
|
|
11
9
|
(0, update_notifier_1["default"])({
|
|
12
10
|
pkg: packageInfos_1["default"]
|
|
13
11
|
}).notify();
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;AAAA,oEAA6C;AAC7C,uDAAiC;AACjC,gEAA0C;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;AAAA,oEAA6C;AAC7C,uDAAiC;AACjC,gEAA0C;AAE1C,IAAA,4BAAc,EAAC;IACb,GAAG,EAAE,yBAAY;CAClB,CAAC,CAAC,MAAM,EAAE,CAAC;AACZ,IAAA,gBAAG,GAAE,CAAC"}
|