@@ -45,7 +45,7 @@ It is only active for your integration branch (`develop` by default).
#### Production environments
Lastly, the template supports 2 environments associated to your production branch (`master` by default):
Lastly, the template supports 2 environments associated to your production branch (`main` or `master` by default):
* a **staging** environment (an iso-prod environment meant for testing and validation purpose),
* the **production** environment.
@@ -284,7 +284,7 @@ Here are variables supported to configure the integration environment:
### Staging environment configuration
The staging environment is an iso-prod environment meant for testing and validation purpose associated to your production branch (`master` by default).
The staging environment is an iso-prod environment meant for testing and validation purpose associated to your production branch (`main` or `master` by default).
It is **disabled by default** and can be enabled by setting the `HELM_STAGING_ENABLED` variable (see below).
@@ -301,7 +301,7 @@ Here are variables supported to configure the staging environment:
### Production environment configuration
The production environment is the final deployment environment associated with your production branch (`master` by default).
The production environment is the final deployment environment associated with your production branch (`main` or `master` by default).
It is **disabled by default** and can be enabled by setting the `HELM_PROD_ENABLED` variable (see below).
@@ -377,7 +377,7 @@ The general version format will be `<x.y.z>-<label>`:
* if [semantic-release integration](#semantic-release-integration) is enabled: uses the version determined by `semantic-release`,
* otherwise uses the version from the chart file
* `<label>`:
* on the production branch (`main` or `master` by default), no trailing label is used
* on the production branch (`main` or `main` or `master` by default), no trailing label is used
* on any other branch, `$CI_COMMIT_REF_SLUG` is used as trailing label<br/>
_(ex: `review-feature-12` on branch `review/feature-12`)_
* :warning: when `HELM_PUBLISH_SNAPSHOT_ENABLED` is enabled, the chart is additionally packaged (and published) with a label suffixed with `snapshot`<br/>
