runlify 0.0.350 → 0.0.351

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.
Files changed (8) hide show
  1. package/build/projectsGeneration/builders/{WorkerBuilder.js → DeploymentBuilder.js} +11 -10
  2. package/build/projectsGeneration/builders/SystemMetaBuilder.js +25 -29
  3. package/build/projectsGeneration/generators/fileTemplates/back/environment/chart/values.js +2 -2
  4. package/build/projectsGeneration/generators/fileTemplates/ui/environment/chart/values.js +2 -2
  5. package/build/types/projectsGeneration/builders/{WorkerBuilder.d.ts → DeploymentBuilder.d.ts} +3 -2
  6. package/build/types/projectsGeneration/builders/SystemMetaBuilder.d.ts +5 -8
  7. package/build/types/projectsGeneration/builders/buildedTypes.d.ts +4 -5
  8. package/package.json +1 -1
package/build/projectsGeneration/builders/{WorkerBuilder.js → DeploymentBuilder.js} RENAMED
@@ -30,18 +30,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
30
30
  };
31
31
  Object.defineProperty(exports, "__esModule", { value: true });
32
32
  var BaseBuilder_1 = __importDefault(require("./BaseBuilder"));
33
- var WorkerBuilder = /** @class */ (function (_super) {
34
- __extends(WorkerBuilder, _super);
35
- function WorkerBuilder(name, defaultLanguage, title) {
33
+ var DeploymentBuilder = /** @class */ (function (_super) {
34
+ __extends(DeploymentBuilder, _super);
35
+ function DeploymentBuilder(name, defaultLanguage, title) {
36
36
  var _this = _super.call(this, name, defaultLanguage, { singular: title }) || this;
37
+ _this.replicas = 1;
37
38
  _this.requests = { memory: '64Mi', cpu: '0.15' };
38
39
  _this.limits = { memory: '64Mi', cpu: '0.15' };
39
40
  return _this;
40
41
  }
41
- WorkerBuilder.prototype.build = function () {
42
- return __assign(__assign({}, _super.prototype.build.call(this)), { requests: this.requests, limits: this.limits });
42
+ DeploymentBuilder.prototype.build = function () {
43
+ return __assign(__assign({}, _super.prototype.build.call(this)), { replicas: this.replicas, requests: this.requests, limits: this.limits });
43
44
  };
44
- WorkerBuilder.prototype.setMemory = function (request, limit) {
45
+ DeploymentBuilder.prototype.setMemory = function (request, limit) {
45
46
  this.requests.memory = request;
46
47
  if (limit) {
47
48
  this.limits.memory = limit;
@@ -51,7 +52,7 @@ var WorkerBuilder = /** @class */ (function (_super) {
51
52
  }
52
53
  return this;
53
54
  };
54
- WorkerBuilder.prototype.setCpu = function (request, limit) {
55
+ DeploymentBuilder.prototype.setCpu = function (request, limit) {
55
56
  this.requests.cpu = request;
56
57
  if (limit) {
57
58
  this.limits.cpu = limit;
@@ -61,7 +62,7 @@ var WorkerBuilder = /** @class */ (function (_super) {
61
62
  }
62
63
  return this;
63
64
  };
64
- return WorkerBuilder;
65
+ return DeploymentBuilder;
65
66
  }(BaseBuilder_1.default));
66
- exports.default = WorkerBuilder;
67
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV29ya2VyQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcm9qZWN0c0dlbmVyYXRpb24vYnVpbGRlcnMvV29ya2VyQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsOERBQXVDO0FBRXZDO0lBQTRCLGlDQUFXO0lBSXJDLHVCQUFZLElBQVksRUFBRSxlQUF1QixFQUFFLEtBQWM7UUFBakUsWUFDRSxrQkFBTSxJQUFJLEVBQUUsZUFBZSxFQUFFLEVBQUMsUUFBUSxFQUFFLEtBQUssRUFBQyxDQUFDLFNBQ2hEO1FBTEQsY0FBUSxHQUFpQixFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxDQUFBO1FBQ3hELFlBQU0sR0FBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsQ0FBQTs7SUFJdEQsQ0FBQztJQUVELDZCQUFLLEdBQUw7UUFDRSw2QkFDSyxpQkFBTSxLQUFLLFdBQUUsS0FDaEIsUUFBUSxFQUFFLElBQUksQ0FBQyxRQUFRLEVBQ3ZCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxJQUNwQjtJQUNILENBQUM7SUFFRCxpQ0FBUyxHQUFULFVBQVUsT0FBZSxFQUFFLEtBQWM7UUFDdkMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsT0FBTyxDQUFBO1FBRTlCLElBQUksS0FBSyxFQUFFO1lBQ1QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEdBQUcsS0FBSyxDQUFBO1NBQzNCO2FBQU07WUFDTCxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUE7U0FDN0I7UUFFRCxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUM7SUFFRCw4QkFBTSxHQUFOLFVBQU8sT0FBZSxFQUFFLEtBQWM7UUFDcEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLEdBQUcsT0FBTyxDQUFBO1FBRTNCLElBQUksS0FBSyxFQUFFO1lBQ1QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEdBQUcsS0FBSyxDQUFBO1NBQ3hCO2FBQU07WUFDTCxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsR0FBRyxPQUFPLENBQUE7U0FDMUI7UUFFRCxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUM7SUFDSCxvQkFBQztBQUFELENBQUMsQUF2Q0QsQ0FBNEIscUJBQVcsR0F1Q3RDO0FBRUQsa0JBQWUsYUFBYSxDQUFBIn0=
67
+ exports.default = DeploymentBuilder;
68
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVwbG95bWVudEJ1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2J1aWxkZXJzL0RlcGxveW1lbnRCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDQSw4REFBdUM7QUFFdkM7SUFBZ0MscUNBQVc7SUFLekMsMkJBQVksSUFBWSxFQUFFLGVBQXVCLEVBQUUsS0FBYztRQUFqRSxZQUNFLGtCQUFNLElBQUksRUFBRSxlQUFlLEVBQUUsRUFBQyxRQUFRLEVBQUUsS0FBSyxFQUFDLENBQUMsU0FDaEQ7UUFORCxjQUFRLEdBQVcsQ0FBQyxDQUFBO1FBQ3BCLGNBQVEsR0FBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsQ0FBQTtRQUN4RCxZQUFNLEdBQWlCLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLENBQUE7O0lBSXRELENBQUM7SUFFRCxpQ0FBSyxHQUFMO1FBQ0UsNkJBQ0ssaUJBQU0sS0FBSyxXQUFFLEtBQ2hCLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUSxFQUN2QixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFDdkIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNLElBQ3BCO0lBQ0gsQ0FBQztJQUVELHFDQUFTLEdBQVQsVUFBVSxPQUFlLEVBQUUsS0FBYztRQUN2QyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUE7UUFFOUIsSUFBSSxLQUFLLEVBQUU7WUFDVCxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxLQUFLLENBQUE7U0FDM0I7YUFBTTtZQUNMLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQTtTQUM3QjtRQUVELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQztJQUVELGtDQUFNLEdBQU4sVUFBTyxPQUFlLEVBQUUsS0FBYztRQUNwQyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsR0FBRyxPQUFPLENBQUE7UUFFM0IsSUFBSSxLQUFLLEVBQUU7WUFDVCxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsR0FBRyxLQUFLLENBQUE7U0FDeEI7YUFBTTtZQUNMLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxHQUFHLE9BQU8sQ0FBQTtTQUMxQjtRQUVELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQztJQUNILHdCQUFDO0FBQUQsQ0FBQyxBQXpDRCxDQUFnQyxxQkFBVyxHQXlDMUM7QUFFRCxrQkFBZSxpQkFBaUIsQ0FBQSJ9
package/build/projectsGeneration/builders/SystemMetaBuilder.js CHANGED
@@ -56,7 +56,7 @@ var defaultCatalogs_1 = require("../defaultCatalogs");
56
56
  var R = __importStar(require("ramda"));
57
57
  var ReportBuilder_1 = __importDefault(require("./ReportBuilder"));
58
58
  var RestApiBuilder_1 = __importDefault(require("./RestApiBuilder"));
59
- var WorkerBuilder_1 = __importDefault(require("./WorkerBuilder"));
59
+ var DeploymentBuilder_1 = __importDefault(require("./DeploymentBuilder"));
60
60
  var TelegramBotBuilder_1 = __importDefault(require("./TelegramBotBuilder"));
61
61
  exports.defaultConfigVar = {
62
62
  needFor: '',
@@ -65,6 +65,8 @@ exports.defaultConfigVar = {
65
65
  scopes: ['back', 'worker', 'telegramBot'],
66
66
  };
67
67
  var SystemMetaBuilder = /** @class */ (function () {
68
+ // requests: MemoryAndCpu = { memory: '128Mi', cpu: '0.15' }
69
+ // limits: MemoryAndCpu = { memory: '256Mi', cpu: '1' }
68
70
  // space = '';
69
71
  function SystemMetaBuilder(prefix, defOpts, defaultLanguage) {
70
72
  if (defOpts === void 0) { defOpts = types_1.defaultBootstrapEntityOptions; }
@@ -86,11 +88,10 @@ var SystemMetaBuilder = /** @class */ (function () {
86
88
  this.name = 'notSet';
87
89
  this.prefix = 'notSet';
88
90
  this.needFor = 'notSet';
89
- this.requests = { memory: '128Mi', cpu: '0.15' };
90
- this.limits = { memory: '256Mi', cpu: '1' };
91
91
  this.defOpts = defOpts;
92
92
  this.setPrefix(prefix);
93
93
  this.setName(prefix);
94
+ this.back = new DeploymentBuilder_1.default('back', defaultLanguage);
94
95
  this.addConfigVar('app.name', 'string', true, this.defOpts.projectPrefix, 'Техническое название приложения');
95
96
  this.addConfigVar('app.title', 'string', false, this.defOpts.projectName, 'Человеческое название приложения');
96
97
  this.addConfigVar('app.environment', 'string', true, 'dev', 'Название окружения');
@@ -268,7 +269,7 @@ var SystemMetaBuilder = /** @class */ (function () {
268
269
  if (this.workers.some(function (f) { return f.name === name; })) {
269
270
  throw new Error("There is already rest api with name \"".concat(name, "\""));
270
271
  }
271
- var worker = new WorkerBuilder_1.default(name, this.defaultLanguage, title);
272
+ var worker = new DeploymentBuilder_1.default(name, this.defaultLanguage, title);
272
273
  this.workers.push(worker);
273
274
  return worker;
274
275
  };
@@ -356,26 +357,24 @@ var SystemMetaBuilder = /** @class */ (function () {
356
357
  .map(function (e) { return e.entity; })
357
358
  .filter(function (e) { return e.externalSearch; });
358
359
  };
359
- SystemMetaBuilder.prototype.setMemory = function (request, limit) {
360
- this.requests.memory = request;
361
- if (limit) {
362
- this.limits.memory = limit;
363
- }
364
- else {
365
- this.limits.memory = request;
366
- }
367
- return this;
368
- };
369
- SystemMetaBuilder.prototype.setCpu = function (request, limit) {
370
- this.requests.cpu = request;
371
- if (limit) {
372
- this.limits.cpu = limit;
373
- }
374
- else {
375
- this.limits.cpu = request;
376
- }
377
- return this;
378
- };
360
+ // setMemory(request: string, limit?: string) {
361
+ // this.requests.memory = request
362
+ // if (limit) {
363
+ // this.limits.memory = limit
364
+ // } else {
365
+ // this.limits.memory = request
366
+ // }
367
+ // return this
368
+ // }
369
+ // setCpu(request: string, limit?: string) {
370
+ // this.requests.cpu = request
371
+ // if (limit) {
372
+ // this.limits.cpu = limit
373
+ // } else {
374
+ // this.limits.cpu = request
375
+ // }
376
+ // return this
377
+ // }
379
378
  SystemMetaBuilder.prototype.build = function () {
380
379
  var sortByName = function (entries) {
381
380
  return R.sortBy(R.compose(R.prop('name'), R.prop('entity')), entries);
@@ -412,10 +411,7 @@ var SystemMetaBuilder = /** @class */ (function () {
412
411
  return worker.build();
413
412
  }),
414
413
  roles: R.sortBy(R.prop('name'), this.roles).map(function (role) { return role.build(); }),
415
- back: {
416
- requests: this.requests,
417
- limits: this.limits,
418
- },
414
+ back: this.back.build(),
419
415
  };
420
416
  };
421
417
  SystemMetaBuilder.prototype.initDefaultCatalogs = function () {
@@ -425,4 +421,4 @@ var SystemMetaBuilder = /** @class */ (function () {
425
421
  return SystemMetaBuilder;
426
422
  }());
427
423
  exports.default = SystemMetaBuilder;
428
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SystemMetaBuilder.js","sourceRoot":"","sources":["../../../src/projectsGeneration/builders/SystemMetaBuilder.ts"],"names":[],"mappings":"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"}
424
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SystemMetaBuilder.js","sourceRoot":"","sources":["../../../src/projectsGeneration/builders/SystemMetaBuilder.ts"],"names":[],"mappings":"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"}
package/build/projectsGeneration/generators/fileTemplates/back/environment/chart/values.js CHANGED
@@ -7,7 +7,7 @@ var chartValuesTmpl = function (_a) {
7
7
  var prefix = _a.system.prefix, system = _a.system, options = _a.options;
8
8
  return "".concat(options.skipWarningThisIsGenerated
9
9
  ? ''
10
- : "\n# ".concat(utils_1.generatedWarning, "\n"), "global:\n env: noName\n clusterName: noName\n deployKind: noName\n imagePullPolicy: Always\n\ndev: false\n\ndocker:\n registry: ").concat(options.ciDockerRegistry, "/").concat(options.projectsGroup, "\n\napp:\n tag: :master\n replicas: 1\n\nimage:\n repository: nginx\n tag: stable\n pullPolicy: IfNotPresent\n\nimagePullSecrets:\n - name: ").concat(options.k8sImagePullSecrets, "\n\nnameOverride: \"\"\nfullnameOverride: \"\"\n\nservice:\n type: ClusterIP\n port: \"80\"\n\ndeployment:\n annotations:\n prometheus.io/path: '/metrics'\n prometheus.io/scrape: true\n prometheus.io/port: 2100\n\nback:\n enabled: true\n requests:\n memory: \"").concat(system.back.requests.memory, "\"\n cpu: \"").concat(system.back.requests.cpu, "\"\n limits:\n memory: \"").concat(system.back.limits.memory, "\"\n cpu: \"").concat(system.back.limits.cpu, "\"\n\ningress:\n enabled: true\n\nmetrics:\n enabled: true\n\nworker:\n enabled: false\n replicas: 1\n requests:\n memory: \"64Mi\"\n cpu: \"0.15\"\n limits:\n memory: \"64Mi\"\n cpu: \"0.15\"\n\nworkers:").concat(system.workers
10
+ : "\n# ".concat(utils_1.generatedWarning, "\n"), "\nglobal:\n env: noName\n clusterName: noName\n deployKind: noName\n imagePullPolicy: Always\n\ndev: false\n\ndocker:\n registry: ").concat(options.ciDockerRegistry, "/").concat(options.projectsGroup, "\n\napp:\n tag: :master\n replicas: 1\n\nimage:\n repository: nginx\n tag: stable\n pullPolicy: IfNotPresent\n\nimagePullSecrets:\n - name: ").concat(options.k8sImagePullSecrets, "\n\nnameOverride: \"\"\nfullnameOverride: \"\"\n\nservice:\n type: ClusterIP\n port: \"80\"\n\ndeployment:\n annotations:\n prometheus.io/path: '/metrics'\n prometheus.io/scrape: true\n prometheus.io/port: 2100\n\nback:\n enabled: true\n requests:\n memory: \"").concat(system.back.requests.memory, "\"\n cpu: \"").concat(system.back.requests.cpu, "\"\n limits:\n memory: \"").concat(system.back.limits.memory, "\"\n cpu: \"").concat(system.back.limits.cpu, "\"\n\ningress:\n enabled: true\n\nmetrics:\n enabled: true\n\nworker:\n enabled: false\n replicas: 1\n requests:\n memory: \"64Mi\"\n cpu: \"0.15\"\n limits:\n memory: \"64Mi\"\n cpu: \"0.15\"\n\nworkers:").concat(system.workers
11
11
  .map(function (worker) { return "\n - name: ".concat((0, change_case_1.paramCase)(worker.name), "\n file: dist/workers/").concat(worker.name, "/").concat(worker.name, "Worker.js\n requests:\n memory: \"").concat(worker.requests.memory, "\"\n cpu: \"").concat(worker.requests.cpu, "\"\n limits:\n memory: \"").concat(worker.limits.memory, "\"\n cpu: \"").concat(worker.limits.cpu, "\""); })
12
12
  .join(''), "\n\nbot:\n enabled: false\n replicas: 1\n requests:\n memory: \"128Mi\"\n cpu: \"0.5\"\n limits:\n memory: \"256Mi\"\n cpu: \"1\"\n\nbots:").concat(system.telegramBots
13
13
  .map(function (_a) {
@@ -17,4 +17,4 @@ var chartValuesTmpl = function (_a) {
17
17
  .join(''), "\n\napollo:\n key: ''\n\ndatabase:\n uri: ''\n\ningress:\n annotations:\n nginx.ingress.kubernetes.io/limit-connections: \"100\"\n nginx.ingress.kubernetes.io/limit-rps: \"300\"\n nginx.ingress.kubernetes.io/limit-rpm: \"5000\"\n nginx.ingress.kubernetes.io/affinity: \"cookie\"\n nginx.ingress.kubernetes.io/proxy-body-size: \"50m\"\n host: \"").concat(options.k8sAppsDomain, "\"\n letsencryptCert: true\n domain: \"").concat(options.k8sSubdomainPrefix || prefix, "-ep\"\n\nresources:\n {}\n # We usually recommend not to specify default resources and to leave this as a conscious\n # choice for the user. This also increases chances charts run on environments with little\n # resources, such as Minikube. If you do want to specify resources, uncomment the following\n # lines, adjust them as necessary, and remove the curly braces after 'resources:'.\n # limits:\n # cpu: 100m\n # memory: 128Mi\n # requests:\n # cpu: 100m\n # memory: 128Mi\n\nnodeSelector: {}\n\ntolerations: []\n\naffinity: {}\n");
18
18
  };
19
19
  exports.chartValuesTmpl = chartValuesTmpl;
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsdWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2ZpbGVUZW1wbGF0ZXMvYmFjay9lbnZpcm9ubWVudC9jaGFydC92YWx1ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXVDO0FBRXZDLDhDQUF1RDtBQUVoRCxJQUFNLGVBQWUsR0FBRyxVQUFDLEVBSUo7UUFIaEIsTUFBTSxtQkFBQSxFQUNoQixNQUFNLFlBQUEsRUFDTixPQUFPLGFBQUE7SUFDd0IsT0FBQSxVQUMvQixPQUFPLENBQUMsMEJBQTBCO1FBQ2hDLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLGNBQ0Ysd0JBQWdCLE9BQ25CLGtKQVVhLE9BQU8sQ0FBQyxnQkFBZ0IsY0FBSSxPQUFPLENBQUMsYUFBYSwrSkFZbkQsT0FBTyxDQUFDLG1CQUFtQixrU0FrQnhCLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sNEJBQzlCLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsMENBRXJCLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sNEJBQzVCLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsMk9Ba0J4QixNQUFNLENBQUMsT0FBTztTQUNyQixHQUFHLENBQ0YsVUFBQyxNQUFNLElBQUssT0FBQSxzQkFBZSxJQUFBLHVCQUFTLEVBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxzQ0FDNUIsTUFBTSxDQUFDLElBQUksY0FBSSxNQUFNLENBQUMsSUFBSSx1REFFbEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLDhCQUN6QixNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsOENBRWhCLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSw4QkFDdkIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLE9BQUcsRUFQbEIsQ0FPa0IsQ0FDL0I7U0FDQSxJQUFJLENBQUMsRUFBRSxDQUFDLHVLQVlKLE1BQU0sQ0FBQyxZQUFZO1NBQ3ZCLEdBQUcsQ0FDRixVQUFDLEVBQVE7WUFBTixJQUFJLFVBQUE7UUFBTyxPQUFBLHNCQUFlLElBQUksbUNBQ2YsSUFBSSxXQUFRO0lBRGhCLENBQ2dCLENBQy9CO1NBQ0EsSUFBSSxDQUFDLEVBQUUsQ0FBQyx3WEFlQSxPQUFPLENBQUMsYUFBYSxzREFFbkIsT0FBTyxDQUFDLGtCQUFrQixJQUFJLE1BQU0sNmlCQW9CaEQ7QUFwSWdDLENBb0loQyxDQUFBO0FBeElZLFFBQUEsZUFBZSxtQkF3STNCIn0=
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsdWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2ZpbGVUZW1wbGF0ZXMvYmFjay9lbnZpcm9ubWVudC9jaGFydC92YWx1ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXVDO0FBRXZDLDhDQUF1RDtBQUVoRCxJQUFNLGVBQWUsR0FBRyxVQUFDLEVBSUo7UUFIaEIsTUFBTSxtQkFBQSxFQUNoQixNQUFNLFlBQUEsRUFDTixPQUFPLGFBQUE7SUFDd0IsT0FBQSxVQUMvQixPQUFPLENBQUMsMEJBQTBCO1FBQ2hDLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLGNBQ0Ysd0JBQWdCLE9BQ25CLG9KQVdhLE9BQU8sQ0FBQyxnQkFBZ0IsY0FBSSxPQUFPLENBQUMsYUFBYSwrSkFZbkQsT0FBTyxDQUFDLG1CQUFtQixrU0FrQnhCLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sNEJBQzlCLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsMENBRXJCLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sNEJBQzVCLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsMk9Ba0J4QixNQUFNLENBQUMsT0FBTztTQUNyQixHQUFHLENBQ0YsVUFBQyxNQUFNLElBQUssT0FBQSxzQkFBZSxJQUFBLHVCQUFTLEVBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxzQ0FDNUIsTUFBTSxDQUFDLElBQUksY0FBSSxNQUFNLENBQUMsSUFBSSx1REFFbEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLDhCQUN6QixNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsOENBRWhCLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSw4QkFDdkIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLE9BQUcsRUFQbEIsQ0FPa0IsQ0FDL0I7U0FDQSxJQUFJLENBQUMsRUFBRSxDQUFDLHVLQVlKLE1BQU0sQ0FBQyxZQUFZO1NBQ3ZCLEdBQUcsQ0FDRixVQUFDLEVBQVE7WUFBTixJQUFJLFVBQUE7UUFBTyxPQUFBLHNCQUFlLElBQUksbUNBQ2YsSUFBSSxXQUFRO0lBRGhCLENBQ2dCLENBQy9CO1NBQ0EsSUFBSSxDQUFDLEVBQUUsQ0FBQyx3WEFlQSxPQUFPLENBQUMsYUFBYSxzREFFbkIsT0FBTyxDQUFDLGtCQUFrQixJQUFJLE1BQU0sNmlCQW9CaEQ7QUFySWdDLENBcUloQyxDQUFBO0FBeklZLFFBQUEsZUFBZSxtQkF5STNCIn0=
package/build/projectsGeneration/generators/fileTemplates/ui/environment/chart/values.js CHANGED
@@ -6,7 +6,7 @@ var uiChartValuesTmpl = function (_a) {
6
6
  var prefix = _a.system.prefix, options = _a.options;
7
7
  return "".concat(options.skipWarningThisIsGenerated
8
8
  ? ''
9
- : "\n# ".concat(utils_1.generatedWarning, "\n"), "global:\n env: noName\n clusterName: noName\n deployKind: noName\n imagePullPolicy: Always\n\ndev: false\n\ndocker:\n registry: ").concat(options.ciDockerRegistry, "/").concat(options.projectsGroup, "\n\napp:\n tag: :master\n replicas: 1\n endpoint: \"\"\n\nimage:\n repository: nginx\n tag: stable\n pullPolicy: IfNotPresent\n\nimagePullSecrets:\n - name: ").concat(options.k8sImagePullSecrets, "\n\nnameOverride: \"\"\nfullnameOverride: \"\"\n\nservice:\n type: ClusterIP\n port: \"80\"\n\ndeployment:\n annotations:\n prometheus.io/path: '/metrics'\n prometheus.io/scrape: true\n prometheus.io/port: 2100\n\ningress:\n annotations:\n nginx.ingress.kubernetes.io/limit-connections: \"100\"\n nginx.ingress.kubernetes.io/limit-rps: \"300\"\n nginx.ingress.kubernetes.io/limit-rpm: \"5000\"\n nginx.ingress.kubernetes.io/affinity: \"cookie\"\n nginx.ingress.kubernetes.io/proxy-body-size: \"50m\"\n host: \"").concat(options.k8sAppsDomain, "\"\n letsencryptCert: true\n domains:\n app: \"").concat(options.k8sSubdomainPrefix || prefix, "\"\n endpoint: \"").concat(options.k8sSubdomainPrefix || prefix, "-ep\"\n\nresources:\n {}\n # We usually recommend not to specify default resources and to leave this as a conscious\n # choice for the user. This also increases chances charts run on environments with little\n # resources, such as Minikube. If you do want to specify resources, uncomment the following\n # lines, adjust them as necessary, and remove the curly braces after 'resources:'.\n # limits:\n # cpu: 100m\n # memory: 128Mi\n # requests:\n # cpu: 100m\n # memory: 128Mi\n\nnodeSelector: {}\n\ntolerations: []\n\naffinity: {}\n");
9
+ : "\n# ".concat(utils_1.generatedWarning, "\n"), "\nglobal:\n env: noName\n clusterName: noName\n deployKind: noName\n imagePullPolicy: Always\n\ndev: false\n\ndocker:\n registry: ").concat(options.ciDockerRegistry, "/").concat(options.projectsGroup, "\n\napp:\n tag: :master\n replicas: 1\n endpoint: \"\"\n\nimage:\n repository: nginx\n tag: stable\n pullPolicy: IfNotPresent\n\nimagePullSecrets:\n - name: ").concat(options.k8sImagePullSecrets, "\n\nnameOverride: \"\"\nfullnameOverride: \"\"\n\nservice:\n type: ClusterIP\n port: \"80\"\n\ndeployment:\n annotations:\n prometheus.io/path: '/metrics'\n prometheus.io/scrape: true\n prometheus.io/port: 2100\n\ningress:\n annotations:\n nginx.ingress.kubernetes.io/limit-connections: \"100\"\n nginx.ingress.kubernetes.io/limit-rps: \"300\"\n nginx.ingress.kubernetes.io/limit-rpm: \"5000\"\n nginx.ingress.kubernetes.io/affinity: \"cookie\"\n nginx.ingress.kubernetes.io/proxy-body-size: \"50m\"\n host: \"").concat(options.k8sAppsDomain, "\"\n letsencryptCert: true\n domains:\n app: \"").concat(options.k8sSubdomainPrefix || prefix, "\"\n endpoint: \"").concat(options.k8sSubdomainPrefix || prefix, "-ep\"\n\nresources:\n {}\n # We usually recommend not to specify default resources and to leave this as a conscious\n # choice for the user. This also increases chances charts run on environments with little\n # resources, such as Minikube. If you do want to specify resources, uncomment the following\n # lines, adjust them as necessary, and remove the curly braces after 'resources:'.\n # limits:\n # cpu: 100m\n # memory: 128Mi\n # requests:\n # cpu: 100m\n # memory: 128Mi\n\nnodeSelector: {}\n\ntolerations: []\n\naffinity: {}\n");
10
10
  };
11
11
  exports.uiChartValuesTmpl = uiChartValuesTmpl;
12
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsdWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2ZpbGVUZW1wbGF0ZXMvdWkvZW52aXJvbm1lbnQvY2hhcnQvdmFsdWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDhDQUF1RDtBQUVoRCxJQUFNLGlCQUFpQixHQUFHLFVBQUMsRUFHTjtRQUZoQixNQUFNLG1CQUFBLEVBQ2hCLE9BQU8sYUFBQTtJQUN3QixPQUFBLFVBQy9CLE9BQU8sQ0FBQywwQkFBMEI7UUFDaEMsQ0FBQyxDQUFDLEVBQUU7UUFDSixDQUFDLENBQUMsY0FDRix3QkFBZ0IsT0FDbkIsa0pBVWEsT0FBTyxDQUFDLGdCQUFnQixjQUFJLE9BQU8sQ0FBQyxhQUFhLGlMQWFuRCxPQUFPLENBQUMsbUJBQW1CLHdpQkFzQjVCLE9BQU8sQ0FBQyxhQUFhLGlFQUdwQixPQUFPLENBQUMsa0JBQWtCLElBQUksTUFBTSxpQ0FDL0IsT0FBTyxDQUFDLGtCQUFrQixJQUFJLE1BQU0sNmlCQW9CcEQ7QUExRWdDLENBMEVoQyxDQUFBO0FBN0VZLFFBQUEsaUJBQWlCLHFCQTZFN0IifQ==
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsdWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2ZpbGVUZW1wbGF0ZXMvdWkvZW52aXJvbm1lbnQvY2hhcnQvdmFsdWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDhDQUF1RDtBQUVoRCxJQUFNLGlCQUFpQixHQUFHLFVBQUMsRUFHTjtRQUZoQixNQUFNLG1CQUFBLEVBQ2hCLE9BQU8sYUFBQTtJQUN3QixPQUFBLFVBQy9CLE9BQU8sQ0FBQywwQkFBMEI7UUFDaEMsQ0FBQyxDQUFDLEVBQUU7UUFDSixDQUFDLENBQUMsY0FDRix3QkFBZ0IsT0FDbkIsb0pBV2EsT0FBTyxDQUFDLGdCQUFnQixjQUFJLE9BQU8sQ0FBQyxhQUFhLGlMQWFuRCxPQUFPLENBQUMsbUJBQW1CLHdpQkFzQjVCLE9BQU8sQ0FBQyxhQUFhLGlFQUdwQixPQUFPLENBQUMsa0JBQWtCLElBQUksTUFBTSxpQ0FDL0IsT0FBTyxDQUFDLGtCQUFrQixJQUFJLE1BQU0sNmlCQW9CcEQ7QUEzRWdDLENBMkVoQyxDQUFBO0FBOUVZLFFBQUEsaUJBQWlCLHFCQThFN0IifQ==
package/build/types/projectsGeneration/builders/{WorkerBuilder.d.ts → DeploymentBuilder.d.ts} RENAMED
@@ -1,6 +1,7 @@
1
1
  import { MemoryAndCpu, Worker } from './buildedTypes';
2
2
  import BaseBuilder from './BaseBuilder';
3
- declare class WorkerBuilder extends BaseBuilder {
3
+ declare class DeploymentBuilder extends BaseBuilder {
4
+ replicas: number;
4
5
  requests: MemoryAndCpu;
5
6
  limits: MemoryAndCpu;
6
7
  constructor(name: string, defaultLanguage: string, title?: string);
@@ -8,4 +9,4 @@ declare class WorkerBuilder extends BaseBuilder {
8
9
  setMemory(request: string, limit?: string): this;
9
10
  setCpu(request: string, limit?: string): this;
10
11
  }
11
- export default WorkerBuilder;
12
+ export default DeploymentBuilder;
package/build/types/projectsGeneration/builders/SystemMetaBuilder.d.ts CHANGED
@@ -3,10 +3,10 @@ import CatalogBuilder from './CatalogBuilder';
3
3
  import DocumentBuilder from './DocumentBuilder';
4
4
  import { InfoRegistryBuilder } from './InfoRegistryBuilder';
5
5
  import SumRegistryBuilder, { RegistryOptions } from './SumRegistryBuilder';
6
- import { Command, ConfigValue, ConfigVar, ConfigVarScope, DeployEnvironment, FieldType, Glossary, MemoryAndCpu, ProjectCategory, System } from './buildedTypes';
6
+ import { Command, ConfigValue, ConfigVar, ConfigVarScope, DeployEnvironment, FieldType, Glossary, ProjectCategory, System } from './buildedTypes';
7
7
  import ReportBuilder from './ReportBuilder';
8
8
  import RestApiBuilder from './RestApiBuilder';
9
- import WorkerBuilder from './WorkerBuilder';
9
+ import DeploymentBuilder from './DeploymentBuilder';
10
10
  import RoleBuilder from './RoleBuilder';
11
11
  import TelegramBotBuilder from './TelegramBotBuilder';
12
12
  export declare const defaultConfigVar: Omit<ConfigVar, 'name' | 'type'>;
@@ -23,15 +23,14 @@ declare class SystemMetaBuilder {
23
23
  telegramBots: TelegramBotBuilder[];
24
24
  languages: string[];
25
25
  restApis: RestApiBuilder[];
26
- workers: WorkerBuilder[];
26
+ workers: DeploymentBuilder[];
27
27
  roles: RoleBuilder[];
28
28
  defaultLanguage: string;
29
29
  defOpts: BootstrapEntityOptions;
30
30
  name: string;
31
31
  prefix: string;
32
32
  needFor: string;
33
- requests: MemoryAndCpu;
34
- limits: MemoryAndCpu;
33
+ back: DeploymentBuilder;
35
34
  constructor(prefix: string, defOpts?: BootstrapEntityOptions, defaultLanguage?: string);
36
35
  setName(name: string): this;
37
36
  setNeedFor(needFor: string): this;
@@ -51,7 +50,7 @@ declare class SystemMetaBuilder {
51
50
  getCatalogByName(name: string): CatalogBuilder;
52
51
  getInfoRegistryByName(name: string): InfoRegistryBuilder;
53
52
  addRestApi(name: string, path: string, title?: string): RestApiBuilder;
54
- addWorker(name: string, title?: string): WorkerBuilder;
53
+ addWorker(name: string, title?: string): DeploymentBuilder;
55
54
  addManyToManyRelation(name: string, title?: {
56
55
  singular?: string;
57
56
  plural?: string;
@@ -74,8 +73,6 @@ declare class SystemMetaBuilder {
74
73
  addCommnad(projectCategory: ProjectCategory, name: string, command: string, needFor: string): this;
75
74
  getEntities(): EntityWithOptions[];
76
75
  getExternalSearchFields(): Array<CatalogBuilder | DocumentBuilder | InfoRegistryBuilder | SumRegistryBuilder>;
77
- setMemory(request: string, limit?: string): this;
78
- setCpu(request: string, limit?: string): this;
79
76
  build(): System;
80
77
  initDefaultCatalogs(): EntityBuilderWithOptions<CatalogBuilder>[];
81
78
  }
package/build/types/projectsGeneration/builders/buildedTypes.d.ts CHANGED
@@ -211,10 +211,13 @@ export declare type MemoryAndCpu = {
211
211
  memory: string;
212
212
  cpu: string;
213
213
  };
214
- export declare type Worker = BaseEntity & {
214
+ export declare type BaseDeployment = {
215
+ replicas: number;
215
216
  requests: MemoryAndCpu;
216
217
  limits: MemoryAndCpu;
217
218
  };
219
+ export declare type Back = BaseDeployment;
220
+ export declare type Worker = BaseDeployment & BaseEntity;
218
221
  export declare type InfoRegistryPeriod = 'notPeriodic' | 'second' | 'day' | 'month' | 'year';
219
222
  export declare type InfoRegistry = BaseSavableEntity & {
220
223
  type: 'infoRegistry';
@@ -234,10 +237,6 @@ export interface DeployEnvironment {
234
237
  name: string;
235
238
  clusterName: string;
236
239
  }
237
- export declare type Back = {
238
- requests: MemoryAndCpu;
239
- limits: MemoryAndCpu;
240
- };
241
240
  export declare type System = {
242
241
  name: string;
243
242
  prefix: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "runlify",
3
- "version": "0.0.350",
3
+ "version": "0.0.351",
4
4
  "description": "runlify CLI",
5
5
  "private": false,
6
6
  "main": "build/index.js",