@catladder/pipeline 1.144.0 → 1.145.0

package/src/deploy/base/deploy.ts

@@ -15,7 +15,13 @@ export const DEPLOY_JOB_NAME = "🚀 Deploy";
 
 export type DeployJobDefinition = Pick<
   CatladderJob,
-  "script" | "variables" | "image" | "cache" | "artifacts" | "services"
+  | "script"
+  | "variables"
+  | "image"
+  | "cache"
+  | "artifacts"
+  | "services"
+  | "runnerVariables"
 >;
 export const createDeployJob = (
   context: Context,
@@ -77,19 +83,11 @@ export const createDeployJob = (
         artifacts: false,
       },
     ], // workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/220758
-    rules: [
-      whenDeploy === "auto"
-        ? {
-            when: "on_success",
-          }
-        : {
-            when: "manual",
-          },
-    ],
+    when: whenDeploy === "auto" ? "on_success" : "manual",
+
     allow_failure: whenDeploy === "manual" ? true : false,
     stage: "deploy",
     variables: {
-      ...DEPLOY_RUNNER_VARIABLES,
       ...context.environment.envVars,
       ...(hasDocker ? getDockerImageVariables(context) : {}),
       ...context.environment.jobOnlyVars.deploy.envVars,
@@ -98,15 +96,19 @@ export const createDeployJob = (
         : {}),
       ...jobDefinition.variables,
     },
