From 7fcbfb4b690292593cc849647c1b339139cca9e5 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Fri, 5 Nov 2021 11:42:09 +0100
Subject: [PATCH] rename `master` to `main` branch
---
.gitlab-ci.yml | 6 +++---
docs/helmchart.md | 4 ++--
docs/local_dev_remote_kratos.md | 2 +-
helmchart/single-sign-on/values.yaml | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61f63e5..322c305 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,7 +97,7 @@ behave-integration:
- --dangerous-force-http
- --dangerous-allow-insecure-redirect-urls
- "http://oidc:5000/callback"
- - name: open.greenhost.net:4567/stackspin/user-panel/backend:master
+ - name: open.greenhost.net:4567/stackspin/user-panel/backend:main
alias: backend
- name: ${CI_REGISTRY_IMAGE}/integration_test_app:${CI_COMMIT_REF_NAME}
alias: oidc
@@ -177,6 +177,6 @@ behave-integration:
# PYLINT_PLUGINS: "pylint_flask pylint_flask_sqlalchemy"
# image: ${CI_REGISTRY_IMAGE}/pylint:${CI_COMMIT_REF_NAME}
# script:
-# - echo "Reverting back to master to squash commits"
-# - git reset --soft master
+# - echo "Reverting back to main to squash commits"
+# - git reset --soft main
# - git lint
diff --git a/docs/helmchart.md b/docs/helmchart.md
index d4625b0..4fee529 100644
--- a/docs/helmchart.md
+++ b/docs/helmchart.md
@@ -29,9 +29,9 @@ This table lists the variables you are most likely to change. Take a look at the
| Parameter | Description | Default |
| ------------------------------------ | ------------------------------------------------------- | ------------------------- |
| `consentProvider.image.repository` | Name of image repository to be used for consent provider| open.greenhost.net:4567/stackspin/single-sign-on/consent_provider |
-| `consentProvider.image.tag` | Release version of consent provider image | master |
+| `consentProvider.image.tag` | Release version of consent provider image | main |
| `loginProvider.image.repository` | Name of image repository to be used for login provider | open.greenhost.net:4567/stackspin/single-sign-on/login_provider |
-| `loginProvider.image.tag` | Release version of login provider image | master |
+| `loginProvider.image.tag` | Release version of login provider image | main |
| `singleSignOnHost` | **FQDN of the openID Connect / oAuth2 server** | **sso.stackspin.example.net** |
| `userpanel.ingress.host` | **FQDN of the userpanel** | **admin.stackspin.example.net** |
| `userbackend.username` | Username of the admin user | admin |
diff --git a/docs/local_dev_remote_kratos.md b/docs/local_dev_remote_kratos.md
index 3ac7954..c12d926 100644
--- a/docs/local_dev_remote_kratos.md
+++ b/docs/local_dev_remote_kratos.md
@@ -24,7 +24,7 @@ On your provisioning machine, make sure to checkout:
`git@open.greenhost.net:stackspin/single-sign-on.git`
-Be sure to check out the latest master. Or select a more modern brach if you
+Be sure to check out the latest main. Or select a more modern brach if you
want to test / install (optional) improvements of the kratos system.
Once this is all fetched, installation can be done with the following steps:
diff --git a/helmchart/single-sign-on/values.yaml b/helmchart/single-sign-on/values.yaml
index 8f8cc13..2c35294 100644
--- a/helmchart/single-sign-on/values.yaml
+++ b/helmchart/single-sign-on/values.yaml
@@ -3,14 +3,14 @@ consentProvider:
# consentProvider.image.tag and consentProvider.image.pullPolicy should be the same as
# loginProvider.image.tag and loginProvider.image.pullPolicy as the images are released
# together in order to guarantee compatibility
- tag: "master"
+ tag: "main"
pullPolicy: "Always"
repository: "open.greenhost.net:4567/stackspin/single-sign-on/consent_provider"
podAnnotations: {}
loginProvider:
image:
- tag: "master"
+ tag: "main"
pullPolicy: "Always"
repository: "open.greenhost.net:4567/stackspin/single-sign-on/login_provider"
podAnnotations: {}
@@ -29,7 +29,7 @@ userpanel:
# userpanel.image.tag and userpanel.image.pullPolicy should be the same as
# userbackend.image.tag and userpanel.image.pullPolicy as the images are released
# together in order to guarantee compatibility
- tag: "master"
+ tag: "main"
pullPolicy: "Always"
repository: "open.greenhost.net:4567/stackspin/user-panel/frontend"
ingress:
@@ -39,7 +39,7 @@ userpanel:
userbackend:
image:
- tag: "master"
+ tag: "main"
pullPolicy: "Always"
repository: "open.greenhost.net:4567/stackspin/user-panel/backend"
# userbackend.username is the username of the admin user that will be create
--
GitLab