Skip to content

Commit

Permalink
fix(namespace): use PRODUCTION_NAMESPACE when provided (#104)
Browse files Browse the repository at this point in the history
* fix(namespace): use PRODUCTION_NAMESPACE when provided

* fix: lint
  • Loading branch information
Julien Bouquillon committed Aug 4, 2020
1 parent 376a3d5 commit a0f1124
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/environments/gitlab/index.ts
Expand Up @@ -20,6 +20,7 @@ const GitlabProcessEnv = pipe(
CI_COMMIT_TAG: NonEmptyString,
CI_REPOSITORY_URL: NonEmptyString,
PRODUCTION: D.string,
PRODUCTION_NAMESPACE: D.string,
RANCHER_PROJECT_ID: NonEmptyString,
})
)
Expand All @@ -38,6 +39,7 @@ const mapper = ({
KUBE_INGRESS_BASE_DOMAIN,
KUBE_NAMESPACE,
PRODUCTION,
PRODUCTION_NAMESPACE,
RANCHER_PROJECT_ID,
}: GitlabProcessEnv): GlobalEnvironment => {
const isProductionCluster = Boolean(PRODUCTION);
Expand All @@ -47,6 +49,10 @@ const mapper = ({
? `${CI_COMMIT_TAG.replace(/\./g, "-")}-${CI_PROJECT_NAME}`
: `${CI_ENVIRONMENT_SLUG}-${CI_PROJECT_NAME}`;

const namespaceName = isProductionCluster
? PRODUCTION_NAMESPACE ?? CI_PROJECT_NAME
: KUBE_NAMESPACE;

return {
annotations: {
"app.gitlab.com/app": CI_PROJECT_PATH_SLUG,
Expand All @@ -66,7 +72,7 @@ const mapper = ({
...(CI_ENVIRONMENT_NAME.endsWith("-dev2") ? { cert: "wildcard" } : {}),
},
namespace: {
name: isProductionCluster ? CI_PROJECT_NAME : KUBE_NAMESPACE,
name: namespaceName,
},
rancherId: RANCHER_PROJECT_ID ?? "",
subdomain: isProductionCluster ? CI_PROJECT_NAME : application,
Expand Down

0 comments on commit a0f1124

Please sign in to comment.