-    environment: {
-      ...context.environment.gitlabEnvironment,
-      ...(isStoppable
-        ? {
-            on_stop: STOP_JOB_NAME,
-            auto_stop_in: autoStop,
-          }
+    runnerVariables: {
+      ...DEPLOY_RUNNER_VARIABLES,
+      ...(jobDefinition.runnerVariables ?? {}),
+      ...(context.componentConfig.deploy
+        ? context.componentConfig.deploy.runnerVariables ?? {}
         : {}),
     },
+    environment: isStoppable
+      ? {
+          on_stop: STOP_JOB_NAME,
+          auto_stop_in: autoStop,
+        }
+      : undefined,
     jobTags: context.componentConfig.deploy
       ? context.componentConfig.deploy.jobTags
       : undefined,

package/src/deploy/base/rollback.ts

@@ -6,7 +6,7 @@ export const ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
 
 export type RollbackJobDefinition = Pick<
   CatladderJob,
-  "script" | "variables" | "image"
+  "script" | "variables" | "runnerVariables" | "image"
 >;
 export const createRollbackJob = (
   context: Context,
@@ -17,21 +17,19 @@ export const createRollbackJob = (
     image: jobDefinition.image,
     envMode: "stagePerEnv", // makes it easier to run manual tasks er env
     needs: [], // can be executed even if the deploy job failed
-    rules: [
-      {
-        when: "manual",
-        allow_failure: true,
-      },
-    ],
+    allow_failure: true,
+    when: "manual",
     variables: {
-      ...DEPLOY_RUNNER_VARIABLES,
       ...context.environment.jobOnlyVars.deploy.envVars,
-      GIT_STRATEGY: "none",
       ...jobDefinition.variables,
     },
+    runnerVariables: {
+      ...DEPLOY_RUNNER_VARIABLES,
+      GIT_STRATEGY: "none",
+      ...(jobDefinition.runnerVariables ?? {}),
+    },
     stage: "rollback",
     environment: {
-      ...context.environment.gitlabEnvironment,
       action: "access",
     },
 

package/src/deploy/base/stop.ts

@@ -6,7 +6,7 @@ export const STOP_JOB_NAME = "🛑 Stop ⚠️";
 
 export type StopJobDefinition = Pick<
   CatladderJob,
-  "script" | "variables" | "image"
+  "script" | "variables" | "image" | "runnerVariables"
 >;
 export const createStopJob = (
   context: Context,
@@ -17,26 +17,25 @@ export const createStopJob = (
     image: jobDefinition.image,
     envMode: "stagePerEnv", // makes it easier to run manual tasks er env
     needs: [], // can be executed even if the deploy job failed
+    allow_failure: true,
+    when: "manual", // stop is always manual
     rules: [
       {
         if: "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/", // automatic on hotfix branches
         when: "on_success",
-        allow_failure: true,
-      },
-      {
-        when: "manual",
-        allow_failure: true,
       },
     ],
     variables: {
-      ...DEPLOY_RUNNER_VARIABLES,
       ...context.environment.jobOnlyVars.deploy.envVars,
-      GIT_STRATEGY: "none",
       ...jobDefinition.variables,
     },
+    runnerVariables: {
+      ...DEPLOY_RUNNER_VARIABLES,
+      GIT_STRATEGY: "none",
+      ...jobDefinition.runnerVariables,
+    },
     stage: "stop",
     environment: {
-      ...context.environment.gitlabEnvironment,
       action: "stop",
     },
     script: jobDefinition.script,

package/src/deploy/cloudRun/artifactsRegistry.ts

@@ -1,3 +1,5 @@
+import type { StringOrBashExpression } from "../../bash/BashExpression";
+import { joinBashExpressions } from "../../bash/BashExpression";
 import type { Context } from "../../types/context";
 import { allowFailureInScripts } from "../../utils/gitlab";
 import { isOfDeployType } from "../types";
@@ -46,11 +48,11 @@ export const getArtifactsRegistryImageName = (
     context.environment.shortName,
     context.componentName,
 
-    ...(context.environment.envType === "review" && !lecacyReviewImageName
-      ? [context.commitInfo?.reviewSlug]
+    ...(context.environment.reviewSlug && !lecacyReviewImageName
+      ? [context.environment.reviewSlug]
       : []),
   ];
-  return gcloudImagePath.join("/");
+  return joinBashExpressions(gcloudImagePath, "/");
 };
 
 export const getArtifactsRegistryBuildCacheImage = (context: Context) => {
@@ -63,7 +65,10 @@ export const getArtifactsRegistryBuildCacheImage = (context: Context) => {
 export const getArtifactsRegistryImage = (context: Context) =>
   `${getArtifactsRegistryImageName(context)}:$DOCKER_IMAGE_TAG`;
 
-const getDeleteImageCommands = (fullImageName: string, keepNewest = 0) => {
+const getDeleteImageCommands = (
+  fullImageName: StringOrBashExpression,
+  keepNewest = 0
+) => {
   if (keepNewest === 0) {
     // no need to list tags, we delete the whole thing
     return [

package/src/deploy/cloudRun/createJobs/cloudRunJobs.ts

@@ -17,16 +17,21 @@ import {
 } from "./common";
 import { getLabels } from "../../../context/getLabels";
 import { createVolumeConfig } from "./volumes";
+import type {
+  BashExpression,
+  StringOrBashExpression,
+} from "../../../bash/BashExpression";
+import { ENV_VARS_FILENAME } from "./constants";
 
 const getJobRunScriptForJob = (
   context: Context,
-  jobName: string,
+  jobName: StringOrBashExpression,
   wait: boolean
 ) => {
   const commonArgs = getCommonCloudRunArgs(context);
 
   const commonArgsString = createArgsString(commonArgs);
-  return `${gcloudRunCmd()} jobs execute ${jobName} ${commonArgsString}${
+  return `${gcloudRunCmd()} jobs execute ${jobName.toString()} ${commonArgsString}${
     wait ? " --wait" : ""
   }`;
 };
@@ -86,7 +91,7 @@ export const getJobCreateScripts = (context: Context) => {
 
 const getJobCreateScriptsForJob = (
   context: Context,
-  jobName: string,
+  jobName: StringOrBashExpression,
   job: DeployConfigCloudRunJob
 ) => {
   const commonDeployArgs = getCommonDeployArgs(context);
@@ -103,14 +108,14 @@ const getJobCreateScriptsForJob = (
     ...commonDeployArgs,
     labels: makeLabelString({
       ...getLabels(context),
-      "cloud-run-job-name": jobName,
+      "cloud-run-job-name": jobName.toString(),
     }),
     image: job.image || commonDeployArgs.image,
     cpu: job?.cpu,
     memory: job.memory || "512Mi",
     "task-timeout": job.timeout || "10m",
     parallelism: job.parallelism || 1,
-    "env-vars-file": "____envvars.yaml",
+    "env-vars-file": ENV_VARS_FILENAME,
     "max-retries": 0,
   });
 
@@ -163,14 +168,14 @@ const getCloudRunJobsWithSchedule = (context: Context) => {
       (
         entry
       ): entry is {
-        jobName: string;
+        jobName: BashExpression;
         job: DeployConfigCloudRunJobWithSchedule;
       } => entry.job.when === "schedule"
     )
     .map(({ job, jobName }) => ({
       job,
       jobName,
-      schedulerName: jobName + "-scheduler",
+      schedulerName: jobName.concat("-scheduler"),
     }));
 };
 

package/src/deploy/cloudRun/createJobs/cloudRunServices.ts

@@ -10,6 +10,7 @@ import {
   getCommonDeployArgs,
   makeLabelString,
 } from "./common";
+import { ENV_VARS_FILENAME } from "./constants";
 import { createVolumeConfig } from "./volumes";
 
 export const getServiceDeployScript = (
@@ -32,7 +33,7 @@ export const getServiceDeployScript = (
       ? command
       : command.split(" ")
     : undefined;
-  const fullServiceName = `${serviceName}${nameSuffix ?? ""}`;
+  const fullServiceName = serviceName.concat(nameSuffix ?? "");
   const argsString = createArgsString(
     {
       // command as empty string resets it to default (uses the image's entrypoint)
@@ -42,7 +43,7 @@ export const getServiceDeployScript = (
         ...getLabels(context),
         "cloud-run-service-name": fullServiceName,
       }),
-      "env-vars-file": "____envvars.yaml",
+      "env-vars-file": ENV_VARS_FILENAME,
       "min-instances": customConfig?.minInstances ?? 0,
       "max-instances": customConfig?.maxInstances ?? 100,
       "cpu-throttling": customConfig?.noCpuThrottling !== true,

package/src/deploy/cloudRun/createJobs/constants.ts

@@ -0,0 +1 @@
+export const ENV_VARS_FILENAME = "____envvars.yaml";

package/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts

@@ -1,4 +1,5 @@
-import type { Context } from "../../../types/context";
+import { isNil, omit } from "lodash";
+import type { Context, UnspecifiedEnvVars } from "../../../types/context";
 import { collapseableSection } from "../../../utils/gitlab";
 import { getDependencyTrackUploadScript } from "../../sbom";
 
@@ -15,9 +16,22 @@ import {
   getCloudRunDeployConfig,
   setGoogleProjectNumberScript,
 } from "./common";
+import { GCLOUD_DEPLOY_CREDENTIALS_KEY } from "..";
+import type { StringOrBashExpression } from "../../../bash/BashExpression";
+import { BashExpression, bashEscape } from "../../../bash/BashExpression";
+import { ENV_VARS_FILENAME } from "./constants";
+import {
+  writeBashYamlToFileScript,
+  yamlBashString,
+} from "../../../bash/bashYaml";
 
 export function getCloudRunDeployScripts(context: Context) {
   const deployConfig = getCloudRunDeployConfig(context);
+  const allEnvVars = omit(
+    context.environment.envVars,
+    GCLOUD_DEPLOY_CREDENTIALS_KEY
+  );
+
   return [
     ...collapseableSection(
       "prepare",
@@ -26,11 +40,15 @@ export function getCloudRunDeployScripts(context: Context) {
       ...gcloudServiceAccountLoginCommands(context),
       ...setGoogleProjectNumberScript(deployConfig),
     ]),
+    ...collapseableSection(
+      "writeenvvars",
+      "Write env vars to file"
+    )(writeBashYamlToFileScript(allEnvVars, ENV_VARS_FILENAME)),
+
     ...collapseableSection(
       "deploy",
       "Deploy to cloud run"
     )([
-      `echo "$ENV_VARS" > ____envvars.yaml`, // TODO: split secrets out
       ...(deployConfig.cloudSql
         ? getDatabaseCreateScript(context, deployConfig) // we create the db, so that we can also delete it afterwards
         : []),

package/src/deploy/cloudRun/createJobs/index.ts

@@ -1,6 +1,3 @@
-import { merge } from "lodash";
-
-import { getDockerJobBaseProps } from "../../../build/docker";
 import { getRunnerImage } from "../../../runner";
 import type { Context } from "../../../types/context";
 import type { CatladderJob } from "../../../types/jobs";
@@ -8,7 +5,7 @@ import { allowFailureInScripts } from "../../../utils/gitlab";
 import { createDeployementJobs } from "../../base";
 
 import { isOfDeployType } from "../../types";
-import { getDeployJobVariables } from "./variables";
+import { ENV_VARS_FILENAME } from "./constants";
 import { getCloudRunDeployScripts } from "./getCloudRunDeployScripts";
 import { getCloudRunStopScripts } from "./getCloudRunStopScripts";
 
@@ -28,12 +25,24 @@ export const createGoogleCloudRunDeployJobs = (
   const stopScripts = getCloudRunStopScripts(context);
 
   return createDeployementJobs(context, {
-    deploy: merge(getDockerJobBaseProps(context), {
-      artifacts: { paths: ["____envvars.yaml"] },
-      variables: getDeployJobVariables(context),
+    deploy: {
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
+      },
+      ...(deployConfig.debug
+        ? {
+            artifacts: {
+              paths: [
+                ENV_VARS_FILENAME, // debug
+              ],
+              when: "always",
+            },
+          }
+        : {}),
+
       image: getRunnerImage("gcloud"),
       script: deployScripts,
-    }),
+    },
     stop: {
       image: getRunnerImage("gcloud"),
       variables: {

package/src/deploy/cloudRun/index.ts

@@ -1,4 +1,9 @@
 import type { DeployTypeDefinition } from "..";
+import {
+  BashExpression,
+  getBashVariable,
+  joinBashExpressions,
+} from "../../bash/BashExpression";
 import { getSecretVarName } from "../../context";
 import type { EnvironmentContext } from "../../types/environmentContext";
 import { sanitizeForBashVariable } from "../../utils/gitlab";
@@ -78,13 +83,16 @@ export const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun"> = {
   ],
   getAdditionalEnvVars: (ctx) => {
     const { fullName, env, componentName, deployConfigRaw } = ctx;
-    const HOST_INTERNAL =
-      fullName.toLowerCase() +
-      "-" +
-      (process.env[
-        getSecretVarName(env, componentName, GCLOUD_RUN_CANONICAL_HOST_SUFFIX)
-      ] ?? "unknown-host.example.com");
 
+    const HOST_INTERNAL = joinBashExpressions(
+      [
+        fullName,
+        getBashVariable(
+          getSecretVarName(env, componentName, GCLOUD_RUN_CANONICAL_HOST_SUFFIX)
+        ),
+      ],
+      "-"
+    ).toLowerCase();
     const jobTriggers =
       deployConfigRaw && deployConfigRaw.jobs
         ? Object.fromEntries(

package/src/deploy/cloudRun/utils/createArgsString.ts

@@ -1,4 +1,5 @@
 import { isNil } from "lodash";
+import type { BashExpression } from "../../../bash/BashExpression";
 
 /**
  * creates arguments string:
@@ -29,5 +30,5 @@ export const createArgsString = (...args: keyValuesArg[]) =>
 
 export type keyValuesArg = Record<
   string,
-  string | number | true | false | undefined
+  string | number | true | false | undefined | BashExpression
 >;

package/src/deploy/cloudRun/utils/database.ts

@@ -12,8 +12,8 @@ export const getDatabaseDeleteScript = (
   if (!deployConfig.cloudSql || !deployConfig.cloudSql.deleteDatabaseOnStop) {
     throw new Error("not possible");
   }
+  const DB_NAME = context.environment.envVars["DB_NAME"];
 
-  const { DB_NAME } = context.environment.envVars ?? {};
   if (!DB_NAME) {
     throw new Error("error: env vars did not specify DB_NAME");
   }
@@ -42,7 +42,7 @@ export const getDatabaseCreateScript = (
     throw new Error("not possible");
   }
 
-  const { DB_NAME } = context.environment.envVars ?? {};
+  const DB_NAME = context.environment.envVars["DB_NAME"];
 
   if (!DB_NAME) {
     throw new Error("error: env vars did not specify DB_NAME");

package/src/deploy/cloudRun/utils/jobName.ts

@@ -1,2 +1,7 @@
-export const getCloudRunJobName = (fullAppName: string, jobName: string) =>
-  fullAppName.toLowerCase() + "-" + jobName.toLowerCase();
+import type { StringOrBashExpression } from "../../../bash/BashExpression";
+
+export const getCloudRunJobName = (
+  fullAppName: StringOrBashExpression,
+  jobName: string
+): StringOrBashExpression =>
+  fullAppName.toLowerCase().concat("-" + jobName.toLowerCase());

package/src/deploy/cloudSql/utils.ts

@@ -1,4 +1,6 @@
 import type { Config } from "../..";
+import type { StringOrBashExpression } from "../../bash/BashExpression";
+import { joinBashExpressions } from "../../bash/BashExpression";
 import type {
   DeployConfigCloudRunCloudSql,
   DeployConfigKubernetesValuesCloudSQLUnmanaged,
@@ -9,15 +11,16 @@ export const getFullDbName = (
     | DeployConfigCloudRunCloudSql
     | DeployConfigKubernetesValuesCloudSQLUnmanaged,
   fullConfig: Config<never>,
-  environmentSlugPrefix: string,
+  environmentSlugPrefix: StringOrBashExpression,
   componentName: string
 ) => {
-  return [
-    cloudSqlConfig.dbNamePrefix ??
-      `${fullConfig.customerName}-${fullConfig.appName}`,
-    environmentSlugPrefix,
-    cloudSqlConfig.dbBaseName ?? componentName,
-  ]
-    .filter(Boolean)
-    .join("-");
+  return joinBashExpressions(
+    [
+      cloudSqlConfig.dbNamePrefix ??
+        `${fullConfig.customerName}-${fullConfig.appName}`,
+      environmentSlugPrefix,
+      cloudSqlConfig.dbBaseName ?? componentName,
+    ].flatMap((part) => (part ? [part] : [])),
+    "-"
+  );
 };

package/src/deploy/index.ts

@@ -1,4 +1,5 @@
 import type { SecretEnvVar } from "..";
+import type { BashExpression } from "../bash/BashExpression";
 import type { Context } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
@@ -23,7 +24,7 @@ export type DeployTypeDefinition<T extends DeployConfigType> = {
   ) => SecretEnvVar[];
   getAdditionalEnvVars: (
     envContext: EnvironmentContext<any, T>
-  ) => Record<string, string | undefined | null>;
+  ) => Record<string, string | BashExpression | undefined | null>;
 };
 export type DeployTypes = {
   [T in DeployConfigType]: DeployTypeDefinition<T>;

package/src/deploy/kubernetes/cloudSql/index.ts

@@ -1,3 +1,4 @@
+import type { StringOrBashExpression } from "../../../bash/BashExpression";
 import { getSecretVarNameForContext } from "../../../context";
 import type { Context } from "../../../types";
 import { getFullDbName } from "../../cloudSql/utils";
@@ -15,7 +16,7 @@ type CloudSqlValues = {
   proxyCredentials: string;
 
   instanceConnectionName: string;
-  fullDbName: string;
+  fullDbName: StringOrBashExpression;
   dbUser: string;
 };
 export const createKubernetesCloudsqlBaseValues = (
@@ -48,7 +49,7 @@ export const createKubernetesCloudsqlBaseValues = (
         dbUser: "postgres",
         instanceConnectionName,
         proxyCredentials,
-        fullDbName: context.environment.envVars.KUBE_APP_NAME,
+        fullDbName: context.environment.envVars.KUBE_APP_NAME ?? "",
       },
     };
   } else if (config.type === "unmanaged") {

package/src/deploy/kubernetes/deployJob.ts

@@ -1,4 +1,4 @@
-import { dump } from "js-yaml";
+import { getSecretVarNameForContext } from "../../context/getEnvironmentVariables";
 import { getRunnerImage } from "../../runner";
 import type { Context } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
@@ -9,8 +9,11 @@ import {
 } from "../sbom";
 import { isOfDeployType } from "../types";
 import { createKubeValues } from "./kubeValues";
-import { getSecretVarNameForContext } from "../../context/getEnvironmentVariables";
 
+import { writeBashYamlToFileScript } from "../../bash/bashYaml";
+import { collapseableSection } from "../../utils/gitlab";
+
+const ALL_VALUES_FILE = "__all_values.yml";
 export const createKubernetesDeployJobs = (
   context: Context
 ): CatladderJob[] => {
@@ -23,19 +26,23 @@ export const createKubernetesDeployJobs = (
     throw new Error("deploy config is not kubernetes");
   }
 
-  const kubeValues = createKubeValues(context);
-  const shared: Pick<CatladderJob, "image" | "variables"> = {
+  const shared: Pick<CatladderJob, "image" | "variables" | "artifacts"> = {
     image: getRunnerImage("kubernetes"),
+    ...(deployConfig.debug
+      ? {
+          artifacts: {
+            paths: [
+              ALL_VALUES_FILE, // debug
+            ],
+            when: "always",
+          },
+        }
+      : {}),
     variables: {
       ...context.environment.envVars,
       RELEASE_NAME: context.environment.fullName,
       HELM_EXPERIMENTAL_OCI: "1",
       KUBE_DOCKER_IMAGE_PULL_SECRET: `gitlab-registry-${context.componentName}`,
-      KUBE_VALUES: dump(kubeValues, {
-        lineWidth: -1,
-        quotingType: "'",
-        forceQuotes: true,
-      }),
       HELM_GITLAB_CHART_NAME:
         deployConfig.chartName ?? "/helm-charts/the-panter-chart",
       HELM_ARGS: [
@@ -43,7 +50,8 @@ export const createKubernetesDeployJobs = (
         ...(deployConfig.additionalHelmArgs ?? []),
       ].join(" "),
       COMPONENT_NAME: context.componentName,
-      BUILD_ID: context.commitInfo?.buildId,
+      /** @deprecated */
+      BUILD_ID: context.environment.envVars.BUILD_INFO_BUILD_ID,
     },
   };
 
@@ -69,6 +77,12 @@ export const createKubernetesDeployJobs = (
       ...shared,
       script: [
         ...connectContext,
+        ...collapseableSection(
+          "writeallvalues",
+          "Write " + ALL_VALUES_FILE + " for helm deployment"
+        )(
+          writeBashYamlToFileScript(createKubeValues(context), ALL_VALUES_FILE)
+        ),
         "kubernetesCreateSecret",
         "kubernetesDeploy",
         ...getDependencyTrackUploadScript(context),

package/src/deploy/kubernetes/index.ts

@@ -1,6 +1,7 @@
 import slugify from "slugify";
 import type { DeployTypeDefinition } from "..";
 import { getKubernetesNamespace } from "..";
+import { joinBashExpressions } from "../../bash/BashExpression";
 import { additionalKubernetesSecretKeys } from "./additionalSecretKeys";
 import { createKubernetesDeployJobs } from "./deployJob";
 export * from "./cloudSql";
@@ -13,25 +14,31 @@ export const KUBERNETES_DEPLOY_TYPE: DeployTypeDefinition<"kubernetes"> = {
     fullConfig,
     deployConfigRaw,
     env,
+    reviewSlug,
     envType,
-    commitInfo,
   }) => {
     const KUBE_APP_NAME_PREFIX =
-      envType === "review" && commitInfo ? `${commitInfo.reviewSlug}-` : "";
-    const KUBE_APP_NAME = `${KUBE_APP_NAME_PREFIX}${componentName}`;
+      envType === "review" && reviewSlug ? reviewSlug.concat("-") : "";
+    const KUBE_APP_NAME = KUBE_APP_NAME_PREFIX.concat(componentName);
     const KUBE_NAMESPACE = getKubernetesNamespace(fullConfig, env);
     const componentSlug = slugify(componentName);
-    const envInUrl =
-      envType === "review" && commitInfo
-        ? `${commitInfo.reviewSlug}.${env}`
-        : env;
 
     const domainCanonical =
       (deployConfigRaw && deployConfigRaw.cluster?.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
       fullConfig.domainCanonical ||
       "panter.cloud";
-    const HOST_INTERNAL = `${componentSlug}.${envInUrl}.${fullConfig.appName}.${fullConfig.customerName}.${domainCanonical}`; // default for kubernetes and rest
 
+    const HOST_INTERNAL = joinBashExpressions(
+      [
+        componentSlug,
+        ...(envType === "review" && reviewSlug ? [reviewSlug] : []),
+        env,
+        fullConfig.appName,
+        fullConfig.customerName,
+        domainCanonical,
+      ],
+      "."
+    ); // default for kubernetes and rest
     return {
       KUBE_NAMESPACE,
       KUBE_APP_NAME,

package/src/deploy/kubernetes/kubeEnv.ts

@@ -1,7 +1,9 @@
+import type { StringOrBashExpression } from "../../bash/BashExpression";
 import type { Context } from "../../types";
 import { isOfDeployType } from "../types";
 
-const shouldGoIntoSecrets = (key: string, value: string) => {
+const shouldGoIntoSecrets = (key: string, value: string | undefined) => {
+  if (!value) return false;
   if (String(value)?.includes("$CL_")) {
     return true;
   }
@@ -21,20 +23,20 @@ export const createKubeEnv = (context: Context) => {
   const allEnvVars = context.environment.envVars;
 
   const env = Object.entries(allEnvVars).reduce<{
-    secret: Record<string, string>;
-    public: Record<string, string>;
+    secret: Record<string, StringOrBashExpression>;
+    public: Record<string, StringOrBashExpression>;
   }>(
     (acc, [key, value]) => {
-      if (shouldGoIntoSecrets(key, value)) {
+      if (shouldGoIntoSecrets(key, value?.toString())) {
         acc.secret = {
           ...acc.secret,
-          [key]: value,
+          [key]: value ?? "",
         };
         return acc;
       }
       acc.public = {
         ...acc.public,
-        [key]: value,
+        [key]: value ?? "",
       };
       return acc;
     },