@catladder/cli 1.2.0 → 1.3.0
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/commandInitGitlab.js +2 -3
- package/dist/apps/cli/commands/project/commandInitGitlab.js.map +1 -1
- package/dist/apps/cli/commands/project/utils/ensureNamespace.d.ts +2 -1
- package/dist/apps/cli/commands/project/utils/ensureNamespace.js +50 -20
- package/dist/apps/cli/commands/project/utils/ensureNamespace.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/apps/cli/commands/project/commandInitGitlab.ts +1 -5
- package/src/apps/cli/commands/project/utils/ensureNamespace.ts +42 -6
|
@@ -73,10 +73,9 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
73
73
|
return [4 /*yield*/, (0, cluster_1.connectToCluster)(fullName)];
|
|
74
74
|
case 3:
|
|
75
75
|
_a.sent();
|
|
76
|
-
|
|
77
|
-
return [4 /*yield*/, (0, ensureNamespace_1["default"])(namespace)];
|
|
76
|
+
return [4 /*yield*/, (0, ensureNamespace_1["default"])(context)];
|
|
78
77
|
case 4:
|
|
79
|
-
_a.sent();
|
|
78
|
+
namespace = _a.sent();
|
|
80
79
|
serviceAccountName = "cl-".concat(context.componentName, "-deploy");
|
|
81
80
|
return [4 /*yield*/, (0, zx_1.$)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'"], ["TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'"]))).then(function (s) { return s.stdout.trim(); })];
|
|
82
81
|
case 5:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandInitGitlab.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandInitGitlab.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAI6B;AAE7B,yBAAuB;AACvB,wEAA6E;AAC7E,qDAA6D;AAC7D,mDAA8D;AAC9D,4EAAsD;AAEtD,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CACN,qBAAqB,EACrB,8DAA8D,CAC/D;iBACA,MAAM,CAAC;;;;;oCACa,qBAAM,IAAA,yCAAsB,GAAE,EAAA;;gCAA3C,UAAU,GAAG,SAA8B;sCAEjB,EAAV,yBAAU;;;qCAAV,CAAA,wBAAU,CAAA;gCAArB,OAAO;gCACV,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;qCAChD,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,yBAA0C;gCACtC,QAAQ,GAAG,IAAA,uCAA4B,EAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gCACpE,IAAI,CAAC,GAAG,CACN,qBAAc,OAAO,CAAC,WAAW,CAAC,SAAS,cAAI,OAAO,CAAC,aAAa,cAAI,QAAQ,CAAE,CACnF,CAAC;gCAEF,qBAAM,IAAA,0BAAgB,EAAC,QAAQ,CAAC,EAAA;;gCAAhC,SAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"commandInitGitlab.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandInitGitlab.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import { Context } from "@catladder/pipeline";
|
|
2
|
+
export default function (context: Context): Promise<string>;
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
14
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
15
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -39,35 +50,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
39
50
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
51
|
};
|
|
41
52
|
exports.__esModule = true;
|
|
53
|
+
var pipeline_1 = require("@catladder/pipeline");
|
|
42
54
|
var client_node_1 = require("@kubernetes/client-node");
|
|
43
55
|
var k8sApi_1 = __importDefault(require("../../../../../k8sApi"));
|
|
44
|
-
function default_1(
|
|
45
|
-
var _a, _b;
|
|
56
|
+
function default_1(context) {
|
|
57
|
+
var _a, _b, _c, _d, _e;
|
|
46
58
|
return __awaiter(this, void 0, void 0, function () {
|
|
47
|
-
var
|
|
48
|
-
return __generator(this, function (
|
|
49
|
-
switch (
|
|
59
|
+
var namespace, namespaceBody, metadata, e_1;
|
|
60
|
+
return __generator(this, function (_f) {
|
|
61
|
+
switch (_f.label) {
|
|
50
62
|
case 0:
|
|
51
|
-
|
|
52
|
-
return [4 /*yield*/, k8sApi_1["default"].readNamespace(namespace)];
|
|
53
|
-
case 1:
|
|
54
|
-
_c.sent();
|
|
55
|
-
return [3 /*break*/, 6];
|
|
56
|
-
case 2:
|
|
57
|
-
e_1 = _c.sent();
|
|
58
|
-
if (!(((_b = (_a = e_1.response) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.reason) === "NotFound")) return [3 /*break*/, 4];
|
|
63
|
+
namespace = (0, pipeline_1.getKubernetesNamespace)(context.fullConfig, context.environment.shortName);
|
|
59
64
|
namespaceBody = new client_node_1.V1Namespace();
|
|
60
65
|
metadata = {
|
|
61
|
-
name: namespace
|
|
66
|
+
name: namespace,
|
|
67
|
+
labels: __assign(__assign({ customerName: context.fullConfig.customerName, appName: context.fullConfig.appName, environment: context.environment.shortName, components: Object.keys(context.fullConfig.components).join("_"), buildTypes: Object.values(context.fullConfig.components)
|
|
68
|
+
.map(function (config) { return config.build.type; })
|
|
69
|
+
.join("_") }, Object.fromEntries(Object.entries(context.fullConfig.components).map(function (_a) {
|
|
70
|
+
var componentName = _a[0], config = _a[1];
|
|
71
|
+
return [
|
|
72
|
+
"buildType_" + componentName,
|
|
73
|
+
config.build.type,
|
|
74
|
+
];
|
|
75
|
+
}))), ((_b = (_a = context.fullConfig.meta) === null || _a === void 0 ? void 0 : _a.labels) !== null && _b !== void 0 ? _b : {}))
|
|
62
76
|
};
|
|
63
77
|
namespaceBody.metadata = metadata;
|
|
64
|
-
|
|
78
|
+
_f.label = 1;
|
|
79
|
+
case 1:
|
|
80
|
+
_f.trys.push([1, 4, , 8]);
|
|
81
|
+
return [4 /*yield*/, k8sApi_1["default"].readNamespace(namespace)];
|
|
82
|
+
case 2:
|
|
83
|
+
_f.sent();
|
|
84
|
+
return [4 /*yield*/, k8sApi_1["default"].patchNamespace(namespace, namespaceBody, undefined, undefined, undefined, undefined, { headers: { "content-type": "application/merge-patch+json" } } // see https://github.com/kubernetes-client/javascript/issues/443
|
|
85
|
+
)];
|
|
65
86
|
case 3:
|
|
66
|
-
|
|
67
|
-
return [3 /*break*/,
|
|
68
|
-
case 4:
|
|
69
|
-
|
|
70
|
-
|
|
87
|
+
_f.sent(); // update meta data
|
|
88
|
+
return [3 /*break*/, 8];
|
|
89
|
+
case 4:
|
|
90
|
+
e_1 = _f.sent();
|
|
91
|
+
if (!(((_d = (_c = e_1.response) === null || _c === void 0 ? void 0 : _c.body) === null || _d === void 0 ? void 0 : _d.reason) === "NotFound")) return [3 /*break*/, 6];
|
|
92
|
+
return [4 /*yield*/, k8sApi_1["default"].createNamespace(namespaceBody)];
|
|
93
|
+
case 5:
|
|
94
|
+
_f.sent();
|
|
95
|
+
return [3 /*break*/, 7];
|
|
96
|
+
case 6:
|
|
97
|
+
console.error((_e = e_1.response) === null || _e === void 0 ? void 0 : _e.body);
|
|
98
|
+
throw e_1;
|
|
99
|
+
case 7: return [3 /*break*/, 8];
|
|
100
|
+
case 8: return [2 /*return*/, namespace];
|
|
71
101
|
}
|
|
72
102
|
});
|
|
73
103
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureNamespace.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/utils/ensureNamespace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ensureNamespace.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/utils/ensureNamespace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAsE;AACtE,uDAAoE;AACpE,iEAA2C;AAE3C,mBAA+B,OAAgB;;;;;;;oBACvC,SAAS,GAAG,IAAA,iCAAsB,EACtC,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,CAAC,SAAS,CAC9B,CAAC;oBACI,aAAa,GAAG,IAAI,yBAAW,EAAE,CAAC;oBAClC,QAAQ,GAAiB;wBAC7B,IAAI,EAAE,SAAS;wBACf,MAAM,sBACJ,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,EAC7C,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,EACnC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,EAC1C,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAChE,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;iCACrD,GAAG,CAAC,UAAC,MAAM,IAAK,OAAA,MAAM,CAAC,KAAK,CAAC,IAAI,EAAjB,CAAiB,CAAC;iCAClC,IAAI,CAAC,GAAG,CAAC,IACT,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,GAAG,CAC/C,UAAC,EAAuB;gCAAtB,aAAa,QAAA,EAAE,MAAM,QAAA;4BAAM,OAAA;gCAC3B,YAAY,GAAG,aAAa;gCAC5B,MAAM,CAAC,KAAK,CAAC,IAAI;6BAClB;wBAH4B,CAG5B,CACF,CACF,GACE,CAAC,MAAA,MAAA,OAAO,CAAC,UAAU,CAAC,IAAI,0CAAE,MAAM,mCAAI,EAAE,CAAC,CAC3C;qBACF,CAAC;oBAEF,aAAa,CAAC,QAAQ,GAAG,QAAQ,CAAC;;;;oBAEhC,qBAAM,mBAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAA;;oBAArC,SAAqC,CAAC;oBAEtC,qBAAM,mBAAM,CAAC,cAAc,CACzB,SAAS,EACT,aAAa,EACb,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,8BAA8B,EAAE,EAAE,CAAC,iEAAiE;yBAClI,EAAA;;oBARD,SAQC,CAAC,CAAC,mBAAmB;;;;yBAElB,CAAA,CAAA,MAAA,MAAA,GAAC,CAAC,QAAQ,0CAAE,IAAI,0CAAE,MAAM,MAAK,UAAU,CAAA,EAAvC,wBAAuC;oBACzC,qBAAM,mBAAM,CAAC,eAAe,CAAC,aAAa,CAAC,EAAA;;oBAA3C,SAA2C,CAAC;;;oBAE5C,OAAO,CAAC,KAAK,CAAC,MAAA,GAAC,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;oBAChC,MAAM,GAAC,CAAC;;wBAGZ,sBAAO,SAAS,EAAC;;;;CAClB;AAlDD,+BAkDC"}
|