runlify 0.0.702 → 0.0.703
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/build/projectsGeneration/args.js +1 -1
- package/build/projectsGeneration/builders/TelegramBotBuilder.js +33 -3
- package/build/projectsGeneration/fileCleaners/back/cleanBack.js +50 -0
- package/build/projectsGeneration/fileCleaners/back/graphServices/cleanGraphServices.js +73 -0
- package/build/projectsGeneration/fileCleaners/back/services/cleanServices.js +81 -0
- package/build/projectsGeneration/fileCleaners/cleanFiles.js +52 -0
- package/build/projectsGeneration/fileCleaners/ui/cleanUi.js +53 -0
- package/build/projectsGeneration/fileCleaners/ui/pages/cleanPages.js +73 -0
- package/build/projectsGeneration/fileCleaners/ui/widgets/cleanWidgets.js +54 -0
- package/build/projectsGeneration/fileCleaners/ui/widgets/cleanWidgetsByType.js +75 -0
- package/build/projectsGeneration/genGraphSchemesByLocalGenerator.js +1 -1
- package/build/projectsGeneration/generateProject.js +11 -4
- package/build/projectsGeneration/generators/fileTemplates/back/environment/chart/templates/back.js +2 -2
- package/build/projectsGeneration/generators/fileTemplates/back/environment/chart/templates/ingress.js +2 -2
- package/build/projectsGeneration/generators/fileTemplates/back/environment/chart/values.js +3 -6
- package/build/projectsGeneration/generators/fileTemplates/back/environment/gitlabCi.js +6 -15
- package/build/projectsGeneration/generators/fileTemplates/ui/ResourcesPage.js +2 -3
- package/build/projectsGeneration/generators/fileTemplates/ui/environment/chart/templates/front.js +2 -2
- package/build/projectsGeneration/generators/fileTemplates/ui/environment/chart/templates/ingress.js +2 -2
- package/build/projectsGeneration/generators/fileTemplates/ui/environment/chart/values.js +2 -2
- package/build/projectsGeneration/generators/fileTemplates/ui/environment/gitlabCi.js +3 -6
- package/build/projectsGeneration/generators/fileTemplates/ui/getDefaultMenu.js +2 -3
- package/build/projectsGeneration/generators/fileTemplates/ui/widgets/list/ListWidget.js +3 -3
- package/build/projectsGeneration/types.js +1 -3
- package/build/types/projectsGeneration/args.d.ts +3 -3
- package/build/types/projectsGeneration/builders/TelegramBotBuilder.d.ts +7 -1
- package/build/types/projectsGeneration/builders/buildedTypes.d.ts +1 -1
- package/build/types/projectsGeneration/fileCleaners/back/cleanBack.d.ts +3 -0
- package/build/types/projectsGeneration/fileCleaners/back/graphServices/cleanGraphServices.d.ts +3 -0
- package/build/types/projectsGeneration/fileCleaners/back/services/cleanServices.d.ts +3 -0
- package/build/types/projectsGeneration/fileCleaners/cleanFiles.d.ts +3 -0
- package/build/types/projectsGeneration/fileCleaners/ui/cleanUi.d.ts +3 -0
- package/build/types/projectsGeneration/fileCleaners/ui/pages/cleanPages.d.ts +3 -0
- package/build/types/projectsGeneration/fileCleaners/ui/widgets/cleanWidgets.d.ts +3 -0
- package/build/types/projectsGeneration/fileCleaners/ui/widgets/cleanWidgetsByType.d.ts +3 -0
- package/build/types/projectsGeneration/genGraphSchemesByLocalGenerator.d.ts +2 -2
- package/build/types/projectsGeneration/generateProject.d.ts +81 -2
- package/build/types/projectsGeneration/generators/fileTemplates/back/elastic/jobs.d.ts +0 -4
- package/build/types/projectsGeneration/types.d.ts +4 -2
- package/package.json +1 -1
|
@@ -119,6 +119,7 @@ var backDocSpec_1 = __importDefault(require("./generators/fileTemplates/back/env
|
|
|
119
119
|
var generateAdditionalService_1 = require("./generateAdditionalService");
|
|
120
120
|
var IntegrationClients_1 = __importDefault(require("./generators/fileTemplates/back/environment/src/integrationClients/IntegrationClients"));
|
|
121
121
|
var integrationClientConstrictors_1 = __importDefault(require("./generators/fileTemplates/back/environment/src/integrationClients/integrationClientConstrictors"));
|
|
122
|
+
var cleanFiles_1 = __importDefault(require("./fileCleaners/cleanFiles"));
|
|
122
123
|
// Бек (generateBack)
|
|
123
124
|
// Исходники бека (generateBackSrc)
|
|
124
125
|
// Исходники бека (generateBackSrcEntity)
|
|
@@ -570,11 +571,15 @@ exports.generateFront = generateFront;
|
|
|
570
571
|
var generateProject = function (system, initialOpts) {
|
|
571
572
|
if (initialOpts === void 0) { initialOpts = types_1.defaultBootstrapEntityOptions; }
|
|
572
573
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
573
|
-
var opts, args, entities, prjBackSrcPrefixedDir, prjDetachedBackSrcDir, graphMetaServiceDir, servicesDir, graphDir, generatedAdditionalServices, restRouter, prjUiSrcPrefixedDir, prjDetachedUiSrcDir, _a, resources, resourcesChunk0, resourcesChunk1, generatedResources, generatedUiMetaPage, generatedResources, generatedSubMenu, generatedAdditionalMenu, generatedResources, generatedUiAdditionalRoutesTmpl, generatedResources, uiFunctionsDir, generatedResources;
|
|
574
|
+
var dir, detachedBackProject, detachedUiProject, opts, args, entities, prjBackSrcPrefixedDir, prjDetachedBackSrcDir, graphMetaServiceDir, servicesDir, graphDir, generatedAdditionalServices, restRouter, prjUiSrcPrefixedDir, prjDetachedUiSrcDir, _a, resources, resourcesChunk0, resourcesChunk1, generatedResources, generatedUiMetaPage, generatedResources, generatedSubMenu, generatedAdditionalMenu, generatedResources, generatedUiAdditionalRoutesTmpl, generatedResources, uiFunctionsDir, generatedResources;
|
|
574
575
|
return __generator(this, function (_b) {
|
|
575
576
|
switch (_b.label) {
|
|
576
577
|
case 0:
|
|
577
|
-
|
|
578
|
+
dir = (0, fs_jetpack_1.cwd)('..').cwd();
|
|
579
|
+
detachedBackProject = (0, path_1.join)(dir, "".concat(initialOpts.projectPrefix, "-back"));
|
|
580
|
+
detachedUiProject = (0, path_1.join)(dir, "".concat(initialOpts.projectPrefix, "-ui"));
|
|
581
|
+
;
|
|
582
|
+
opts = __assign(__assign(__assign({}, types_1.defaultBootstrapEntityOptions), initialOpts), { detachedBackProject: detachedBackProject, detachedUiProject: detachedUiProject });
|
|
578
583
|
args = (0, args_1.prepareProjectWideGenerationArgs)(system, opts);
|
|
579
584
|
return [4 /*yield*/, (0, exports.generateBack)(args)];
|
|
580
585
|
case 1:
|
|
@@ -591,7 +596,9 @@ var generateProject = function (system, initialOpts) {
|
|
|
591
596
|
// prjBackSrcPrefixedDir = join(__dirname, '..', '..', prefix);
|
|
592
597
|
// }
|
|
593
598
|
// Pre grapgql types compose generation
|
|
594
|
-
return [4 /*yield*/, Promise.all(__spreadArray(__spreadArray([
|
|
599
|
+
return [4 /*yield*/, Promise.all(__spreadArray(__spreadArray([
|
|
600
|
+
(0, cleanFiles_1.default)(args)
|
|
601
|
+
], entities.map(function (entity) {
|
|
595
602
|
return (0, generateEntity_1.generateEntity)((0, args_1.prepareEntityWideGenerationArgs)(__assign(__assign({}, args), { options: __assign(__assign({}, opts), { typesOnly: true }) }), entity));
|
|
596
603
|
}), true), system.additionalServices.map(function (service) {
|
|
597
604
|
return (0, generateAdditionalService_1.generateAdditionalService)((0, args_1.prepareAdditionalServiceWideGenerationArgs)(__assign(__assign({}, args), { options: __assign(__assign({}, opts), { typesOnly: true }) }), service));
|
|
@@ -745,4 +752,4 @@ var generateProject = function (system, initialOpts) {
|
|
|
745
752
|
});
|
|
746
753
|
};
|
|
747
754
|
exports.default = generateProject;
|
|
748
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generateProject.js","sourceRoot":"","sources":["../../src/projectsGeneration/generateProject.ts"],"names":[],"mappings":"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"}
|
|
755
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generateProject.js","sourceRoot":"","sources":["../../src/projectsGeneration/generateProject.ts"],"names":[],"mappings":"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"}
|
package/build/projectsGeneration/generators/fileTemplates/back/environment/chart/templates/back.js
CHANGED
|
@@ -7,10 +7,10 @@ var chartBackTmpl = 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\n{{- if .Values.back.enabled }}\n"), "apiVersion: v1\nkind: Service\nmetadata:\n name:
|
|
10
|
+
: "\n# ".concat(utils_1.generatedWarning, "\n\n{{- if .Values.back.enabled }}\n"), "apiVersion: v1\nkind: Service\nmetadata:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n labels:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n projectName: {{ $.Values.global.projectName }}\n clusterName: {{ $.Values.global.clusterName }}\n env: {{ $.Values.global.env }}\n deployKind: {{ $.Values.global.deployKind }}\n prometheus: enable\nspec:\n ports:\n - name: http\n port: 3000\n protocol: TCP\n targetPort: 3000\n selector:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n---\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\nspec:\n replicas: {{ $.Values.back.replicas }}\n strategy:\n type: RollingUpdate\n rollingUpdate:\n maxSurge: 3\n selector:\n matchLabels:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n template:\n metadata:\n labels:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n projectName: {{ $.Values.global.projectName }}\n clusterName: {{ $.Values.global.clusterName }}\n env: {{ $.Values.global.env }}\n deployKind: {{ $.Values.global.deployKind }}\n spec:\n imagePullSecrets:\n - name: {{ $.Release.Name }}-pullsecret\n containers:\n - name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n image: {{ $.Values.dockerRegistry.domain }}/{{ $.Values.global.projectGroup }}/{{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}{{ $.Values.app.tag }}\n ports:\n - name: main-port\n containerPort: 3000\n imagePullPolicy: Always\n livenessProbe:\n httpGet:\n path: /health?type=liveness\n port: main-port\n initialDelaySeconds: 60\n timeoutSeconds: 15\n periodSeconds: 5\n readinessProbe:\n httpGet:\n path: /health?type=readiness\n port: main-port\n initialDelaySeconds: 60\n timeoutSeconds: 15\n periodSeconds: 5\n startupProbe:\n httpGet:\n path: /health?type=startup\n port: main-port\n initialDelaySeconds: 60\n timeoutSeconds: 15\n failureThreshold: 10\n periodSeconds: 10\n resources:\n requests:\n memory: {{ $.Values.back.requests.memory }}\n cpu: {{ $.Values.back.requests.cpu }}\n limits:\n memory: {{ $.Values.back.limits.memory }}\n cpu: {{ $.Values.back.limits.cpu }}\n securityContext:\n runAsNonRoot: true\n # readOnlyRootFilesystem: true\n runAsUser: 1000\n env:\n - name: NODE_ENV\n value: production\n - name: RANDOM\n value: {{ $.Values.random | quote }}\n - name: ENV\n value: '{{ $.Values.global.env }}'\n - name: APOLLO_KEY\n value: {{ $.Values.apollo.key | quote }}").concat(system.configVars
|
|
11
11
|
.filter(function (v) { return v.scopes.includes('back'); })
|
|
12
12
|
.map(function (v) { return "\n - name: ".concat((0, change_case_1.constantCase)(v.name), "\n value: {{ $.Values.").concat(v.name, " | quote }}"); })
|
|
13
13
|
.join(''), "\n\n - name: K8S_NODE_NAME\n valueFrom:\n fieldRef:\n fieldPath: spec.nodeName\n - name: K8S_POD_NAME\n valueFrom:\n fieldRef:\n fieldPath: metadata.name\n - name: K8S_POD_NAMESPACE\n valueFrom:\n fieldRef:\n fieldPath: metadata.namespace\n---\n{{- end }}\n");
|
|
14
14
|
};
|
|
15
15
|
exports.chartBackTmpl = chartBackTmpl;
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFjay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3NyYy9wcm9qZWN0c0dlbmVyYXRpb24vZ2VuZXJhdG9ycy9maWxlVGVtcGxhdGVzL2JhY2svZW52aXJvbm1lbnQvY2hhcnQvdGVtcGxhdGVzL2JhY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQTBDO0FBRTFDLGlEQUEwRDtBQUVuRCxJQUFNLGFBQWEsR0FBRyxVQUFDLEVBSUY7UUFIaEIsTUFBTSxtQkFBQSxFQUNoQixNQUFNLFlBQUEsRUFDTixPQUFPLGFBQUE7SUFDd0IsT0FBQSxVQUMvQixPQUFPLENBQUMsMEJBQTBCO1FBQ2hDLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLGNBQ0Ysd0JBQWdCLHlDQUduQiw2aUdBNkZtRCxNQUFNLENBQUMsVUFBVTtTQUN4RCxNQUFNLENBQUMsVUFBQyxDQUFDLElBQUssT0FBQSxDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFBekIsQ0FBeUIsQ0FBQztTQUN4QyxHQUFHLENBQ0YsVUFBQyxDQUFDLElBQUssT0FBQSw0QkFBcUIsSUFBQSwwQkFBWSxFQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsNENBQy9CLENBQUMsQ0FBQyxJQUFJLGdCQUFhLEVBRDdCLENBQzZCLENBQ3JDO1NBQ0EsSUFBSSxDQUFDLEVBQUUsQ0FBQyw4WEFnQnBCO0FBMUhnQyxDQTBIaEMsQ0FBQTtBQTlIWSxRQUFBLGFBQWEsaUJBOEh6QiJ9
|
|
@@ -6,7 +6,7 @@ var chartIngressTmpl = 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"), "\n{{- if .Values.ingress.enabled }}\napiVersion: networking.k8s.io/v1\nkind: Ingress\nmetadata:\n name:
|
|
9
|
+
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\n{{- if .Values.ingress.enabled }}\napiVersion: networking.k8s.io/v1\nkind: Ingress\nmetadata:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n labels:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n chart: \"{{ .Chart.Name }}-{{ .Chart.Version | replace \"+\" \"_\" }}\"\n release: \"{{ .Release.Name }}\"\n heritage: \"{{ .Release.Service }}\"\n annotations:\n {{- range $key, $value := .Values.ingress.annotations }}\n {{ $key }}: {{ $value | quote }}\n {{- end }}\n {{ if .Values.ingress.letsencryptCert }}\n cert-manager.io/cluster-issuer: \"letsencrypt-prod\"\n {{ end }}\nspec:\n rules:\n {{ if .Values.ingress.rootEnabled }}\n - host: {{ $.Values.ingress.domain }}.apps.{{ $.Values.ingress.host }}\n http:\n paths:\n - pathType: Prefix\n path: \"/\"\n backend:\n service:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n port:\n number: 3000\n {{ end }}\n - host: {{ $.Values.ingress.domain }}.{{ $.Values.global.env }}.apps.{{ $.Values.global.clusterName }}.{{ $.Values.ingress.host }}\n http:\n paths:\n - pathType: Prefix\n path: \"/\"\n backend:\n service:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n port:\n number: 3000\n tls:\n - hosts:\n - {{ $.Values.ingress.domain }}.{{ $.Values.global.env }}.apps.{{ $.Values.global.clusterName }}.{{ $.Values.ingress.host }}\n secretName: {{ $.Values.ingress.domain }}.{{ $.Values.global.env }}.apps.{{ $.Values.global.clusterName }}.{{ $.Values.ingress.host }}-tls\n{{- end }}\n");
|
|
10
10
|
};
|
|
11
11
|
exports.chartIngressTmpl = chartIngressTmpl;
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5ncmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3NyYy9wcm9qZWN0c0dlbmVyYXRpb24vZ2VuZXJhdG9ycy9maWxlVGVtcGxhdGVzL2JhY2svZW52aXJvbm1lbnQvY2hhcnQvdGVtcGxhdGVzL2luZ3Jlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsaURBQTBEO0FBRW5ELElBQU0sZ0JBQWdCLEdBQUcsVUFBQyxFQUdMO1FBRmhCLE1BQU0sbUJBQUEsRUFDaEIsT0FBTyxhQUFBO0lBQ3dCLE9BQUEsVUFDL0IsT0FBTyxDQUFDLDBCQUEwQjtRQUNoQyxDQUFDLENBQUMsRUFBRTtRQUNKLENBQUMsQ0FBQyxjQUNGLHdCQUFnQixPQUNuQixneERBZ0RBO0FBckRnQyxDQXFEaEMsQ0FBQTtBQXhEWSxRQUFBLGdCQUFnQixvQkF3RDVCIn0=
|
|
@@ -7,14 +7,11 @@ 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"), "\nglobal:\n env: noName\n clusterName: noName\n deployKind: noName\n imagePullPolicy: Always\n\ndev: false\n\ndocker:\n registry: ").concat(options.ciDockerRegistry, "\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 replicas: ").concat(system.back.replicas, "\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\nmetrics:\n enabled: false\n\nmountebank:\n enabled: false\n\nworker:\n enabled: false\n replicas: 1\n requests:\n memory: \"64Mi\"\n cpu: \"0.15\"\n maxOldSpaceSize: \"58\"\n limits:\n memory: \"64Mi\"\n cpu: \"0.15\"\n maxOldSpaceSize: \"58\"\n\nworkers:").concat(system.workers
|
|
10
|
+
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\nglobal:\n env: noName\n clusterName: noName\n projectName: ").concat(options.k8sChartName || prefix, "\n projectGroup: ").concat(options.projectsGroup, "\n deployKind: noName\n imagePullPolicy: Always\n\ndev: false\n\ndocker:\n registry: ").concat(options.ciDockerRegistry, "\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 replicas: ").concat(system.back.replicas, "\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\nmetrics:\n enabled: false\n\nmountebank:\n enabled: false\n\nworker:\n enabled: false\n replicas: 1\n requests:\n memory: \"64Mi\"\n cpu: \"0.15\"\n maxOldSpaceSize: \"58\"\n limits:\n memory: \"64Mi\"\n cpu: \"0.15\"\n maxOldSpaceSize: \"58\"\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 maxOldSpaceSize: \"").concat(worker.requests.maxOldSpaceSize, "\"\n limits:\n memory: \"").concat(worker.limits.memory, "\"\n cpu: \"").concat(worker.limits.cpu, "\"\n maxOldSpaceSize: \"").concat(worker.limits.maxOldSpaceSize, "\""); })
|
|
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
|
-
.map(function (
|
|
14
|
-
var name = _a.name;
|
|
15
|
-
return "\n - name: ".concat((0, change_case_1.paramCase)(name), "\n file: dist/bots/").concat(name, "Bot/").concat(name, "Bot.js");
|
|
16
|
-
})
|
|
13
|
+
.map(function (bot) { return "\n - name: ".concat((0, change_case_1.paramCase)(bot.name), "\n file: dist/bots/").concat(bot.name, "Bot/").concat(bot.name, "Bot.js\n requests:\n memory: \"").concat(bot.requests.memory, "\"\n cpu: \"").concat(bot.requests.cpu, "\"\n maxOldSpaceSize: \"").concat(bot.requests.maxOldSpaceSize, "\"\n limits:\n memory: \"").concat(bot.limits.memory, "\"\n cpu: \"").concat(bot.limits.cpu, "\"\n maxOldSpaceSize: \"").concat(bot.limits.maxOldSpaceSize, "\""); })
|
|
17
14
|
.join(''), "\n\napollo:\n key: ''\n\ndatabase:\n uri: ''\n\ningress:\n enabled: true\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: \"").concat(options.ingressAnnotationBodySize, "\"\n nginx.ingress.kubernetes.io/proxy-read-timeout: \"7200\"\n nginx.ingress.kubernetes.io/proxy-send-timeout: \"7200\"\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
15
|
};
|
|
19
16
|
exports.chartValuesTmpl = chartValuesTmpl;
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsdWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2ZpbGVUZW1wbGF0ZXMvYmFjay9lbnZpcm9ubWVudC9jaGFydC92YWx1ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXVDO0FBRXZDLDhDQUF1RDtBQUVoRCxJQUFNLGVBQWUsR0FBRyxVQUFDLEVBSUo7UUFIaEIsTUFBTSxtQkFBQSxFQUNoQixNQUFNLFlBQUEsRUFDTixPQUFPLGFBQUE7SUFDd0IsT0FBQSxVQUMvQixPQUFPLENBQUMsMEJBQTBCO1FBQ2hDLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLGNBQ0Ysd0JBQWdCLE9BQ25CLDZFQUtnQixPQUFPLENBQUMsWUFBWSxJQUFJLE1BQU0sK0JBQzdCLE9BQU8sQ0FBQyxhQUFhLHFHQU96QixPQUFPLENBQUMsZ0JBQWdCLCtKQVkxQixPQUFPLENBQUMsbUJBQW1CLG1SQWlCekIsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLDBDQUVuQixNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLDRCQUM5QixNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLDBDQUVyQixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLDRCQUM1QixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLDBTQW9CeEIsTUFBTSxDQUFDLE9BQU87U0FDckIsR0FBRyxDQUNGLFVBQUMsTUFBTSxJQUFLLE9BQUEsc0JBQWUsSUFBQSx1QkFBUyxFQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsc0NBQzVCLE1BQU0sQ0FBQyxJQUFJLGNBQUksTUFBTSxDQUFDLElBQUksdURBRWxDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSw4QkFDekIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxHQUFHLDBDQUNQLE1BQU0sQ0FBQyxRQUFRLENBQUMsZUFBZSw4Q0FFeEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLDhCQUN2QixNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsMENBQ0wsTUFBTSxDQUFDLE1BQU0sQ0FBQyxlQUFlLE9BQUcsRUFUMUMsQ0FTMEMsQ0FDdkQ7U0FDQSxJQUFJLENBQUMsRUFBRSxDQUFDLHVLQVlKLE1BQU0sQ0FBQyxZQUFZO1NBQ3ZCLEdBQUcsQ0FDRixVQUFDLEdBQUcsSUFBSyxPQUFBLHNCQUFlLElBQUEsdUJBQVMsRUFBQyxHQUFHLENBQUMsSUFBSSxDQUFDLG1DQUN6QixHQUFHLENBQUMsSUFBSSxpQkFBTyxHQUFHLENBQUMsSUFBSSxvREFFNUIsR0FBRyxDQUFDLFFBQVEsQ0FBQyxNQUFNLDhCQUN0QixHQUFHLENBQUMsUUFBUSxDQUFDLEdBQUcsMENBQ0osR0FBRyxDQUFDLFFBQVEsQ0FBQyxlQUFlLDhDQUVyQyxHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU0sOEJBQ3BCLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRywwQ0FDRixHQUFHLENBQUMsTUFBTSxDQUFDLGVBQWUsT0FBRyxFQVQxQyxDQVMwQyxDQUNwRDtTQUNBLElBQUksQ0FBQyxFQUFFLENBQUMsd1hBZXlDLE9BQU8sQ0FBQyx5QkFBeUIsdUpBRzFFLE9BQU8sQ0FBQyxhQUFhLHNEQUVuQixPQUFPLENBQUMsa0JBQWtCLElBQUksTUFBTSw2aUJBb0JoRDtBQXZKZ0MsQ0F1SmhDLENBQUE7QUEzSlksUUFBQSxlQUFlLG1CQTJKM0IifQ==
|
|
@@ -6,9 +6,9 @@ var change_case_1 = require("change-case");
|
|
|
6
6
|
var utils_1 = require("../../../../utils");
|
|
7
7
|
var gitlabCiTmpl = function (_a) {
|
|
8
8
|
var prefix = _a.system.prefix, system = _a.system, options = _a.options;
|
|
9
|
-
return "image: node:
|
|
9
|
+
return "image: node:20\n".concat(options.skipWarningThisIsGenerated
|
|
10
10
|
? ''
|
|
11
|
-
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\nstages:\n - check\n - previous-image\n - build\n - latest-image\n - deploy\n
|
|
11
|
+
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\nstages:\n - check\n - previous-image\n - build\n - latest-image\n - deploy\n\ncache:\n paths:\n - .cache\n - .cache_images\n # - node_modules\n\nvariables:\n REPO_NAME: $CI_PROJECT_NAME\n VERBOSE: 'true'\n RELEASE: $CI_COMMIT_SHORT_SHA\n KUBECONFIG: /etc/deploy/config\n PROJECT_NAME: ").concat(system.name, "\n\ncheck:\n stage: check\n image: registry.gitlab.com/making.ventures/images/node-with-tools\n before_script:\n - yarn install --frozen-lockfile\n script:\n - ./check.sh\n").concat(options.genBackCiNotify
|
|
12
12
|
? " after_script:\n - chmod +x ci-notify.sh\n - >\n if [ $CI_JOB_STATUS != 'success' ]; then\n sh ci-notify.sh \"\uD83C\uDD98 $CI_JOB_NAME failed\"\n else\n sh ci-notify.sh \"\u2705 $CI_JOB_NAME success\"\n fi"
|
|
13
13
|
: '', "\n variables:\n DATABASE_MAIN_WRITE_URI: $TEST_DATABASE_MAIN_WRITE_URI\n\ntag-previous-with-sha:\n extends: .tag-image\n stage: previous-image\n only:").concat(system.deployEnvironments
|
|
14
14
|
.map(function (e) { return "\n - ".concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/"); }).join(''), "\n allow_failure: true # First run won't be able to create previous image\n variables:\n TAG_ORIGIN: :${CI_COMMIT_REF_SLUG}\n TAG_DESTINATION: :${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\n\nbuild:\n stage: build\n image:\n name: gcr.io/kaniko-project/executor:debug\n entrypoint: ['']\n before_script:\n - mkdir -p /kaniko/.docker\n - echo \"{\\\"auths\\\":{\\\"$CI_REGISTRY\\\":{\\\"username\\\":\\\"$CI_REGISTRY_USER\\\",\\\"password\\\":\\\"$CI_REGISTRY_PASSWORD\\\"}}}\" > /kaniko/.docker/config.json\n # - /kaniko/warmer --cache-dir=$CI_PROJECT_DIR/.cache_images --image=browserless/chrome\n - echo TAG1 \"${CI_COMMIT_REF_SLUG}\"\n - echo TAG2 \"${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n script:\n - /kaniko/executor\n --cache-dir=$CI_PROJECT_DIR/.cache_images\n --context ${CI_PROJECT_DIR}\n --dockerfile ${CI_PROJECT_DIR}/Dockerfile\n --build-arg GIT_COMMIT=${CI_COMMIT_SHA}\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\n --single-snapshot\n only:").concat(system.deployEnvironments
|
|
@@ -21,25 +21,16 @@ var gitlabCiTmpl = function (_a) {
|
|
|
21
21
|
? '\n\n' +
|
|
22
22
|
system.deployEnvironments
|
|
23
23
|
.map(function (e) {
|
|
24
|
-
return "deploy-".concat(e.name, "-workers:\n extends: .deploy-").concat(e.name, "-workers\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"workers-").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
24
|
+
return "deploy-".concat(e.name, "-workers:\n extends: .deploy-").concat(e.name, "-workers\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"workers-").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/\n\ndeploy-").concat(e.name, "-bots:\n extends: .deploy-").concat(e.name, "-bots\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
25
25
|
})
|
|
26
26
|
.join('\n\n')
|
|
27
27
|
.trim()
|
|
28
28
|
: '', "\n\n").concat(system.deployEnvironments
|
|
29
|
-
.map(function (e) {
|
|
30
|
-
return "deploy-".concat(e.name, "-back-previous:\n extends: .deploy-").concat(e.name, "-back\n stage: deploy-previous\n when: manual\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
31
|
-
}).join('\n\n')).concat(system.workers.length > 0
|
|
32
|
-
? '\n\n' +
|
|
33
|
-
system.deployEnvironments
|
|
34
|
-
.map(function (e) {
|
|
35
|
-
return "deploy-".concat(e.name, "-workers-previous:\n extends: .deploy-").concat(e.name, "-workers\n stage: deploy-previous\n when: manual\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"workers-").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
36
|
-
}).join('\n\n')
|
|
37
|
-
: '', "\n").concat(system.deployEnvironments
|
|
38
|
-
.map(function (e) { return ".deploy-".concat(e.name, "-back:\n extends:\n - .deploy-").concat(e.name, "\n - .deploy-back\n variables:\n KUBE_CONFIG: ${KUBE_").concat(e.clusterName.toUpperCase(), "_CONFIG}\n BACK_ENABLED: \"true\"\n INGRESS_ENABLED: \"true\"\n METRICS_ENABLED: \"").concat(e.metricsEnabled.toString(), "\"\n WORKER_ENABLED: \"false\"\n BOT_ENABLED: \"false\"\n ROOT_ENABLED: \"").concat(e.main, "\"\n\n.deploy-").concat(e.name, "-workers:\n extends:\n - .deploy-").concat(e.name, "\n - .deploy-worker\n variables:\n KUBE_CONFIG: ${KUBE_").concat(e.clusterName.toUpperCase(), "_CONFIG}\n BACK_ENABLED: \"false\"\n INGRESS_ENABLED: \"false\"\n METRICS_ENABLED: \"false\"\n WORKER_ENABLED: \"true\"\n BOT_ENABLED: \"false\"\n ROOT_ENABLED: \"false\""); }).join('\n\n'), "\n\n").concat(system.deployEnvironments
|
|
29
|
+
.map(function (e) { return ".deploy-".concat(e.name, "-back:\n extends:\n - .deploy-").concat(e.name, "\n - .deploy-back\n variables:\n KUBE_CONFIG: ${KUBE_").concat(e.clusterName.toUpperCase(), "_CONFIG}\n BACK_ENABLED: \"true\"\n INGRESS_ENABLED: \"true\"\n METRICS_ENABLED: \"").concat(e.metricsEnabled.toString(), "\"\n WORKER_ENABLED: \"false\"\n BOT_ENABLED: \"false\"\n ROOT_ENABLED: \"").concat(e.main, "\"\n\n.deploy-").concat(e.name, "-workers:\n extends:\n - .deploy-").concat(e.name, "\n - .deploy-worker\n variables:\n KUBE_CONFIG: ${KUBE_").concat(e.clusterName.toUpperCase(), "_CONFIG}\n BACK_ENABLED: \"false\"\n INGRESS_ENABLED: \"false\"\n METRICS_ENABLED: \"false\"\n WORKER_ENABLED: \"true\"\n BOT_ENABLED: \"false\"\n ROOT_ENABLED: \"false\"\n\n.deploy-").concat(e.name, "-bots:\n extends:\n - .deploy-").concat(e.name, "\n - .deploy-bot\n variables:\n KUBE_CONFIG: ${KUBE_").concat(e.clusterName.toUpperCase(), "_CONFIG}\n BACK_ENABLED: \"false\"\n INGRESS_ENABLED: \"false\"\n METRICS_ENABLED: \"false\"\n WORKER_ENABLED: \"false\"\n BOT_ENABLED: \"true\"\n ROOT_ENABLED: \"false\""); }).join('\n\n'), "\n\n").concat(system.deployEnvironments
|
|
39
30
|
.map(function (e) { return ".deploy-".concat(e.name, ":\n extends: .deploy\n stage: deploy\n when: ").concat(e.manualDeploy ? 'manual' : 'on_success', "\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/\n tags:\n - ").concat(e.runnerTag, "\n variables:\n ENV: \"").concat(e.name, "\"\n DEV: \"false\"\n HOST: \"").concat(e.host, "\"\n ROOT_ENABLED: \"").concat(e.main, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"").concat(system.configVars
|
|
40
31
|
.filter(function (v) { return v.scopes.includes('back') || v.scopes.includes('ci'); })
|
|
41
32
|
.map(function (v) { return "\n ".concat((0, change_case_1.constantCase)(v.name), ": ${").concat(e.gitlabEnvPrefix.toUpperCase(), "_").concat((0, change_case_1.constantCase)(v.name), "}"); })
|
|
42
|
-
.join('')); }).join('\n\n'), "\n\n.deploy-back:\n variables:\n DEPLOY_KIND: \"back\"\n FLUENTD_ENABLED: \"true\"\n PROMETHEUS_RULES_ENABLED: \"true\"\n HELM_ENV: \"\"\n\n.deploy-worker:\n variables:\n DEPLOY_KIND: \"worker\"\n FLUENTD_ENABLED: \"false\"\n PROMETHEUS_RULES_ENABLED: \"false\"\n HELM_ENV: \"--set mountebank.enabled=").concat(options.mountebankEnabled, " --set exportHtml.enabled=").concat(options.exportHtmlEnabled, "\"\n\n.deploy-
|
|
33
|
+
.join('')); }).join('\n\n'), "\n\n.deploy-back:\n variables:\n DEPLOY_KIND: \"back\"\n FLUENTD_ENABLED: \"true\"\n PROMETHEUS_RULES_ENABLED: \"true\"\n HELM_ENV: \"\"\n\n.deploy-worker:\n variables:\n DEPLOY_KIND: \"worker\"\n FLUENTD_ENABLED: \"false\"\n PROMETHEUS_RULES_ENABLED: \"false\"\n HELM_ENV: \"--set mountebank.enabled=").concat(options.mountebankEnabled, " --set exportHtml.enabled=").concat(options.exportHtmlEnabled, "\"\n\n.deploy-bot:\n variables:\n DEPLOY_KIND: \"bot\"\n FLUENTD_ENABLED: \"false\"\n PROMETHEUS_RULES_ENABLED: \"false\"\n HELM_ENV: \"\"\n\n.deploy:\n image:\n name: alpine/helm:3.13.1\n entrypoint: [\"\"]\n before_script:\n - mkdir -p /etc/deploy\n - cp $KUBE_CONFIG $KUBECONFIG\n script:\n - NAMESPACE=${NAMESPACE:-\"").concat(options.k8sNamespacePrefix || prefix, "-${ENV}\"}\n - echo TAG ${TAG}\n - echo NAMESPACE ${NAMESPACE}\n - echo chart ${NAMESPACE}-${DEPLOY_KIND}\n\n - helm upgrade\n --install\n --wait ${NAMESPACE}-${DEPLOY_KIND} chart\n --timeout 3600s\n -f chart/values_${ENV}.yaml\n ${HELM_ENV}\n --namespace ${NAMESPACE}\n --create-namespace\n --set \"global.projectName=${PROJECT_NAME}\"\n --set \"global.clusterName=${CLUSTER_NAME}\"\n --set \"global.env=${ENV}\"\n --set \"global.deployKind=${DEPLOY_KIND}\"\n --set \"app.tag=${TAG}\"\n --set \"ingress.host=${HOST}\"\n --set \"style=${STYLE}\"\n --set \"back.enabled=${BACK_ENABLED}\"\n --set \"ingress.enabled=${INGRESS_ENABLED}\"\n --set \"metrics.enabled=${METRICS_ENABLED}\"\n --set \"worker.enabled=${WORKER_ENABLED}\"\n --set \"bot.enabled=${BOT_ENABLED}\"\n --set \"fluentd.enabled=${FLUENTD_ENABLED}\"\n --set \"prometheus.rules.enabled=${PROMETHEUS_RULES_ENABLED}\"\n --set \"ingress.rootEnabled=${ROOT_ENABLED}\"").concat(system.configVars
|
|
43
34
|
.filter(function (v) { return v.scopes.includes('back') || v.scopes.includes('ci'); })
|
|
44
35
|
.map(function (v) { return "\n --set \"".concat(v.name, "=${").concat((0, change_case_1.constantCase)(v.name), "}\""); })
|
|
45
36
|
.join(''), "\n").concat(options.genBackCiNotify
|
|
@@ -47,4 +38,4 @@ var gitlabCiTmpl = function (_a) {
|
|
|
47
38
|
: '', "\n");
|
|
48
39
|
};
|
|
49
40
|
exports.gitlabCiTmpl = gitlabCiTmpl;
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0bGFiQ2kuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2dlbmVyYXRvcnMvZmlsZVRlbXBsYXRlcy9iYWNrL2Vudmlyb25tZW50L2dpdGxhYkNpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDRCQUE0QjtBQUM1QiwyQ0FBMEM7QUFFMUMsMkNBQW9EO0FBRTdDLElBQU0sWUFBWSxHQUFHLFVBQUMsRUFJRDtRQUhoQixNQUFNLG1CQUFBLEVBQ2hCLE1BQU0sWUFBQSxFQUNOLE9BQU8sYUFBQTtJQUN3QixPQUFBLDBCQUUvQixPQUFPLENBQUMsMEJBQTBCO1FBQ2hDLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLGNBQ0Ysd0JBQWdCLE9BQ25CLGdVQW9CaUIsTUFBTSxDQUFDLElBQUksbU1BVTNCLE9BQU8sQ0FBQyxlQUFlO1FBQ3pCLENBQUMsQ0FBQyxvUEFPTztRQUNULENBQUMsQ0FBQyxFQUFFLDBLQVFLLE1BQU0sQ0FBQyxrQkFBa0I7U0FDN0IsR0FBRyxDQUFDLFVBQUMsQ0FBQyxJQUFLLE9BQUEsa0JBQVcsQ0FBQyxDQUFDLFVBQVUsdUJBQWEsQ0FBQyxDQUFDLFVBQVUsVUFBTyxFQUF2RCxDQUF1RCxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxtbkNBMEJ4RSxNQUFNLENBQUMsa0JBQWtCO1NBQzNCLEdBQUcsQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLGtCQUFXLENBQUMsQ0FBQyxVQUFVLHVCQUFhLENBQUMsQ0FBQyxVQUFVLFVBQU8sRUFBdkQsQ0FBdUQsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsd2hCQXNCakYsTUFBTSxDQUFDLGtCQUFrQjtTQUN4QixHQUFHLENBQUMsVUFBQyxDQUFDO1FBQ0wsT0FBQSxpQkFBVSxDQUFDLENBQUMsSUFBSSx3Q0FDQyxDQUFDLENBQUMsSUFBSSw4REFHZixDQUFDLENBQUMsSUFB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
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.uiResourcesPageTmpl = void 0;
|
|
4
|
-
var types_1 = require("../../../types");
|
|
5
4
|
var cases_1 = require("../../../../utils/cases");
|
|
6
5
|
var utils_1 = require("../../../utils");
|
|
7
6
|
var pluralize_1 = require("pluralize");
|
|
8
7
|
var uiResourcesPageTmpl = function (_a) {
|
|
9
|
-
var entities = _a.entities,
|
|
8
|
+
var entities = _a.entities, options = _a.options;
|
|
10
9
|
return "import React, {\n FC,\n} from 'react';\nimport NumberWidget from '../widgets/NumberWidget';\nimport {\n gql,\n} from '@apollo/client';\nimport {Title, useTranslate} from 'react-admin';\nimport Grid from '@mui/material/Grid';\n".concat(options.skipWarningThisIsGenerated
|
|
11
10
|
? ''
|
|
12
11
|
: "\n// ".concat(utils_1.generatedWarning, "\n"), "\nconst ResourcesPage: FC = () => {\n const translate = useTranslate();\n\n return (\n <Grid container>\n <Title title='app.resources' />\n").concat(entities.map(function (entity) {
|
|
@@ -14,4 +13,4 @@ var uiResourcesPageTmpl = function (_a) {
|
|
|
14
13
|
}).join("\n"), "\n </Grid>\n );\n};\n\nexport default ResourcesPage;\n");
|
|
15
14
|
};
|
|
16
15
|
exports.uiResourcesPageTmpl = uiResourcesPageTmpl;
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VzUGFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9wcm9qZWN0c0dlbmVyYXRpb24vZ2VuZXJhdG9ycy9maWxlVGVtcGxhdGVzL3VpL1Jlc291cmNlc1BhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaURBQXNEO0FBRXRELHdDQUFpRDtBQUNqRCx1Q0FBa0M7QUFFM0IsSUFBTSxtQkFBbUIsR0FBRyxVQUFDLEVBR1I7UUFGMUIsUUFBUSxjQUFBLEVBQ1IsT0FBTyxhQUFBO0lBRVAsT0FBTyw4T0FVUCxPQUFPLENBQUMsMEJBQTBCO1FBQ2hDLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLGVBQ0Qsd0JBQWdCLE9BQ3BCLGtLQVFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsVUFBQyxNQUFNO1FBQ3BCLE9BQU8seUZBR1MsSUFBQSxvQkFBWSxFQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsK0hBS0ksSUFBQSxvQkFBWSxFQUNqRCxNQUFNLENBQUMsSUFBSSxDQUNaLHFEQUNtQixJQUFBLGtCQUFNLEVBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFJLE1BQU0sQ0FBQyxJQUFJLDRDQUMvQyxNQUFNLENBQUMsSUFBSSxnQkFDakIsQ0FBQTtJQUNULENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUNQLENBQUMsK0RBTUQsQ0FBQTtBQUNELENBQUMsQ0FBQTtBQWpEWSxRQUFBLG1CQUFtQix1QkFpRC9CIn0=
|
package/build/projectsGeneration/generators/fileTemplates/ui/environment/chart/templates/front.js
CHANGED
|
@@ -8,10 +8,10 @@ var uiChartFrontTmpl = function (_a) {
|
|
|
8
8
|
var system = _a.system, prefix = _a.system.prefix, options = _a.options;
|
|
9
9
|
return "".concat(options.skipWarningThisIsGenerated
|
|
10
10
|
? ''
|
|
11
|
-
: "\n# ".concat(utils_1.generatedWarning, "\n"), "apiVersion: v1\nkind: Service\nmetadata:\n name:
|
|
11
|
+
: "\n# ".concat(utils_1.generatedWarning, "\n"), "apiVersion: v1\nkind: Service\nmetadata:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n labels:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n projectName: {{ $.Values.global.projectName }}\n clusterName: {{ $.Values.global.clusterName }}\n env: {{ $.Values.global.env }}\n deployKind: {{ $.Values.global.deployKind }}\nspec:\n ports:\n - name: http\n port: 80\n protocol: TCP\n targetPort: 80\n selector:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n---\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\nspec:\n replicas: {{ $.Values.app.replicas }}\n strategy:\n type: RollingUpdate\n rollingUpdate:\n maxSurge: 3\n selector:\n matchLabels:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n template:\n metadata:\n labels:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n projectName: {{ $.Values.global.projectName }}\n clusterName: {{ $.Values.global.clusterName }}\n env: {{ $.Values.global.env }}\n deployKind: {{ $.Values.global.deployKind }}\n spec:\n imagePullSecrets:\n - name: {{ $.Release.Name }}-pullsecret\n containers:\n - name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n image: {{ $.Values.dockerRegistry.domain }}/{{ $.Values.global.projectGroup }}/{{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}{{ $.Values.app.tag }}\n ports:\n - name: main-port\n containerPort: 80\n imagePullPolicy: Always\n livenessProbe:\n httpGet:\n path: /\n port: main-port\n initialDelaySeconds: 60\n timeoutSeconds: 15\n periodSeconds: 5\n readinessProbe:\n httpGet:\n path: /\n port: main-port\n initialDelaySeconds: 60\n timeoutSeconds: 15\n periodSeconds: 5\n startupProbe:\n httpGet:\n path: /\n port: main-port\n initialDelaySeconds: 60\n timeoutSeconds: 15\n failureThreshold: 10\n periodSeconds: 10\n resources:\n requests:\n memory: \"256Mi\"\n cpu: \"0.15\"\n limits:\n memory: \"512Mi\"\n cpu: \"1\"\n env:\n - name: NODE_ENV\n value: production\n - name: RANDOM\n value: {{ $.Values.random | quote }}\n - name: ENV\n value: '{{ $.Values.global.env }}'").concat(system.configVars
|
|
12
12
|
.filter(function (v) { return v.scopes.includes('admin-app'); })
|
|
13
13
|
.map(function (v) { return "\n - name: ".concat((0, change_case_1.constantCase)(v.name), "\n value: {{ $.Values.").concat(v.name, " | quote }}"); })
|
|
14
14
|
.join(''), "\n\n - name: K8S_NODE_NAME\n valueFrom:\n fieldRef:\n fieldPath: spec.nodeName\n - name: K8S_POD_NAME\n valueFrom:\n fieldRef:\n fieldPath: metadata.name\n - name: K8S_POD_NAMESPACE\n valueFrom:\n fieldRef:\n fieldPath: metadata.namespace\n---\n");
|
|
15
15
|
};
|
|
16
16
|
exports.uiChartFrontTmpl = uiChartFrontTmpl;
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJvbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2dlbmVyYXRvcnMvZmlsZVRlbXBsYXRlcy91aS9lbnZpcm9ubWVudC9jaGFydC90ZW1wbGF0ZXMvZnJvbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxpREFBMEQ7QUFFbkQsSUFBTSxnQkFBZ0IsR0FBRyxVQUFDLEVBSUw7UUFIMUIsTUFBTSxZQUFBLEVBQ0ksTUFBTSxtQkFBQSxFQUNoQixPQUFPLGFBQUE7SUFDd0IsT0FBQSxVQUMvQixPQUFPLENBQUMsMEJBQTBCO1FBQ2hDLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLGNBQ0Ysd0JBQWdCLE9BQ25CLGtxRkFzRjZDLE1BQU0sQ0FBQyxVQUFVO1NBQ2xELE1BQU0sQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxFQUE5QixDQUE4QixDQUFDO1NBQzdDLEdBQUcsQ0FDRixVQUFDLENBQUMsSUFBSyxPQUFBLDRCQUFxQixJQUFBLDBCQUFZLEVBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyw0Q0FDL0IsQ0FBQyxDQUFDLElBQUksZ0JBQWEsRUFEN0IsQ0FDNkIsQ0FDckM7U0FDQSxJQUFJLENBQUMsRUFBRSxDQUFDLGtYQWVwQjtBQWhIZ0MsQ0FnSGhDLENBQUE7QUFwSFksUUFBQSxnQkFBZ0Isb0JBb0g1QiJ9
|
package/build/projectsGeneration/generators/fileTemplates/ui/environment/chart/templates/ingress.js
CHANGED
|
@@ -6,7 +6,7 @@ var uiChartIngressTmpl = 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"), "apiVersion: networking.k8s.io/v1\nkind: Ingress\nmetadata:\n name:
|
|
9
|
+
: "\n# ".concat(utils_1.generatedWarning, "\n"), "apiVersion: networking.k8s.io/v1\nkind: Ingress\nmetadata:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n labels:\n app: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n chart: \"{{ .Chart.Name }}-{{ .Chart.Version | replace \"+\" \"_\" }}\"\n release: \"{{ .Release.Name }}\"\n heritage: \"{{ .Release.Service }}\"\n annotations:\n {{- range $key, $value := .Values.ingress.annotations }}\n {{ $key }}: {{ $value | quote }}\n {{- end }}\n {{ if .Values.ingress.letsencryptCert }}\n cert-manager.io/cluster-issuer: \"letsencrypt-prod\"\n {{ end }}\nspec:\n rules:\n {{ if .Values.ingress.rootEnabled }}\n - host: {{ $.Values.ingress.domains.app }}.apps.{{ $.Values.ingress.host }}\n http:\n paths:\n - pathType: Prefix\n path: \"/\"\n backend:\n service:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n port:\n number: 80\n {{ end }}\n - host: {{ $.Values.ingress.domains.app }}.{{ $.Values.global.env }}.apps.{{ $.Values.global.clusterName }}.{{ $.Values.ingress.host }}\n http:\n paths:\n - pathType: Prefix\n path: \"/\"\n backend:\n service:\n name: {{ $.Values.global.projectName }}-{{ $.Values.global.deployKind }}\n port:\n number: 80\n tls:\n - hosts:\n - {{ $.Values.ingress.domains.app }}.{{ $.Values.global.env }}.apps.{{ $.Values.global.clusterName }}.{{ $.Values.ingress.host }}\n secretName: {{ $.Values.ingress.domains.app }}.{{ $.Values.global.env }}.apps.{{ $.Values.global.clusterName }}.{{ $.Values.ingress.host }}-tls\n");
|
|
10
10
|
};
|
|
11
11
|
exports.uiChartIngressTmpl = uiChartIngressTmpl;
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5ncmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3NyYy9wcm9qZWN0c0dlbmVyYXRpb24vZ2VuZXJhdG9ycy9maWxlVGVtcGxhdGVzL3VpL2Vudmlyb25tZW50L2NoYXJ0L3RlbXBsYXRlcy9pbmdyZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLGlEQUEwRDtBQUVuRCxJQUFNLGtCQUFrQixHQUFHLFVBQUMsRUFHUDtRQUZoQixNQUFNLG1CQUFBLEVBQ2hCLE9BQU8sYUFBQTtJQUN3QixPQUFBLFVBQy9CLE9BQU8sQ0FBQywwQkFBMEI7UUFDaEMsQ0FBQyxDQUFDLEVBQUU7UUFDSixDQUFDLENBQUMsY0FDRix3QkFBZ0IsT0FDbkIsK3VEQTZDQTtBQWxEZ0MsQ0FrRGhDLENBQUE7QUFyRFksUUFBQSxrQkFBa0Isc0JBcUQ5QiJ9
|
|
@@ -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"), "\nglobal:\n env: noName\n clusterName: noName\n deployKind: noName\n imagePullPolicy: Always\n\ndev: false\n\ndocker:\n registry: ").concat(options.ciDockerRegistry, "\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\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: \"").concat(options.ingressAnnotationBodySize, "\"\n nginx.ingress.kubernetes.io/proxy-read-timeout: \"7200\"\n nginx.ingress.kubernetes.io/proxy-send-timeout: \"7200\"\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 projectName: ").concat(options.k8sChartName || prefix, "\n projectGroup: ").concat(options.projectsGroup, "\n deployKind: noName\n imagePullPolicy: Always\n\ndev: false\n\ndocker:\n registry: ").concat(options.ciDockerRegistry, "\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\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: \"").concat(options.ingressAnnotationBodySize, "\"\n nginx.ingress.kubernetes.io/proxy-read-timeout: \"7200\"\n nginx.ingress.kubernetes.io/proxy-send-timeout: \"7200\"\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,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsdWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2ZpbGVUZW1wbGF0ZXMvdWkvZW52aXJvbm1lbnQvY2hhcnQvdmFsdWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDhDQUF1RDtBQUVoRCxJQUFNLGlCQUFpQixHQUFHLFVBQUMsRUFHTjtRQUZoQixNQUFNLG1CQUFBLEVBQ2hCLE9BQU8sYUFBQTtJQUN3QixPQUFBLFVBQy9CLE9BQU8sQ0FBQywwQkFBMEI7UUFDaEMsQ0FBQyxDQUFDLEVBQUU7UUFDSixDQUFDLENBQUMsY0FDRix3QkFBZ0IsT0FDbkIsNkVBS2dCLE9BQU8sQ0FBQyxZQUFZLElBQUksTUFBTSwrQkFDN0IsT0FBTyxDQUFDLGFBQWEscUdBT3pCLE9BQU8sQ0FBQyxnQkFBZ0IsK0pBWTFCLE9BQU8sQ0FBQyxtQkFBbUIsdWhCQXFCYSxPQUFPLENBQUMseUJBQXlCLHVKQUcxRSxPQUFPLENBQUMsYUFBYSxpRUFHcEIsT0FBTyxDQUFDLGtCQUFrQixJQUFJLE1BQU0saUNBQy9CLE9BQU8sQ0FBQyxrQkFBa0IsSUFBSSxNQUFNLDZpQkFvQnBEO0FBOUVnQyxDQThFaEMsQ0FBQTtBQWpGWSxRQUFBLGlCQUFpQixxQkFpRjdCIn0=
|
|
@@ -6,18 +6,15 @@ var change_case_1 = require("change-case");
|
|
|
6
6
|
var utils_1 = require("../../../../utils");
|
|
7
7
|
var uiGitlabCiTmpl = function (_a) {
|
|
8
8
|
var prefix = _a.system.prefix, system = _a.system, options = _a.options;
|
|
9
|
-
return "image: node:
|
|
9
|
+
return "image: node:20\n".concat(options.skipWarningThisIsGenerated
|
|
10
10
|
? ''
|
|
11
|
-
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\nstages:\n - check\n - previous-image\n - build\n - latest-image\n - deploy\n
|
|
11
|
+
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\nstages:\n - check\n - previous-image\n - build\n - latest-image\n - deploy\n\ncache:\n paths:\n - .cache\n - .cache_images\n # - node_modules\n\nvariables:\n REPO_NAME: $CI_PROJECT_NAME\n VERBOSE: 'true'\n RELEASE: $CI_COMMIT_SHORT_SHA\n KUBECONFIG: /etc/deploy/config\n PROJECT_NAME: ").concat(system.name, "\n\ncheck:\n stage: check\n image: registry.gitlab.com/making.ventures/images/node-with-tools\n before_script:\n - yarn install --frozen-lockfile\n script:\n - ./check.sh\n").concat(options.genBackCiNotify
|
|
12
12
|
? " after_script:\n - chmod +x ci-notify.sh\n - >\n if [ $CI_JOB_STATUS != 'success' ]; then\n sh ci-notify.sh \"\uD83C\uDD98 $CI_JOB_NAME failed\"\n else\n sh ci-notify.sh \"\u2705 $CI_JOB_NAME success\"\n fi\n"
|
|
13
13
|
: '', "\ntag-previous-with-sha:\n extends: .tag-image\n stage: previous-image\n only:").concat(system.deployEnvironments
|
|
14
14
|
.map(function (e) { return "\n - ".concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/"); }).join(''), "\n allow_failure: true # First run won't be able to create previous image\n variables:\n TAG_ORIGIN: :${CI_COMMIT_REF_SLUG}\n TAG_DESTINATION: :${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\n\nbuild:\n stage: build\n image:\n name: gcr.io/kaniko-project/executor:debug\n entrypoint: ['']\n before_script:\n - mkdir -p /kaniko/.docker\n - echo \"{\\\"auths\\\":{\\\"$CI_REGISTRY\\\":{\\\"username\\\":\\\"$CI_REGISTRY_USER\\\",\\\"password\\\":\\\"$CI_REGISTRY_PASSWORD\\\"}}}\" > /kaniko/.docker/config.json\n # - /kaniko/warmer --cache-dir=$CI_PROJECT_DIR/.cache_images --image=browserless/chrome\n - echo TAG1 \"${CI_COMMIT_REF_SLUG}\"\n - echo TAG2 \"${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n script:\n - /kaniko/executor\n --cache-dir=$CI_PROJECT_DIR/.cache_images\n --context ${CI_PROJECT_DIR}\n --dockerfile ${CI_PROJECT_DIR}/Dockerfile\n --build-arg GIT_COMMIT=${CI_COMMIT_SHA}\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\n --single-snapshot\n only:").concat(system.deployEnvironments
|
|
15
15
|
.map(function (e) { return "\n - ".concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/"); }).join(''), "\n\ntag-latest:\n extends: .tag-image\n stage: latest-image\n only:\n - master\n variables:\n TAG_ORIGIN: master\n TAG_DESTINATION: latest\n\n.tag-image:\n image:\n name: gcr.io/go-containerregistry/crane:debug\n entrypoint: ['']\n script:\n - echo TAG_DESTINATION ${TAG_DESTINATION}\n - crane auth login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY\n - crane cp ${CI_REGISTRY_IMAGE}:${TAG_ORIGIN} ${CI_REGISTRY_IMAGE}:${TAG_DESTINATION}\n variables:\n GIT_STRATEGY: none\n\n").concat(system.deployEnvironments
|
|
16
16
|
.map(function (e) {
|
|
17
17
|
return "deploy-".concat(e.name, ":\n extends: .deploy-").concat(e.name, "\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
18
|
-
}).join('\n\n'), "\n\n").concat(system.deployEnvironments
|
|
19
|
-
.map(function (e) {
|
|
20
|
-
return "deploy-".concat(e.name, "-previous:\n extends: .deploy-").concat(e.name, "\n stage: deploy-previous\n when: manual\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
21
18
|
}).join('\n\n'), "\n\n").concat(system.deployEnvironments
|
|
22
19
|
.map(function (e) { return ".deploy-".concat(e.name, ":\n extends: .deploy-ui\n stage: deploy\n when: ").concat(e.manualDeploy ? 'manual' : 'on_success', "\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/\n tags:\n - ").concat(e.runnerTag, "\n variables:\n ENV: \"").concat(e.name, "\"\n DEV: \"false\"\n HOST: \"").concat(e.host, "\"\n ROOT_ENABLED: \"").concat(e.main, "\"\n KUBE_CONFIG: ${KUBE_").concat(e.clusterName.toUpperCase(), "_CONFIG}\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"").concat(system.configVars
|
|
23
20
|
.filter(function (v) { return v.scopes.includes('admin-app') || v.scopes.includes('ci'); })
|
|
@@ -30,4 +27,4 @@ var uiGitlabCiTmpl = function (_a) {
|
|
|
30
27
|
: '', "\n");
|
|
31
28
|
};
|
|
32
29
|
exports.uiGitlabCiTmpl = uiGitlabCiTmpl;
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0bGFiQ2kuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2dlbmVyYXRvcnMvZmlsZVRlbXBsYXRlcy91aS9lbnZpcm9ubWVudC9naXRsYWJDaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw0QkFBNEI7QUFDNUIsMkNBQTBDO0FBRTFDLDJDQUFvRDtBQUU3QyxJQUFNLGNBQWMsR0FBRyxVQUFDLEVBSUg7UUFIaEIsTUFBTSxtQkFBQSxFQUNoQixNQUFNLFlBQUEsRUFDTixPQUFPLGFBQUE7SUFDd0IsT0FBQSwwQkFFL0IsT0FBTyxDQUFDLDBCQUEwQjtRQUNoQyxDQUFDLENBQUMsRUFBRTtRQUNKLENBQUMsQ0FBQyxjQUNGLHdCQUFnQixPQUNuQixnVUFvQmlCLE1BQU0sQ0FBQyxJQUFJLG1NQVUzQixPQUFPLENBQUMsZUFBZTtRQUN6QixDQUFDLENBQUMsc1BBUUQ7UUFDRCxDQUFDLENBQUMsRUFBRSw4RkFLSyxNQUFNLENBQUMsa0JBQWtCO1NBQzdCLEdBQUcsQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLGtCQUFXLENBQUMsQ0FBQyxVQUFVLHVCQUFhLENBQUMsQ0FBQyxVQUFVLFVBQU8sRUFBdkQsQ0FBdUQsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsbW5DQTBCeEUsTUFBTSxDQUFDLGtCQUFrQjtTQUM3QixHQUFHLENBQUMsVUFBQyxDQUFDLElBQUssT0FBQSxrQkFBVyxDQUFDLENBQUMsVUFBVSx1QkFBYSxDQUFDLENBQUMsVUFBVSxVQUFPLEVBQXZELENBQXVELENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLHdoQkFzQi9FLE1BQU0sQ0FBQyxrQkFBa0I7U0FDeEIsR0FBRyxDQUFDLFVBQUMsQ0FBQztRQUNMLE9BQUEsaUJBQVUsQ0FBQyxDQUFDLElBQUksbUNBQ0MsQ0FBQyxDQUFDLElBQUkseURBR2YsQ0FBQyxDQUFDLElBQUkscUNBQ0csQ0FBQyxDQUFDLFdBQVcsc0ZBRzFCLENBQUMsQ0FBQyxVQUFVLHVCQUNWLENBQUMsQ0FBQyxVQUFVLFVBQU87SUFUekIsQ0FTeUIsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsaUJBRXpDLE1BQU0sQ0FBQyxrQkFBa0I7U0FDeEIsR0FBRyxDQUFDLFVBQUMsQ0FBQyxJQUFJLE9BQUEsa0JBQVcsQ0FBQyxDQUFDLElBQUksZ0VBR3BCLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsWUFBWSw4QkFFMUMsQ0FBQyxDQUFDLFVBQVUsdUJBQ1YsQ0FBQyxDQUFDLFVBQVUsbUNBRWQsQ0FBQyxDQUFDLFNBQVMsd0NBRVAsQ0FBQyxDQUFDLElBQUksaURBRUwsQ0FBQyxDQUFDLElBQUkscUNBQ0UsQ0FBQyxDQUFDLElBQUkseUNBQ0EsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxXQUFXLEVBQUUsMkVBQ0EsTUFBTSxDQUFDLFVBQVU7U0FDaEUsTUFBTSxDQUFDLFVBQUMsQ0FBQyxJQUFLLE9BQUEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQXpELENBQXlELENBQUM7U0FDeEUsR0FBRyxDQUNGLFVBQUMsQ0FBQyxJQUFLLE9BQUEsZ0JBQVMsSUFBQSwwQkFBWSxFQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsaUJBQVEsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxXQUFXLEVBQUUsY0FBSSxJQUFBLDBCQUFZLEVBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFHLEVBQS9GLENBQStGLENBQ3ZHO1NBQ0EsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFFLEVBcEJKLENBb0JJLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGdTQWVFLE9BQU8sQ0FBQyxrQkFBa0IsSUFBSSxNQUFNLGtxQkFtQmpCLE1BQU0sQ0FBQyxVQUFVO1NBQzVELE1BQU0sQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUF6RCxDQUF5RCxDQUFDO1NBQ3hFLEdBQUcsQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLDBCQUFrQixDQUFDLENBQUMsSUFBSSxnQkFBTyxJQUFBLDBCQUFZLEVBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFJLEVBQXZELENBQXVELENBQUM7U0FDbkUsSUFBSSxDQUFDLEVBQUUsQ0FBQyxlQUVmLE9BQU8sQ0FBQyxlQUFlO1FBQ3pCLENBQUMsQ0FBQyx1TkFNTztRQUNULENBQUMsQ0FBQyxFQUFFLE9BRUg7QUF4TGdDLENBd0xoQyxDQUFBO0FBNUxZLFFBQUEsY0FBYyxrQkE0TDFCIn0=
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.uiGetDefaultMenuTmpl = void 0;
|
|
4
|
-
var types_1 = require("../../../types");
|
|
5
4
|
var buildedTypes_1 = require("../../../builders/buildedTypes");
|
|
6
5
|
var utils_1 = require("../../../utils");
|
|
7
6
|
var pluralize_1 = require("pluralize");
|
|
@@ -28,7 +27,7 @@ var menuItemTmpl = function (item) {
|
|
|
28
27
|
}
|
|
29
28
|
};
|
|
30
29
|
var uiGetDefaultMenuTmpl = function (_a) {
|
|
31
|
-
var system = _a.system, entities = _a.entities,
|
|
30
|
+
var system = _a.system, entities = _a.entities, options = _a.options;
|
|
32
31
|
var entitiesToShow = entities.sort(function (a, b) {
|
|
33
32
|
return a.title['ru'].plural.localeCompare(b.title['ru'].plural, 'en');
|
|
34
33
|
});
|
|
@@ -43,4 +42,4 @@ var uiGetDefaultMenuTmpl = function (_a) {
|
|
|
43
42
|
: "\n// ".concat(utils_1.generatedWarning, "\n"), "\nconst getDefaultMenu = () => {\n const menuData: MenuElement[] = [\n").concat(system.menuItems.map(function (i) { return "".concat(menuItemTmpl(i), ","); }).map(utils_1.pad2).join('\n'), "\n {\n label: 'app.menu.functions',\n link: '/functions',\n icon: 'DetailsOutlined',\n debugOnly: true,\n },\n {\n label: 'app.menu.resources',\n link: '/resources',\n icon: 'DetailsOutlined',\n debugOnly: true,\n },\n {\n label: 'app.menu.meta',\n link: '/meta',\n icon: 'DetailsOutlined',\n debugOnly: true,\n },\n ];\n\n const infoRegistriesMenuData: MenuElement[] = [\n").concat(infoRegistries.map(function (entity) { return renderEntity(entity); }).join('\n'), "\n ];\n\n if (infoRegistriesMenuData.length) {\n menuData.push({\n label: 'app.infoRegistries',\n icon: 'DetailsOutlined',\n debugOnly: true,\n children: infoRegistriesMenuData,\n });\n }\n\n const sumRegistriesMenuData: MenuElement[] = [\n").concat(sumRegistries.map(function (entity) { return renderEntity(entity); }).join('\n'), "\n ];\n\n if (sumRegistriesMenuData.length) {\n menuData.push({\n label: 'app.sumRegistries',\n icon: 'DetailsOutlined',\n debugOnly: true,\n children: sumRegistriesMenuData,\n });\n }\n\n const documentsMenuData: MenuElement[] = [\n").concat(documents.map(function (entity) { return renderEntity(entity); }).join('\n'), "\n ];\n\n if (documentsMenuData.length) {\n menuData.push({\n label: 'app.documents',\n icon: 'DetailsOutlined',\n debugOnly: true,\n children: documentsMenuData,\n });\n }\n\n const catalogsMenuData: MenuElement[] = [\n").concat(catalogs.map(function (entity) { return renderEntity(entity); }).join('\n'), "\n ];\n\n if (catalogsMenuData.length) {\n menuData.push({\n label: 'app.catalogs',\n icon: 'DetailsOutlined',\n debugOnly: true,\n children: catalogsMenuData,\n });\n }\n\n return menuData;\n};\n\nexport default getDefaultMenu;\n");
|
|
44
43
|
};
|
|
45
44
|
exports.uiGetDefaultMenuTmpl = uiGetDefaultMenuTmpl;
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0RGVmYXVsdE1lbnUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2dlbmVyYXRvcnMvZmlsZVRlbXBsYXRlcy91aS9nZXREZWZhdWx0TWVudS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrREFBNkU7QUFFN0Usd0NBQXFEO0FBQ3JELHVDQUFnQztBQUVoQyxJQUFNLG1CQUFtQixHQUFHLFVBQUMsSUFBYztJQUN6QyxRQUFRLElBQUksQ0FBQyxRQUFRLEVBQUU7UUFDckIsS0FBSywyQkFBWSxDQUFDLFdBQVc7WUFDM0IsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDO1FBQ2xCLEtBQUssMkJBQVksQ0FBQyxLQUFLO1lBQ3JCLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUM5QztZQUNFLE9BQU8sS0FBSyxDQUFDO0tBQ2hCO0FBQ0gsQ0FBQyxDQUFBO0FBRUQsSUFBTSxZQUFZLEdBQUcsVUFBQyxJQUFjO0lBQ2xDLFFBQVEsSUFBSSxDQUFDLFFBQVEsRUFBRTtRQUNyQixLQUFLLDJCQUFZLENBQUMsS0FBSztZQUNyQixPQUFPLHVCQUNELElBQUksQ0FBQyxLQUFLLDBCQUNYLElBQUksQ0FBQyxjQUFjLDhCQUNmLElBQUksQ0FBQyxTQUFTLCtCQUNaLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxhQUN6QyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxVQUFBLENBQUMsSUFBSSxPQUFBLFdBQUksQ0FBQyxPQUFJLEVBQVQsQ0FBUyxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFDdkQsQ0FBQyxDQUFDLENBQUMsSUFBSSw0QkFDRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsYUFDaEMsSUFBSSxD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
|