@catladder/cli 0.0.0-pipeline-variables-fb0640d0 → 0.0.0-pipeline-variables-e3e4f641

package/dist/bundles/catenv/index.js

@@ -41217,7 +41217,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "pipeline-variables-fb0640d0" || 0;
+exports.PIPELINE_IMAGE_TAG = "pipeline-variables-e3e4f641" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -43593,7 +43593,8 @@ function getDeployJobVariables(context) {
     ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
       lineWidth: -1,
       quotingType: "'",
-      forceQuotes: true
+      forceQuotes: true,
+      noRefs: true
     })
   };
 }
@@ -46292,9 +46293,27 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
     return [(0, lodash_1.isObject)(n) ? n.job : n, n];
   })).values()), false);
   var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
-  var varsInjectScripts = (0, gitlab_1.collapseableSection)("injectvars", "Injecting variables")(__spreadArray(__spreadArray([], __read((0, jobBuildVars_1.getBuildVariablesAssignmentCommand)("gitlab")), false), __read((0, getInjectVarsScript_1.getInjectVarsScript)(variables)), false));
+  // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
+  // those should now be set in the runnerVariables as they don't work in the variables key of the catladder job, becuase those get injected
+  var PIPELINE_RUNNER_VARIABLES = ["KUBERNETES_CPU_REQUEST", "KUBERNETES_MEMORY_REQUEST", "KUBERNETES_CPU_LIMIT", "KUBERNETES_MEMORY_LIMIT"];
+  // remove those from variables and add them to runnerVariables
+  var varsInjectScripts = (0, gitlab_1.collapseableSection)("injectvars", "Injecting variables")(__spreadArray(__spreadArray([], __read((0, jobBuildVars_1.getBuildVariablesAssignmentCommand)("gitlab")), false), __read((0, getInjectVarsScript_1.getInjectVarsScript)(
+  // remove legacy variables
+  Object.fromEntries(Object.entries(variables !== null && variables !== void 0 ? variables : {}).filter(function (_a) {
+    var _b = __read(_a, 1),
+      key = _b[0];
+    return !PIPELINE_RUNNER_VARIABLES.includes(key);
+  })))), false));
+  var legacyRunnerVariables = Object.fromEntries(Object.entries(variables !== null && variables !== void 0 ? variables : {}).filter(function (_a) {
+    var _b = __read(_a, 1),
+      key = _b[0];
+    return PIPELINE_RUNNER_VARIABLES.includes(key);
+  }));
+  if (Object.keys(legacyRunnerVariables).length > 0) {
+    console.warn("Legacy variables detected in ".concat(fullJobName, ": ").concat(Object.keys(legacyRunnerVariables).join(", "), ". Please move them to the runnerVariables key."));
+  }
   var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), {
-    variables: runnerVariables,
+    variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables),
     script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_b = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _b !== void 0 ? _b : []).flatMap(function (s) {
       return ["echo \"".concat(s, "\""), s];
     })), false),

package/dist/bundles/cli/index.js

@@ -356149,7 +356149,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "pipeline-variables-fb0640d0" || 0;
+exports.PIPELINE_IMAGE_TAG = "pipeline-variables-e3e4f641" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -358525,7 +358525,8 @@ function getDeployJobVariables(context) {
     ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
       lineWidth: -1,
       quotingType: "'",
-      forceQuotes: true
+      forceQuotes: true,
+      noRefs: true
     })
   };
 }
@@ -361224,9 +361225,27 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
     return [(0, lodash_1.isObject)(n) ? n.job : n, n];
   })).values()), false);
   var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
-  var varsInjectScripts = (0, gitlab_1.collapseableSection)("injectvars", "Injecting variables")(__spreadArray(__spreadArray([], __read((0, jobBuildVars_1.getBuildVariablesAssignmentCommand)("gitlab")), false), __read((0, getInjectVarsScript_1.getInjectVarsScript)(variables)), false));
+  // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
+  // those should now be set in the runnerVariables as they don't work in the variables key of the catladder job, becuase those get injected
+  var PIPELINE_RUNNER_VARIABLES = ["KUBERNETES_CPU_REQUEST", "KUBERNETES_MEMORY_REQUEST", "KUBERNETES_CPU_LIMIT", "KUBERNETES_MEMORY_LIMIT"];
+  // remove those from variables and add them to runnerVariables
+  var varsInjectScripts = (0, gitlab_1.collapseableSection)("injectvars", "Injecting variables")(__spreadArray(__spreadArray([], __read((0, jobBuildVars_1.getBuildVariablesAssignmentCommand)("gitlab")), false), __read((0, getInjectVarsScript_1.getInjectVarsScript)(
+  // remove legacy variables
+  Object.fromEntries(Object.entries(variables !== null && variables !== void 0 ? variables : {}).filter(function (_a) {
+    var _b = __read(_a, 1),
+      key = _b[0];
+    return !PIPELINE_RUNNER_VARIABLES.includes(key);
+  })))), false));
+  var legacyRunnerVariables = Object.fromEntries(Object.entries(variables !== null && variables !== void 0 ? variables : {}).filter(function (_a) {
+    var _b = __read(_a, 1),
+      key = _b[0];
+    return PIPELINE_RUNNER_VARIABLES.includes(key);
+  }));
+  if (Object.keys(legacyRunnerVariables).length > 0) {
+    console.warn("Legacy variables detected in ".concat(fullJobName, ": ").concat(Object.keys(legacyRunnerVariables).join(", "), ". Please move them to the runnerVariables key."));
+  }
   var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), {
-    variables: runnerVariables,
+    variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables),
     script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_b = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _b !== void 0 ? _b : []).flatMap(function (s) {
       return ["echo \"".concat(s, "\""), s];
     })), false),

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-pipeline-variables-fb0640d0",
+  "version": "0.0.0-pipeline-variables-e3e4f641",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -74,7 +74,7 @@
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-pipeline-variables-fb0640d0",
+    "@catladder/pipeline": "0.0.0-pipeline-variables-e3e4f641",
     "@gitbeaker/rest": "^39.28.0",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",