@catladder/cli 0.0.0-next-e2e4f00a → 0.0.0-next-c0c5f6da
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/bundles/catenv/index.js +55 -159
- package/dist/bundles/cli/index.js +55 -159
- package/dist/pipeline/src/build/base/createAppBuildJob.js +2 -3
- package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
- package/dist/pipeline/src/build/custom/testJob.js +10 -11
- package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.js +1 -1
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.d.ts +1 -3
- package/dist/pipeline/src/build/node/cache.js +1 -27
- package/dist/pipeline/src/build/node/cache.js.map +1 -1
- package/dist/pipeline/src/build/node/testJob.js +10 -11
- package/dist/pipeline/src/build/node/testJob.js.map +1 -1
- package/dist/pipeline/src/build/rails/build.js +0 -1
- package/dist/pipeline/src/build/rails/build.js.map +1 -1
- package/dist/pipeline/src/build/rails/test.js +7 -8
- package/dist/pipeline/src/build/rails/test.js.map +1 -1
- package/dist/pipeline/src/build/types.d.ts +0 -10
- package/dist/pipeline/src/build/types.js.map +1 -1
- package/dist/pipeline/src/context/createComponentContext.js +0 -1
- package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironment.js +0 -1
- package/dist/pipeline/src/context/getEnvironment.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +2 -5
- package/dist/pipeline/src/context/getEnvironmentVariables.js +9 -19
- package/dist/pipeline/src/context/getEnvironmentVariables.js.map +1 -1
- package/dist/pipeline/src/context/resolveReferences.d.ts +0 -3
- package/dist/pipeline/src/context/resolveReferences.js +1 -10
- package/dist/pipeline/src/context/resolveReferences.js.map +1 -1
- package/dist/pipeline/src/deploy/base/deploy.js +3 -4
- package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/index.js +2 -2
- package/dist/pipeline/src/deploy/cloudRun/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js +3 -15
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js +0 -2
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/index.js +2 -2
- package/dist/pipeline/src/deploy/kubernetes/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.d.ts +1 -2
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js +2 -3
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js.map +1 -1
- package/dist/pipeline/src/deploy/types/base.d.ts +0 -6
- package/dist/pipeline/src/deploy/types/kubernetes.d.ts +1 -34
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +2 -4
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
- package/dist/pipeline/src/types/config.d.ts +0 -8
- package/dist/pipeline/src/types/context.d.ts +0 -8
- package/dist/pipeline/src/types/context.js.map +1 -1
- package/dist/pipeline/src/types/jobs.d.ts +0 -8
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.d.ts +0 -85
- package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.js +0 -27
- package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
|
|
|
56
56
|
],
|
|
57
57
|
getAdditionalEnvVars: (ctx) => {
|
|
58
58
|
const { fullName, env, componentName, deployConfigRaw } = ctx;
|
|
59
|
-
const
|
|
59
|
+
const HOSTNAME_INTERNAL = (0, BashExpression_1.joinBashExpressions)([
|
|
60
60
|
fullName,
|
|
61
61
|
(0, BashExpression_1.getBashVariable)((0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)),
|
|
62
62
|
], "-").toLowerCase();
|
|
@@ -67,7 +67,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
|
|
|
67
67
|
]))
|
|
68
68
|
: {};
|
|
69
69
|
return {
|
|
70
|
-
|
|
70
|
+
HOSTNAME_INTERNAL,
|
|
71
71
|
...getCloudSqlVariables(ctx),
|
|
72
72
|
...jobTriggers,
|
|
73
73
|
DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/index.ts"],"names":[],"mappings":";;;AACA,8DAGmC;AAEnC,2CAAiD;AAEjD,+CAA6D;AAC7D,6CAAkD;AAClD,6CAA8D;AAC9D,+CAG0B;AAC1B,6CAAqD;AAExC,QAAA,6BAA6B,GAAG,8BAA8B,CAAC;AAE5E,4HAA4H;AAC/G,QAAA,gCAAgC,GAC3C,gCAAgC,CAAC;AAEnC,MAAM,oBAAoB,GAAG,CAAC,EAC5B,eAAe,EACf,qBAAqB,EACrB,GAAG,EACH,aAAa,EACb,UAAU,GAC4C,EAAE,EAAE;;IAC1D,IAAI,eAAe,IAAI,eAAe,CAAC,QAAQ,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,IAAA,qBAAa,EAC3B,eAAe,CAAC,QAAQ,EACxB,UAAU,EACV,qBAAqB,EACrB,aAAa,CACd,CAAC;QAEF,MAAM,2BAA2B,GAAG,MAAM,CAAC,OAAO,CAChD,MAAA,eAAe,CAAC,QAAQ,CAAC,uBAAuB,mCAAI,EAAE,CACvD;aACE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,KAAK,EAAE,CAAC;aACzC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEZ,OAAO;YACL,kCAAkC,EAChC,eAAe,CAAC,QAAQ,CAAC,sBAAsB;YACjD,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,MAAA,eAAe,CAAC,QAAQ,CAAC,MAAM,mCAAI,UAAU;YACtD,WAAW,EAAE,GAAG,GAAG,IAAA,0BAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,aAAa,CAAC;YACtE,YAAY,EAAE,GAAG,IAAA,sCAA2B,EAC1C,eAAe,CAAC,QAAQ,CACzB,GAAG,2BAA2B,EAAE;YACjC,iBAAiB,EAAE,4BAAiB;SACrC,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AACW,QAAA,sBAAsB,GACjC;IACE,IAAI,EAAE,2CAA8B;IACpC,QAAQ,EAAE,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE,EAAE;QACzC,IAAI,eAAe,IAAI,eAAe,CAAC,QAAQ,EAAE,CAAC;YAChD,OAAO;gBACL,QAAQ,EAAE;oBACR,oBAAoB,EAAE,OAAO,KAAK,QAAQ;iBAC3C;aACF,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,oBAAoB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC;QAC7B;YACE,GAAG,EAAE,qCAA6B;YAClC,MAAM,EAAE,IAAI;SACb;QACD;YACE,GAAG,EAAE,wCAAgC;YACrC,MAAM,EAAE,IAAI;SACb;QACD,GAAG,CAAC,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,eAAe,CAAC,QAAQ;YACrD,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC;YAC1B,CAAC,CAAC,EAAE,CAAC;KACR;IACD,oBAAoB,EAAE,CAAC,GAAG,EAAE,EAAE;QAC5B,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC;QAE9D,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const hasKubernetesCloudSQL = (context) => {
|
|
|
14
14
|
};
|
|
15
15
|
exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
|
|
16
16
|
const createKubernetesCloudsqlBaseValues = (context) => {
|
|
17
|
-
var _a, _b, _c
|
|
17
|
+
var _a, _b, _c;
|
|
18
18
|
const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
19
19
|
if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
|
|
20
20
|
throw new Error("cannot get cloud sql config");
|
|
@@ -24,23 +24,11 @@ const createKubernetesCloudsqlBaseValues = (context) => {
|
|
|
24
24
|
throw new Error("cannot get cloud sql config");
|
|
25
25
|
}
|
|
26
26
|
const proxyCredentials = `$${(0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials")}`;
|
|
27
|
-
if (
|
|
28
|
-
const instanceConnectionName = `${(_c = config.projectId) !== null && _c !== void 0 ? _c : "skynet-164509"}:${(_d = config.region) !== null && _d !== void 0 ? _d : "europe-west6"}:${(_e = config.instanceId) !== null && _e !== void 0 ? _e : context.environment.envVars.KUBE_NAMESPACE}`;
|
|
29
|
-
return {
|
|
30
|
-
cloudsql: {
|
|
31
|
-
enabled: config.enabled,
|
|
32
|
-
dbUser: "postgres",
|
|
33
|
-
instanceConnectionName,
|
|
34
|
-
proxyCredentials,
|
|
35
|
-
fullDbName: (_f = context.environment.envVars.KUBE_APP_NAME) !== null && _f !== void 0 ? _f : "",
|
|
36
|
-
},
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
else if (config.type === "unmanaged") {
|
|
27
|
+
if (config.type === "unmanaged") {
|
|
40
28
|
return {
|
|
41
29
|
cloudsql: {
|
|
42
30
|
enabled: config.enabled,
|
|
43
|
-
dbUser: (
|
|
31
|
+
dbUser: (_c = config.dbUser) !== null && _c !== void 0 ? _c : "postgres",
|
|
44
32
|
instanceConnectionName: config.instanceConnectionName,
|
|
45
33
|
proxyCredentials,
|
|
46
34
|
fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.name),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/kubernetes/cloudSql/index.ts"],"names":[],"mappings":";;;AACA,8CAA8D;AAE9D,gDAAqD;AACrD,uCAA6C;AAEtC,MAAM,qBAAqB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACjE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,MAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,0CAAE,OAAO,CAAC;IAChD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAUK,MAAM,kCAAkC,GAAG,CAChD,OAAyB,EAGzB,EAAE;;IACF,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,MAAM,GAAG,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,CAAC;IAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,IAAA,oCAA0B,EACrD,OAAO,EACP,0BAA0B,CAC3B,EAAE,CAAC;IACJ,IAAI,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/kubernetes/cloudSql/index.ts"],"names":[],"mappings":";;;AACA,8CAA8D;AAE9D,gDAAqD;AACrD,uCAA6C;AAEtC,MAAM,qBAAqB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACjE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,MAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,0CAAE,OAAO,CAAC;IAChD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAUK,MAAM,kCAAkC,GAAG,CAChD,OAAyB,EAGzB,EAAE;;IACF,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,MAAM,GAAG,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,CAAC;IAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,IAAA,oCAA0B,EACrD,OAAO,EACP,0BAA0B,CAC3B,EAAE,CAAC;IACJ,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAChC,OAAO;YACL,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,UAAU;gBACnC,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;gBACrD,gBAAgB;gBAChB,UAAU,EAAE,IAAA,qBAAa,EACvB,MAAM,EACN,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,CAAC,UAAU,EAC9B,OAAO,CAAC,IAAI,CACb;aACF;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;AACH,CAAC,CAAC;AAtCW,QAAA,kCAAkC,sCAsC7C"}
|
|
@@ -40,8 +40,6 @@ const createKubernetesDeployJobs = (context) => {
|
|
|
40
40
|
...((_c = deployConfig.additionalHelmArgs) !== null && _c !== void 0 ? _c : []),
|
|
41
41
|
].join(" "),
|
|
42
42
|
COMPONENT_NAME: context.name,
|
|
43
|
-
/** @deprecated */
|
|
44
|
-
BUILD_ID: context.environment.envVars.BUILD_INFO_BUILD_ID,
|
|
45
43
|
},
|
|
46
44
|
};
|
|
47
45
|
const clusterName = `kube-${context.environment.fullName}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/deployJob.ts"],"names":[],"mappings":";;;AAAA,mFAAmF;AACnF,yCAA8C;AAG9C,kCAAgD;AAChD,kCAGiB;AACjB,oCAA0C;AAC1C,6CAAgD;AAEhD,kDAAgE;AAChE,+CAAyD;AAEzD,MAAM,eAAe,GAAG,kBAAkB,CAAC;AACpC,MAAM,0BAA0B,GAAG,CACxC,OAAyB,EACT,EAAE;;IAClB,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,MAAM,GAA4D;QACtE,KAAK,EAAE,IAAA,uBAAc,EAAC,YAAY,CAAC;QACnC,GAAG,CAAC,YAAY,CAAC,KAAK;YACpB,CAAC,CAAC;gBACE,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,eAAe,EAAE,QAAQ;qBAC1B;oBACD,IAAI,EAAE,QAAQ;iBACf;aACF;YACH,CAAC,CAAC,EAAE,CAAC;QACP,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;YAC9B,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ;YAC1C,qBAAqB,EAAE,GAAG;YAC1B,6BAA6B,EAAE,mBAAmB,OAAO,CAAC,IAAI,EAAE;YAChE,sBAAsB,EACpB,MAAA,YAAY,CAAC,SAAS,mCAAI,+BAA+B;YAC3D,SAAS,EAAE;gBACT,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1C,GAAG,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC;aAC3C,CAAC,IAAI,CAAC,GAAG,CAAC;YACX,cAAc,EAAE,OAAO,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/deployJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ exports.KUBERNETES_DEPLOY_TYPE = {
|
|
|
37
37
|
const domainCanonical = (deployConfigRaw && ((_a = deployConfigRaw.cluster) === null || _a === void 0 ? void 0 : _a.domainCanonical)) || // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
|
|
38
38
|
fullConfig.domainCanonical ||
|
|
39
39
|
"panter.cloud";
|
|
40
|
-
const
|
|
40
|
+
const HOSTNAME_INTERNAL = (0, BashExpression_1.joinBashExpressions)([
|
|
41
41
|
componentSlug,
|
|
42
42
|
...(envType === "review" && reviewSlug ? [reviewSlug] : []),
|
|
43
43
|
env,
|
|
@@ -49,7 +49,7 @@ exports.KUBERNETES_DEPLOY_TYPE = {
|
|
|
49
49
|
KUBE_NAMESPACE,
|
|
50
50
|
KUBE_APP_NAME,
|
|
51
51
|
KUBE_APP_NAME_PREFIX,
|
|
52
|
-
|
|
52
|
+
HOSTNAME_INTERNAL,
|
|
53
53
|
};
|
|
54
54
|
},
|
|
55
55
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,sDAA8B;AAE9B,0BAA4C;AAC5C,8DAAgE;AAChE,iEAAwE;AACxE,2CAAyD;AACzD,6CAA2B;AACd,QAAA,sBAAsB,GACjC;IACE,IAAI,EAAE,sCAA0B;IAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IACpB,oBAAoB,EAAE,qDAA8B;IACpD,oBAAoB,EAAE,CAAC,EACrB,aAAa,EACb,UAAU,EACV,eAAe,EACf,GAAG,EACH,UAAU,EACV,OAAO,GACR,EAAE,EAAE;;QACH,MAAM,oBAAoB,GACxB,OAAO,KAAK,QAAQ,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACjE,MAAM,cAAc,GAAG,IAAA,0BAAsB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,aAAa,GAAG,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAC;QAE7C,MAAM,eAAe,GACnB,CAAC,eAAe,KAAI,MAAA,eAAe,CAAC,OAAO,0CAAE,eAAe,CAAA,CAAC,IAAI,gKAAgK;YACjO,UAAU,CAAC,eAAe;YAC1B,cAAc,CAAC;QAEjB,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,sDAA8B;AAE9B,0BAA4C;AAC5C,8DAAgE;AAChE,iEAAwE;AACxE,2CAAyD;AACzD,6CAA2B;AACd,QAAA,sBAAsB,GACjC;IACE,IAAI,EAAE,sCAA0B;IAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IACpB,oBAAoB,EAAE,qDAA8B;IACpD,oBAAoB,EAAE,CAAC,EACrB,aAAa,EACb,UAAU,EACV,eAAe,EACf,GAAG,EACH,UAAU,EACV,OAAO,GACR,EAAE,EAAE;;QACH,MAAM,oBAAoB,GACxB,OAAO,KAAK,QAAQ,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACjE,MAAM,cAAc,GAAG,IAAA,0BAAsB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,aAAa,GAAG,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAC;QAE7C,MAAM,eAAe,GACnB,CAAC,eAAe,KAAI,MAAA,eAAe,CAAC,OAAO,0CAAE,eAAe,CAAA,CAAC,IAAI,gKAAgK;YACjO,UAAU,CAAC,eAAe;YAC1B,cAAc,CAAC;QAEjB,MAAM,iBAAiB,GAAG,IAAA,oCAAmB,EAC3C;YACE,aAAa;YACb,GAAG,CAAC,OAAO,KAAK,QAAQ,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG;YACH,UAAU,CAAC,OAAO;YAClB,UAAU,CAAC,YAAY;YACvB,eAAe;SAChB,EACD,GAAG,CACJ,CAAC,CAAC,kCAAkC;QACrC,OAAO;YACL,cAAc;YACd,aAAa;YACb,oBAAoB;YACpB,iBAAiB;SAClB,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -62,7 +62,7 @@ export declare const createKubeValues: (context: ComponentContext) => any[] | ({
|
|
|
62
62
|
};
|
|
63
63
|
}>;
|
|
64
64
|
} & {
|
|
65
|
-
cloudsql?: import("../types").
|
|
65
|
+
cloudsql?: import("../types").DeployConfigKubernetesValuesCloudSQLUnmanaged;
|
|
66
66
|
mongodb?: import("../types").DeployConfigMongodb;
|
|
67
67
|
mailhog?: {
|
|
68
68
|
enabled: boolean;
|
|
@@ -73,7 +73,6 @@ export declare const createKubeValues: (context: ComponentContext) => any[] | ({
|
|
|
73
73
|
mapServiceUrlToEnv?: {
|
|
74
74
|
[envVar: string]: string;
|
|
75
75
|
};
|
|
76
|
-
secretsAsFile?: string[];
|
|
77
76
|
jobs: {
|
|
78
77
|
[k: string]: false | import("../types/base").AllowUnknownProps<{
|
|
79
78
|
command: string;
|
|
@@ -7,7 +7,6 @@ const types_1 = require("../types");
|
|
|
7
7
|
const cloudSql_1 = require("./cloudSql");
|
|
8
8
|
const kubeEnv_1 = require("./kubeEnv");
|
|
9
9
|
const mongodb_1 = require("./mongodb");
|
|
10
|
-
const processSecretsAsFiles_1 = require("./processSecretsAsFiles");
|
|
11
10
|
const createAppConfig = (context, application) => {
|
|
12
11
|
if (application === false) {
|
|
13
12
|
return {
|
|
@@ -64,11 +63,11 @@ const createKubeValues = (context) => {
|
|
|
64
63
|
: {}, ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled)
|
|
65
64
|
? (0, mongodb_1.createMongodbBaseConfig)(context)
|
|
66
65
|
: {});
|
|
67
|
-
const kubeValues = (0,
|
|
66
|
+
const kubeValues = (0, utils_1.mergeWithMergingArrays)(defaultKubeValues, {
|
|
68
67
|
jobs: removeFalsy(jobs),
|
|
69
68
|
cronjobs: removeFalsy(cronjobs),
|
|
70
69
|
...rest,
|
|
71
|
-
})
|
|
70
|
+
});
|
|
72
71
|
return kubeValues;
|
|
73
72
|
};
|
|
74
73
|
exports.createKubeValues = createKubeValues;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubeValues.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeValues.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAG/B,uCAAqD;AAErD,oCAA0C;AAC1C,yCAGoB;AAEpB,uCAA0C;AAC1C,uCAAoD;
|
|
1
|
+
{"version":3,"file":"kubeValues.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/kubeValues.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAG/B,uCAAqD;AAErD,oCAA0C;AAC1C,yCAGoB;AAEpB,uCAA0C;AAC1C,uCAAoD;AAEpD,MAAM,eAAe,GAAG,CACtB,OAAyB,EACzB,WAAwD,EACX,EAAE;IAC/C,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;QAC1B,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC;IAE5D,OAAO,IAAA,8BAAsB,EAC3B;QACE,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI;QAC9B,OAAO,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY;QACrD,aAAa,EAAE;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,UAAU;aAChC;SACF;QACD,cAAc,EAAE;YACd,OAAO,EAAE;gBACP,IAAI,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,UAAU;aAChC;SACF;QACD,YAAY,EAAE;YACZ,OAAO,EAAE;gBACP,IAAI,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,UAAU;aAChC;SACF;KACF,EAAE,UAAU;IACb,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAI,MAAkC,EAAE,EAAE;IAC5D,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,KAAK,CAAC,CAC9D,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IAC5D,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IAEhC,gJAAgJ;IAChJ,0CAA0C;IAC1C,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;IAE9D,MAAM,GAAG,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,CAAC;IAEnC,MAAM,iBAAiB,GAAG,IAAA,cAAK,EAC7B;QACE,GAAG;QACH,WAAW,EAAE,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC;KACnD,EACD,IAAA,gCAAqB,EAAC,OAAO,CAAC;QAC5B,CAAC,CAAC,IAAA,6CAAkC,EAAC,OAAO,CAAC;QAC7C,CAAC,CAAC,EAAE,EACN,CAAA,MAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,OAAO,0CAAE,OAAO;QACnC,CAAC,CAAC,IAAA,iCAAuB,EAAC,OAAO,CAAC;QAClC,CAAC,CAAC,EAAE,CACP,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,8BAAsB,EAAC,iBAAiB,EAAE;QAC3D,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC;QACvB,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC;QAE/B,GAAG,IAAI;KACR,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAvCW,QAAA,gBAAgB,oBAuC3B"}
|
|
@@ -20,12 +20,6 @@ export type DeployConfigBase = {
|
|
|
20
20
|
* Can curently not reference other variables from other components
|
|
21
21
|
*/
|
|
22
22
|
jobVars?: EnvVars;
|
|
23
|
-
/**
|
|
24
|
-
* additional env vars for the deploy job
|
|
25
|
-
*
|
|
26
|
-
* @deprecated use deploy.jobVars for deploy job specific variables
|
|
27
|
-
*/
|
|
28
|
-
extraVars?: Record<string, string>;
|
|
29
23
|
/**
|
|
30
24
|
* additional vars only for the runner.
|
|
31
25
|
* Also if you use services: that require env vars, you need to set them here.
|
|
@@ -152,32 +152,6 @@ export type DeployConfigMongodbReplicaset = {
|
|
|
152
152
|
replicaCount?: number;
|
|
153
153
|
};
|
|
154
154
|
export type DeployConfigMongodb = DeployConfigMongodbBase & (DeployConfigMongodbStandalone | DeployConfigMongodbReplicaset);
|
|
155
|
-
/**
|
|
156
|
-
* @deprecated use config with instanceConnectionName
|
|
157
|
-
*/
|
|
158
|
-
type DeployConfigKubernetesValuesCloudSQLLegacy = {
|
|
159
|
-
enabled: boolean;
|
|
160
|
-
/**
|
|
161
|
-
* @deprecated use config with instanceConnectionName
|
|
162
|
-
*/
|
|
163
|
-
instanceId?: string;
|
|
164
|
-
/**
|
|
165
|
-
* @deprecated use config with instanceConnectionName
|
|
166
|
-
*/
|
|
167
|
-
projectId?: string;
|
|
168
|
-
/**
|
|
169
|
-
* @deprecated use config with instanceConnectionName
|
|
170
|
-
*/
|
|
171
|
-
region?: string;
|
|
172
|
-
/**
|
|
173
|
-
* @deprecated use type "unmanaged".
|
|
174
|
-
*
|
|
175
|
-
* Be aware that "unmanaged" is not fully backward compatible with "legacy".
|
|
176
|
-
*
|
|
177
|
-
*
|
|
178
|
-
*/
|
|
179
|
-
type?: "legacy";
|
|
180
|
-
};
|
|
181
155
|
export type DeployConfigKubernetesValuesCloudSQLUnmanaged = {
|
|
182
156
|
enabled: boolean;
|
|
183
157
|
instanceConnectionName: string;
|
|
@@ -204,7 +178,7 @@ export type DeployConfigKubernetesValuesCloudSQLUnmanaged = {
|
|
|
204
178
|
*/
|
|
205
179
|
dbBaseName?: string;
|
|
206
180
|
};
|
|
207
|
-
export type DeployConfigKubernetesValuesCloudSQL =
|
|
181
|
+
export type DeployConfigKubernetesValuesCloudSQL = DeployConfigKubernetesValuesCloudSQLUnmanaged;
|
|
208
182
|
export type DeployConfigKubernetesValues = AllowUnknownProps<{
|
|
209
183
|
/**
|
|
210
184
|
* enable cloudsql db. Currently you have to manually set it up
|
|
@@ -323,13 +297,6 @@ export type DeployConfigKubernetesValues = AllowUnknownProps<{
|
|
|
323
297
|
mapServiceUrlToEnv?: {
|
|
324
298
|
[envVar: string]: string;
|
|
325
299
|
};
|
|
326
|
-
/**
|
|
327
|
-
* Mount secrets as files in the filesystem.
|
|
328
|
-
* These secrets are still available as env vars, but will contain the path of the file instead
|
|
329
|
-
*
|
|
330
|
-
* @deprecated this will be removed in the future, because its very niche and not used
|
|
331
|
-
*/
|
|
332
|
-
secretsAsFile?: string[];
|
|
333
300
|
}>;
|
|
334
301
|
export type DeployConfigKubernetes = {
|
|
335
302
|
type: "kubernetes";
|
|
@@ -52,7 +52,7 @@ const getFullReferencedJobNameFromWorkspace = (referencedJobName, workspaceName,
|
|
|
52
52
|
const getJobName = (need) => (0, lodash_1.isObject)(need) ? need.job : need;
|
|
53
53
|
const makeGitlabJob = (context, job, allJobs, baseRules) => {
|
|
54
54
|
var _a, _b;
|
|
55
|
-
const { environment, envMode, needsStages,
|
|
55
|
+
const { environment, envMode, needsStages, name, needs, jobTags, script, variables, runnerVariables, when, ...rest } = job;
|
|
56
56
|
const stage = envMode === "stagePerEnv" ? `${job.stage} ${context.env}` : job.stage;
|
|
57
57
|
const deduplicatedGitlabNeeds = getGitlabNeeds(context, job, allJobs);
|
|
58
58
|
const fullJobName = getFullJobName({
|
|
@@ -176,7 +176,7 @@ function deduplicateNeeds(needs) {
|
|
|
176
176
|
? [...new Map(needs.map((n) => [(0, lodash_1.isObject)(n) ? n.job : n, n])).values()]
|
|
177
177
|
: undefined;
|
|
178
178
|
}
|
|
179
|
-
function getGitlabNeedsForComponentJob(context, { needsStages, needs
|
|
179
|
+
function getGitlabNeedsForComponentJob(context, { needsStages, needs }, allJobs) {
|
|
180
180
|
const needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap((n) => {
|
|
181
181
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
182
182
|
const componentName = context.name;
|
|
@@ -210,8 +210,6 @@ function getGitlabNeedsForComponentJob(context, { needsStages, needs, needsOther
|
|
|
210
210
|
const cleanedNeeds = [
|
|
211
211
|
...(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []),
|
|
212
212
|
...(needs !== null && needs !== void 0 ? needs : []),
|
|
213
|
-
// pull in legacy needs from other component, which is now identical to needs
|
|
214
|
-
...(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []),
|
|
215
213
|
];
|
|
216
214
|
return cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map((n) => {
|
|
217
215
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,14 +54,6 @@ export type EnvVars = {
|
|
|
54
54
|
* secret env vars. These vars can be managed with catladder/cli
|
|
55
55
|
*/
|
|
56
56
|
secret?: string[];
|
|
57
|
-
/**
|
|
58
|
-
* @deprecated, use ${componentName:variableName} instead
|
|
59
|
-
*
|
|
60
|
-
* With fromComponents you can inject env vars from other components.
|
|
61
|
-
*/
|
|
62
|
-
fromComponents?: {
|
|
63
|
-
[otherApp: string]: Record<string, string>;
|
|
64
|
-
};
|
|
65
57
|
};
|
|
66
58
|
export type DefaultEnvConfig = {
|
|
67
59
|
/**
|
|
@@ -28,10 +28,6 @@ export type Environment = {
|
|
|
28
28
|
* the full name of the app. We use this as RELEASE_NAME in kubernetes and the service name in google cloud run
|
|
29
29
|
*/
|
|
30
30
|
fullName: StringOrBashExpression;
|
|
31
|
-
/**
|
|
32
|
-
* @deprecated this is the same as context.env, use that instead
|
|
33
|
-
*/
|
|
34
|
-
shortName: string;
|
|
35
31
|
/**
|
|
36
32
|
* the environment slug without component name.
|
|
37
33
|
*/
|
|
@@ -120,10 +116,6 @@ export type ComponentContext<BC extends BuildContextComponent = BuildContextComp
|
|
|
120
116
|
* the name of the component
|
|
121
117
|
*/
|
|
122
118
|
name: string;
|
|
123
|
-
/**
|
|
124
|
-
* @deprecated use name instead
|
|
125
|
-
*/
|
|
126
|
-
componentName: string;
|
|
127
119
|
/**
|
|
128
120
|
* the merged component config.
|
|
129
121
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/context.ts"],"names":[],"mappings":";;;AAwLO,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACK,EAAE;IACvD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC;AAC7C,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C;AAEK,MAAM,iCAAiC,GAAG,CAC/C,OAAgD,EACQ,EAAE;IAC1D,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC;AAChD,CAAC,CAAC;AAJW,QAAA,iCAAiC,qCAI5C"}
|
|
@@ -52,14 +52,6 @@ export type CatladderJob<S = BaseStage> = {
|
|
|
52
52
|
*
|
|
53
53
|
*/
|
|
54
54
|
needs?: Array<CatladderJobNeed>;
|
|
55
|
-
/**
|
|
56
|
-
* @deprecated set `componentName` to `needs` if you want to wait for a job from another component
|
|
57
|
-
*/
|
|
58
|
-
needsOtherComponent?: Array<{
|
|
59
|
-
componentName: string;
|
|
60
|
-
job: string;
|
|
61
|
-
artifacts: boolean;
|
|
62
|
-
}>;
|
|
63
55
|
/**
|
|
64
56
|
* cache config, we use here the same shape as gitlab itself
|
|
65
57
|
*/
|