Commit c6c7bf85 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

upgrade the config with the new charts



For the new charts to work, we need to namespace all of the config
files because we are using the root of the directory, not just
`./charts/gitlab-omnibus`.

This allows to be more compatible with the gitlab native kubernetes
chart and should allow us to move forward.
Signed-off-by: Benjamin Tissoires's avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
parent ceacc58d
......@@ -22,7 +22,8 @@ changes with a dry run:
```
$ cd helm-gitlab-omnibus
$ helm upgrade --dry-run -f ../helm-gitlab-config/config.yaml -f ../helm-gitlab-secrets/secrets.yaml gitlab-prod ./charts/gitlab-omnibus
$ helm dependency update
$ helm upgrade --dry-run -f ../helm-gitlab-config/config.yaml -f ../helm-gitlab-secrets/secrets.yaml gitlab-prod .
```
This will spew out the generated Kubernetes chart, which you can double-check.
......@@ -61,7 +62,9 @@ Install the Helm chart from scratch:
```
$ cd helm-gitlab-omnibus
$ helm install -f ../helm-gitlab-config/config.yaml -f ../helm-gitlab-secrets/secrets.yaml --name gitlab-prod ./charts/gitlab-omnibus
$ helm repo add jetstack https://charts.jetstack.io/
$ helm dependency update
$ helm install -f ../helm-gitlab-config/config.yaml -f ../helm-gitlab-secrets/secrets.yaml --name gitlab-prod .
```
Wait for the deployment to go live:
......
baseIP: 35.185.111.185
baseDomain: freedesktop.org
certmanager-issuer:
email: daniel@fooishbar.org
gitlab-omnibus:
baseIP: 35.185.111.185
baseDomain: freedesktop.org
legoEmail: daniel@fooishbar.org
gitlabCEImage: gitlab/gitlab-ce:12.9.1-ce.0
gitlabCEImage: gitlab/gitlab-ce:12.9.1-ce.0
mattermostEnable: false
prometheusEnable: false
mattermostEnable: false
prometheusEnable: false
gitlabDataStorageSize: 360Gi
gitlabRegistryStorageSize: 2000Gi
gitlabDataStorageSize: 360Gi
gitlabRegistryStorageSize: 2000Gi
pagesExternalScheme: https
pagesExternalDomain: pages.freedesktop.org
pagesTlsSecret: gitlab-pages-tls
pagesExternalScheme: https
pagesExternalDomain: pages.freedesktop.org
pagesTlsSecret: gitlab-pages-tls
omnibusConfigRuby: |
omnibusConfigRuby: |
gitlab_rails['gitlab_default_can_create_group'] = false
gitlab_rails['omniauth_enabled'] = true
gitlab_rails['omniauth_allow_single_sign_on'] = true
......@@ -139,24 +140,34 @@ omnibusConfigRuby: |
#'google_json_key_location' => '/gitlab-ssh-keys/lfs-gcs-key'
}
# my kingdom for the ability to include files ... ?!
gitPostReceiveMirrorHook: |
#!/bin/bash
export REMOTE_REPO="$(git config --local fdo.mirror-dir)"
export GIT_SSH_COMMAND="ssh -o 'ClearAllForwardings yes' -o 'GlobalKnownHostsFile /dev/null' -o 'IdentitiesOnly yes' -o 'IdentityFile /gitlab-ssh-keys/kemper-ssh-priv' -o 'StrictHostKeyChecking yes' -o 'HashKnownHosts no' -o 'UserKnownHostsFile /gitlab-ssh-keys/kemper-ssh-known-hosts' -F /dev/null"
while read oldrev newrev refname; do
case "$refname" in
refs/heads/*)
git push ssh://gitlab-mirror@kemper.freedesktop.org/git/${REMOTE_REPO} +${newrev}:${refname} >/dev/null
;;
refs/tags/*)
git push ssh://gitlab-mirror@kemper.freedesktop.org/git/${REMOTE_REPO} +${refname} >/dev/null
;;
*)
;;
esac
done
# my kingdom for the ability to include files ... ?!
gitPostReceiveMirrorHook: |
#!/bin/bash
export REMOTE_REPO="$(git config --local fdo.mirror-dir)"
export GIT_SSH_COMMAND="ssh -o 'ClearAllForwardings yes' -o 'GlobalKnownHostsFile /dev/null' -o 'IdentitiesOnly yes' -o 'IdentityFile /gitlab-ssh-keys/kemper-ssh-priv' -o 'StrictHostKeyChecking yes' -o 'HashKnownHosts no' -o 'UserKnownHostsFile /gitlab-ssh-keys/kemper-ssh-known-hosts' -F /dev/null"
while read oldrev newrev refname; do
case "$refname" in
refs/heads/*)
git push ssh://gitlab-mirror@kemper.freedesktop.org/git/${REMOTE_REPO} +${newrev}:${refname} >/dev/null
;;
refs/tags/*)
git push ssh://gitlab-mirror@kemper.freedesktop.org/git/${REMOTE_REPO} +${refname} >/dev/null
;;
*)
;;
esac
done
global:
edition: ce
hosts:
domain: freedesktop.org
ingress:
class: nginx
psql:
host: gitlab-prod-gitlab-postgresql
controller:
ingressClass: nginx
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment