@catladder/cli 1.16.0 → 1.16.3
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/general/index.js +17 -9
- package/dist/apps/cli/commands/general/index.js.map +1 -1
- package/dist/apps/cli/commands/general/portForward.js +5 -6
- package/dist/apps/cli/commands/general/portForward.js.map +1 -1
- package/dist/apps/cli/commands/project/commandDeletePods.js +4 -3
- package/dist/apps/cli/commands/project/commandDeletePods.js.map +1 -1
- package/dist/apps/cli/commands/project/commandTriggerCronjob.js +2 -2
- package/dist/apps/cli/commands/project/commandTriggerCronjob.js.map +1 -1
- package/dist/apps/cli/commands/project/utils/ensureNamespace.js +6 -8
- package/dist/apps/cli/commands/project/utils/ensureNamespace.js.map +1 -1
- package/dist/k8sApi/index.d.ts +7 -5
- package/dist/k8sApi/index.js +23 -9
- package/dist/k8sApi/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/cluster.js +0 -2
- package/dist/utils/cluster.js.map +1 -1
- package/dist/utils/projects/index.js +7 -8
- package/dist/utils/projects/index.js.map +1 -1
- package/package.json +2 -2
- package/src/apps/cli/commands/general/index.ts +6 -7
- package/src/apps/cli/commands/general/portForward.ts +2 -1
- package/src/apps/cli/commands/project/commandDeletePods.ts +2 -1
- package/src/apps/cli/commands/project/commandTriggerCronjob.ts +3 -3
- package/src/apps/cli/commands/project/utils/ensureNamespace.ts +2 -1
- package/src/k8sApi/index.ts +20 -8
- package/src/utils/cluster.ts +0 -2
- package/src/utils/projects/index.ts +3 -1
|
@@ -41,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
exports.__esModule = true;
|
|
42
42
|
exports.getAllNamespacesNames = void 0;
|
|
43
43
|
var memoizee_1 = __importDefault(require("memoizee"));
|
|
44
|
-
var k8sApi_1 =
|
|
44
|
+
var k8sApi_1 = require("../../../../k8sApi");
|
|
45
45
|
var cluster_1 = require("../../../../utils/cluster");
|
|
46
46
|
var log_1 = require("../../../../utils/log");
|
|
47
47
|
var passwordstore_1 = require("../../../../utils/passwordstore");
|
|
@@ -50,10 +50,12 @@ var shell_1 = require("../../../../utils/shell");
|
|
|
50
50
|
var namespaceAutoCompletion_1 = require("./namespaceAutoCompletion");
|
|
51
51
|
var portForward_2 = __importDefault(require("./portForward"));
|
|
52
52
|
var getAllNamespaces = (0, memoizee_1["default"])(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
53
|
-
var res;
|
|
53
|
+
var k8sApi, res;
|
|
54
54
|
return __generator(this, function (_a) {
|
|
55
55
|
switch (_a.label) {
|
|
56
|
-
case 0:
|
|
56
|
+
case 0:
|
|
57
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
58
|
+
return [4 /*yield*/, k8sApi.listNamespace()];
|
|
57
59
|
case 1:
|
|
58
60
|
res = _a.sent();
|
|
59
61
|
return [2 /*return*/, res.body.items];
|
|
@@ -111,10 +113,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
111
113
|
.action(function (_a) {
|
|
112
114
|
var namespace = _a.namespace;
|
|
113
115
|
return __awaiter(this, void 0, void 0, function () {
|
|
114
|
-
var res;
|
|
116
|
+
var k8sApi, res;
|
|
115
117
|
return __generator(this, function (_b) {
|
|
116
118
|
switch (_b.label) {
|
|
117
|
-
case 0:
|
|
119
|
+
case 0:
|
|
120
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
121
|
+
return [4 /*yield*/, k8sApi.listNamespacedSecret(namespace)];
|
|
118
122
|
case 1:
|
|
119
123
|
res = _b.sent();
|
|
120
124
|
this.log(res.body.items.map(function (n) { return n.metadata.name; }).join("\n"));
|
|
@@ -142,10 +146,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
142
146
|
.action(function (_a) {
|
|
143
147
|
var namespace = _a.namespace;
|
|
144
148
|
return __awaiter(this, void 0, void 0, function () {
|
|
145
|
-
var res;
|
|
149
|
+
var k8sApi, res;
|
|
146
150
|
return __generator(this, function (_b) {
|
|
147
151
|
switch (_b.label) {
|
|
148
|
-
case 0:
|
|
152
|
+
case 0:
|
|
153
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
154
|
+
return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
|
|
149
155
|
case 1:
|
|
150
156
|
res = _b.sent();
|
|
151
157
|
this.log(res.body.items.map(function (n) { return n.metadata.name; }).join("\n"));
|
|
@@ -174,10 +180,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
174
180
|
.action(function (_a) {
|
|
175
181
|
var namespace = _a.namespace;
|
|
176
182
|
return __awaiter(this, void 0, void 0, function () {
|
|
177
|
-
var res, podNames, podName;
|
|
183
|
+
var k8sApi, res, podNames, podName;
|
|
178
184
|
return __generator(this, function (_b) {
|
|
179
185
|
switch (_b.label) {
|
|
180
|
-
case 0:
|
|
186
|
+
case 0:
|
|
187
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
188
|
+
return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
|
|
181
189
|
case 1:
|
|
182
190
|
res = _b.sent();
|
|
183
191
|
if (res.body.items.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAgC;AAEhC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,13 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
-
};
|
|
41
38
|
exports.__esModule = true;
|
|
42
39
|
var log_1 = require("../../../../utils/log");
|
|
43
40
|
var portForward_1 = require("../../../../utils/portForward");
|
|
44
|
-
var k8sApi_1 =
|
|
41
|
+
var k8sApi_1 = require("../../../../k8sApi");
|
|
45
42
|
var namespaceAutoCompletion_1 = require("./namespaceAutoCompletion");
|
|
46
43
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
47
44
|
return __generator(this, function (_a) {
|
|
@@ -51,10 +48,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
51
48
|
.action(function (_a) {
|
|
52
49
|
var namespace = _a.namespace;
|
|
53
50
|
return __awaiter(this, void 0, void 0, function () {
|
|
54
|
-
var res, podNames, podName, localPort, remotePort;
|
|
51
|
+
var k8sApi, res, podNames, podName, localPort, remotePort;
|
|
55
52
|
return __generator(this, function (_b) {
|
|
56
53
|
switch (_b.label) {
|
|
57
|
-
case 0:
|
|
54
|
+
case 0:
|
|
55
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
56
|
+
return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
|
|
58
57
|
case 1:
|
|
59
58
|
res = _b.sent();
|
|
60
59
|
if (res.body.items.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portForward.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/portForward.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"portForward.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/portForward.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAAiD;AAEjD,6DAAiE;AAEjE,6CAA+C;AAC/C,qEAAoE;AAEpE,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CAAC,0BAA0B,EAAE,uBAAuB,CAAC;iBAC5D,YAAY,CAAC,iDAAuB,CAAC;iBACrC,MAAM,CAAC,UAAgB,EAAa;oBAAX,SAAS,eAAA;;;;;;gCAC3B,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;gCACf,qBAAM,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;gCAA/C,GAAG,GAAG,SAAyC;gCACrD,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oCAC/B,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;oCACvC,sBAAO;iCACR;gCACK,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC;gCAE5D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;oCACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;oCACvC,sBAAO;iCACR;gCACmB,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACpC,IAAI,EAAE,MAAM;wCACZ,IAAI,EAAE,SAAS;wCACf,OAAO,EAAE,QAAQ;wCACjB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;gCALM,OAAO,GAAK,CAAA,SAKlB,CAAA,QALa;gCAOO,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACtC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,WAAW;wCAEjB,OAAO,EAAE,cAAc;qCACxB,CAAC,EAAA;;gCALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;gCAOM,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACvC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,YAAY;wCAElB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;gCALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gCAOlB,sBAAO,IAAA,8BAAgB,EAAC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,EAAC;;;;aACpE,CAAC,EAAA;;KAAA,EAAC"}
|
|
@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
39
39
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
40
|
};
|
|
41
41
|
exports.__esModule = true;
|
|
42
|
-
var k8sApi_1 =
|
|
42
|
+
var k8sApi_1 = require("../../../../k8sApi");
|
|
43
43
|
var log_1 = require("../../../../utils/log");
|
|
44
44
|
var projects_1 = require("../../../../utils/projects");
|
|
45
45
|
var autocompletions_1 = require("./utils/autocompletions");
|
|
@@ -57,7 +57,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
57
57
|
.action(function (_a) {
|
|
58
58
|
var envComponent = _a.envComponent;
|
|
59
59
|
return __awaiter(this, void 0, void 0, function () {
|
|
60
|
-
var namespace, podNames, selectedPodNames, shouldContinue, _i, selectedPodNames_1, podName;
|
|
60
|
+
var namespace, podNames, selectedPodNames, shouldContinue, k8sApi, _i, selectedPodNames_1, podName;
|
|
61
61
|
var _this = this;
|
|
62
62
|
return __generator(this, function (_b) {
|
|
63
63
|
switch (_b.label) {
|
|
@@ -94,13 +94,14 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
94
94
|
case 5:
|
|
95
95
|
shouldContinue = (_b.sent()).shouldContinue;
|
|
96
96
|
this.log("");
|
|
97
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
97
98
|
if (!shouldContinue) return [3 /*break*/, 9];
|
|
98
99
|
_i = 0, selectedPodNames_1 = selectedPodNames;
|
|
99
100
|
_b.label = 6;
|
|
100
101
|
case 6:
|
|
101
102
|
if (!(_i < selectedPodNames_1.length)) return [3 /*break*/, 9];
|
|
102
103
|
podName = selectedPodNames_1[_i];
|
|
103
|
-
return [4 /*yield*/,
|
|
104
|
+
return [4 /*yield*/, k8sApi.deleteNamespacedPod(podName, namespace, "true")];
|
|
104
105
|
case 7:
|
|
105
106
|
_b.sent();
|
|
106
107
|
this.log("deleted pod '".concat(podName, "'"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandDeletePods.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandDeletePods.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"commandDeletePods.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandDeletePods.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+C;AAE/C,6CAAiD;AACjD,uDAGoC;AACpC,2DAA2D;AAC3D,wEAAkD;AAElD,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CAAC,oCAAoC,EAAE,uBAAuB,CAAC,CAAA;qBACtE,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBAFxC,sBAAA,cAEgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;wCACpC,qBAAM,0BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,EAAA;;oCAA5C,SAA4C,CAAC;oCAC3B,qBAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,EAAA;;oCAAnD,SAAS,GAAG,SAAuC;oCACxC,qBAAM,IAAA,6BAAkB,EAAC,YAAY,CAAC,EAAA;;oCAAjD,QAAQ,GAAG,SAAsC;oCACvD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;wCACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;wCACvC,sBAAO;qCACR;oCAC4B,qBAAM,IAAI,CAAC,MAAM,CAAC;4CAC7C,IAAI,EAAE,UAAU;4CAChB,IAAI,EAAE,kBAAkB;4CACxB,OAAO,EAAE,QAAQ;4CACjB,OAAO,EAAE,uCAAuC;yCACjD,CAAC,EAAA;;oCALM,gBAAgB,GAAK,CAAA,SAK3B,CAAA,iBALsB;oCAOxB,IAAI,CAAC,GAAG,CACN,oEAAoE,CACrE,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,gBAAgB,CAAC,OAAO,CAAC,UAAC,CAAS,IAAK,OAAA,KAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC,CAAC;oCACrD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACc,qBAAM,IAAI,CAAC,MAAM,CAAC;4CAC3C,IAAI,EAAE,SAAS;4CACf,IAAI,EAAE,gBAAgB;4CACtB,OAAO,EAAE,iBAAiB;yCAC3B,CAAC,EAAA;;oCAJM,cAAc,GAAK,CAAA,SAIzB,CAAA,eAJoB;oCAKtB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACP,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;yCACvB,cAAc,EAAd,wBAAc;0CACsB,EAAhB,qCAAgB;;;yCAAhB,CAAA,8BAAgB,CAAA;oCAA3B,OAAO;oCAChB,qBAAM,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAA;;oCAA5D,SAA4D,CAAC;oCAC7D,IAAI,CAAC,GAAG,CAAC,uBAAgB,OAAO,MAAG,CAAC,CAAC;;;oCAFjB,IAAgB,CAAA;;;;;;iBAKzC,CAAC,EAAA;;;KAAA,EAAC"}
|
|
@@ -51,7 +51,7 @@ function triggerCronjob(namespace) {
|
|
|
51
51
|
var jobs, jobNames, jobName, cronjob, jobSpec, job, metadata, result, e_1;
|
|
52
52
|
return __generator(this, function (_a) {
|
|
53
53
|
switch (_a.label) {
|
|
54
|
-
case 0: return [4 /*yield*/, k8sApi_1.
|
|
54
|
+
case 0: return [4 /*yield*/, (0, k8sApi_1.getk8sApiBatchBeta)().listNamespacedCronJob(namespace)];
|
|
55
55
|
case 1:
|
|
56
56
|
jobs = (_a.sent()).body.items;
|
|
57
57
|
jobNames = jobs.map(function (j) { return j.metadata.name; });
|
|
@@ -74,7 +74,7 @@ function triggerCronjob(namespace) {
|
|
|
74
74
|
_a.label = 3;
|
|
75
75
|
case 3:
|
|
76
76
|
_a.trys.push([3, 5, , 6]);
|
|
77
|
-
return [4 /*yield*/, k8sApi_1.
|
|
77
|
+
return [4 /*yield*/, (0, k8sApi_1.getk8sApiBatch)().createNamespacedJob(namespace, job)];
|
|
78
78
|
case 4:
|
|
79
79
|
result = _a.sent();
|
|
80
80
|
this.log("");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandTriggerCronjob.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandTriggerCronjob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA8D;AAG9D,
|
|
1
|
+
{"version":3,"file":"commandTriggerCronjob.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandTriggerCronjob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA8D;AAG9D,6CAAwE;AACxE,6CAAiD;AACjD,8EAA6E;AAE7E,uDAAiE;AACjE,2DAA2D;AAC3D,wEAAkD;AAElD,SAAe,cAAc,CAAC,SAAiB;;;;;wBAGzC,qBAAM,IAAA,2BAAkB,GAAE,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAA;;oBAD9C,IAAI,GACjB,CAAA,SAA2D,CAAA,WAD1C;oBAGf,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC;oBAE9B,qBAAM,IAAI,CAAC,MAAM,CAAC;4BACpC,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,QAAQ;4BACjB,OAAO,EAAE,mBAAmB;yBAC7B,CAAC,EAAA;;oBALM,OAAO,GAAK,CAAA,SAKlB,CAAA,QALa;oBAOT,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAA3B,CAA2B,CAAC,CAAC;oBACxD,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;oBAExC,GAAG,GAAG,IAAI,mBAAK,EAAE,CAAC;oBAClB,QAAQ,GAA0B;wBACtC,IAAI,EAAE,iBAAU,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,cAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAE;qBACzE,CAAC;oBAEF,GAAG,CAAC,QAAQ,GAAG,QAAwB,CAAC;oBACxC,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;;;;oBAEF,qBAAM,IAAA,uBAAc,GAAE,CAAC,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,EAAA;;oBAAnE,MAAM,GAAG,SAA0D;oBAEzE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,iDAAgC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAE,CAAC,CAAC;oBACtE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;oBAEb,IAAA,cAAQ,EAAC,IAAI,EAAE,gBAAgB,EAAE,GAAC,CAAC,IAAI,CAAC,CAAC;;;;;;CAE5C;AACD,sBAAe,UAAO,MAAc;;;;;gBAClC,MAAM;qBACH,OAAO,CAAC,6BAA6B,EAAE,iBAAiB,CAAC;qBACzD,YAAY,CAAC,iDAAuB,CAAC;qBACrC,MAAM,CAAC,UAAgB,EAAa;wBAAX,SAAS,eAAA;;;;wCACjC,qBAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA;;oCAA1C,SAA0C,CAAC;;;;;iBAC5C,CAAC,CAAC;gBACL,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CAAC,wCAAwC,EAAE,iBAAiB,CAAC,CAAA;qBACpE,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;;gBAFxC,cAEgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;wCACpC,qBAAM,0BAAa,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,EAAA;;oCAA5C,SAA4C,CAAC;oCAC3B,qBAAM,IAAA,8BAAmB,EAAC,YAAY,CAAC,EAAA;;oCAAnD,SAAS,GAAG,SAAuC;oCACzD,qBAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAA;;oCAA1C,SAA0C,CAAC;;;;;iBAC5C,CAAC,CAAC;;;;KACN,EAAC"}
|
|
@@ -46,17 +46,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
|
-
};
|
|
52
49
|
exports.__esModule = true;
|
|
53
50
|
var pipeline_1 = require("@catladder/pipeline");
|
|
54
51
|
var client_node_1 = require("@kubernetes/client-node");
|
|
55
|
-
var k8sApi_1 =
|
|
52
|
+
var k8sApi_1 = require("../../../../../k8sApi");
|
|
56
53
|
function default_1(context) {
|
|
57
54
|
var _a, _b, _c, _d, _e;
|
|
58
55
|
return __awaiter(this, void 0, void 0, function () {
|
|
59
|
-
var namespace, namespaceBody, metadata, e_1;
|
|
56
|
+
var namespace, namespaceBody, metadata, k8sApi, e_1;
|
|
60
57
|
return __generator(this, function (_f) {
|
|
61
58
|
switch (_f.label) {
|
|
62
59
|
case 0:
|
|
@@ -75,13 +72,14 @@ function default_1(context) {
|
|
|
75
72
|
}))), ((_b = (_a = context.fullConfig.meta) === null || _a === void 0 ? void 0 : _a.labels) !== null && _b !== void 0 ? _b : {}))
|
|
76
73
|
};
|
|
77
74
|
namespaceBody.metadata = metadata;
|
|
75
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
78
76
|
_f.label = 1;
|
|
79
77
|
case 1:
|
|
80
78
|
_f.trys.push([1, 4, , 8]);
|
|
81
|
-
return [4 /*yield*/,
|
|
79
|
+
return [4 /*yield*/, k8sApi.readNamespace(namespace)];
|
|
82
80
|
case 2:
|
|
83
81
|
_f.sent();
|
|
84
|
-
return [4 /*yield*/,
|
|
82
|
+
return [4 /*yield*/, k8sApi.patchNamespace(namespace, namespaceBody, undefined, undefined, undefined, undefined, { headers: { "content-type": "application/merge-patch+json" } } // see https://github.com/kubernetes-client/javascript/issues/443
|
|
85
83
|
)];
|
|
86
84
|
case 3:
|
|
87
85
|
_f.sent(); // update meta data
|
|
@@ -89,7 +87,7 @@ function default_1(context) {
|
|
|
89
87
|
case 4:
|
|
90
88
|
e_1 = _f.sent();
|
|
91
89
|
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*/,
|
|
90
|
+
return [4 /*yield*/, k8sApi.createNamespace(namespaceBody)];
|
|
93
91
|
case 5:
|
|
94
92
|
_f.sent();
|
|
95
93
|
return [3 /*break*/, 7];
|
|
@@ -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,gDAAkD;AAElD,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;oBAC5B,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;;;;oBAEzB,qBAAM,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAA;;oBAArC,SAAqC,CAAC;oBAEtC,qBAAM,MAAM,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,MAAM,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;AAnDD,+BAmDC"}
|
package/dist/k8sApi/index.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { CoreV1Api, BatchV1Api, BatchV1beta1Api } from "@kubernetes/client-node";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export
|
|
2
|
+
/**
|
|
3
|
+
* get kubernetes client. avoid reusing the instance when context get changed
|
|
4
|
+
* @returns kuberenetes client
|
|
5
|
+
*/
|
|
6
|
+
export declare const getk8sApi: () => CoreV1Api;
|
|
7
|
+
export declare const getk8sApiBatch: () => BatchV1Api;
|
|
8
|
+
export declare const getk8sApiBatchBeta: () => BatchV1beta1Api;
|
package/dist/k8sApi/index.js
CHANGED
|
@@ -1,15 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
exports.__esModule = true;
|
|
3
|
-
exports.
|
|
3
|
+
exports.getk8sApiBatchBeta = exports.getk8sApiBatch = exports.getk8sApi = void 0;
|
|
4
4
|
var client_node_1 = require("@kubernetes/client-node");
|
|
5
|
-
var
|
|
6
|
-
var
|
|
5
|
+
var getKubeConfig = function () {
|
|
6
|
+
var kc = new client_node_1.KubeConfig();
|
|
7
7
|
kc.loadFromDefault();
|
|
8
|
+
return kc;
|
|
8
9
|
};
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
/**
|
|
11
|
+
* get kubernetes client. avoid reusing the instance when context get changed
|
|
12
|
+
* @returns kuberenetes client
|
|
13
|
+
*/
|
|
14
|
+
var getk8sApi = function () {
|
|
15
|
+
var kc = getKubeConfig();
|
|
16
|
+
return kc.makeApiClient(client_node_1.CoreV1Api);
|
|
17
|
+
};
|
|
18
|
+
exports.getk8sApi = getk8sApi;
|
|
19
|
+
var getk8sApiBatch = function () {
|
|
20
|
+
var kc = getKubeConfig();
|
|
21
|
+
return kc.makeApiClient(client_node_1.BatchV1Api);
|
|
22
|
+
};
|
|
23
|
+
exports.getk8sApiBatch = getk8sApiBatch;
|
|
24
|
+
var getk8sApiBatchBeta = function () {
|
|
25
|
+
var kc = getKubeConfig();
|
|
26
|
+
return kc.makeApiClient(client_node_1.BatchV1beta1Api);
|
|
27
|
+
};
|
|
28
|
+
exports.getk8sApiBatchBeta = getk8sApiBatchBeta;
|
|
15
29
|
//# sourceMappingURL=index.js.map
|
package/dist/k8sApi/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/k8sApi/index.ts"],"names":[],"mappings":";;;AAAA,uDAKiC;AAEjC,IAAM,EAAE,GAAG,IAAI,wBAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/k8sApi/index.ts"],"names":[],"mappings":";;;AAAA,uDAKiC;AAEjC,IAAM,aAAa,GAAG;IACpB,IAAM,EAAE,GAAG,IAAI,wBAAU,EAAE,CAAC;IAC5B,EAAE,CAAC,eAAe,EAAE,CAAC;IACrB,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AACF;;;GAGG;AACI,IAAM,SAAS,GAAG;IACvB,IAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,uBAAS,CAAC,CAAC;AACrC,CAAC,CAAC;AAJW,QAAA,SAAS,aAIpB;AAEK,IAAM,cAAc,GAAG;IAC5B,IAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,wBAAU,CAAC,CAAC;AACtC,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,IAAM,kBAAkB,GAAG;IAChC,IAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3B,OAAO,EAAE,CAAC,aAAa,CAAC,6BAAe,CAAC,CAAC;AAC3C,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B"}
|