sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-08 00:11:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): Remove default BASE_DOMAIN in .gitlab-ci.yml

Browse Source
This commit is contained in:
Dominik Kaminski
2023-11-20 11:30:07 +01:00
parent 01466947cc
commit 7ae65a36a2
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@@ -33,9 +33,6 @@ variables:
description: "Define which cluster to use. Cluster must be defined in gitlab/environments.yaml of description: "Define which cluster to use. Cluster must be defined in gitlab/environments.yaml of
sovereign-workplace-env included above." sovereign-workplace-env included above."
value: "dev" value: "dev"
BASE_DOMAIN:
description: "Define the Cluster Base Domain."
value: "souvap.cloud"
MASTER_PASSWORD_WEB_VAR: MASTER_PASSWORD_WEB_VAR:
description: "Optional: Provide a passphrase to be used for password generation." description: "Optional: Provide a passphrase to be used for password generation."
value: "" value: ""
@@ -150,9 +147,6 @@ variables:
UMS_TESTS_BRANCH: UMS_TESTS_BRANCH:
description: "Branch of E2E test suite of SouvAP Dev team" description: "Branch of E2E test suite of SouvAP Dev team"
value: "main" value: "main"
# please use the following set of variables with normalized names:
DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}"
ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}"
.deploy-common: .deploy-common:
cache: {} cache: {}
@@ -204,7 +198,6 @@ env-cleanup:
env-start: env-start:
environment: environment:
name: "${NAMESPACE}" name: "${NAMESPACE}"
url: "https://portal.${DOMAIN}"
on_stop: "env-stop" on_stop: "env-stop"
extends: ".deploy-common" extends: ".deploy-common"
image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/k8s:1.25.6" image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/k8s:1.25.6"
@@ -443,10 +436,6 @@ run-tests:
extends: ".deploy-common" extends: ".deploy-common"
environment: environment:
name: "${NAMESPACE}" name: "${NAMESPACE}"
tags:
- "docker"
- "kubernetes"
- "${CLUSTER}"
stage: "tests" stage: "tests"
rules: rules:
- if: > - if: >
@@ -503,10 +492,6 @@ run-souvap-dev-tests:
extends: ".deploy-common" extends: ".deploy-common"
environment: environment:
name: "${NAMESPACE}" name: "${NAMESPACE}"
tags:
- "docker"
- "kubernetes"
- "${CLUSTER}"
stage: "tests" stage: "tests"
rules: rules:
- if: > - if: >

5
docs/ci.md
View File

@@ -18,13 +18,12 @@ The project includes a `.gitlab-ci.yml` that allows you to execute the deploymen
When starting the pipeline through the Gitlab UI, you will be queried for some variables plus the following ones: When starting the pipeline through the Gitlab UI, you will be queried for some variables plus the following ones:
- `BASE_DOMAIN`: The base domain the SWP will use. For example: `souvap.cloud` - `DOMAIN` = The domain to deploy to.
- `ISTIO_DOMAIN` = istio.`DOMAIN`
- `NAMESPACE`: Defines into which namespace of your K8s cluster the SWP will be installed - `NAMESPACE`: Defines into which namespace of your K8s cluster the SWP will be installed
- `MASTER_PASSWORD_WEB_VAR`: Overwrites value of `MASTER_PASSWORD` - `MASTER_PASSWORD_WEB_VAR`: Overwrites value of `MASTER_PASSWORD`
Based on your input, the following variables will be set: Based on your input, the following variables will be set:
- `DOMAIN` = `NAMESPACE`.`BASE_DOMAIN`
- `ISTIO_DOMAIN` = istio.`DOMAIN`
- `MASTER_PASSWORD` = `MASTER_PASSWORD_WEB_VAR`. If `MASTER_PASSWORD_WEB_VAR` - `MASTER_PASSWORD` = `MASTER_PASSWORD_WEB_VAR`. If `MASTER_PASSWORD_WEB_VAR`
is not set, the default for `MASTER_PASSWORD` will be used, unless you set is not set, the default for `MASTER_PASSWORD` will be used, unless you set
`MASTER_PASSWORD` as a masked CI/CD variable in Gitlab to supersede the default. `MASTER_PASSWORD` as a masked CI/CD variable in Gitlab to supersede the default.