Commit 1e6e86b6 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

docs: main or master as prod branch

parent d3d46680

README.md

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,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 `K8S_STAGING_SPACE` variable (see below).
@@ -419,7 +419,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 `K8S_PROD_SPACE` variable (see below).

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 
    {

      "id": "staging",

      "name": "Staging",

      "description": "An iso-prod environment meant for testing and validation purpose on your production branch (`master` by default)",

      "description": "An iso-prod environment meant for testing and validation purpose on your production branch (`main` or `master` by default)",

      "variables": [

        {

          "name": "K8S_STAGING_SPACE",