diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2017-09-24 22:53:15 -0400 |
|---|---|---|
| committer | Joshua Lambert <joshua@gitlab.com> | 2017-09-24 22:53:15 -0400 |
| commit | 3d731c556c02960dbc7d74e49dd33366f7e7414d (patch) | |
| tree | 70c852ec403edf1fa6922326bd8d08d2269f240e | |
| parent | 2badab5d5ecb60d6e0f56988ad963449dabc39e3 (diff) | |
| download | gitlab-ce-38021-add-instructions-for-upgrading-from-ce-to-ee-using-gitlab-omnibus-chart-docs.tar.gz | |
| -rw-r--r-- | doc/install/kubernetes/gitlab_omnibus.md | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/doc/install/kubernetes/gitlab_omnibus.md b/doc/install/kubernetes/gitlab_omnibus.md index 611b59f0e8f..150eb3a8bce 100644 --- a/doc/install/kubernetes/gitlab_omnibus.md +++ b/doc/install/kubernetes/gitlab_omnibus.md @@ -155,15 +155,11 @@ should we done using `helm upgrade`: helm upgrade -f values.yaml gitlab gitlab/gitlab-omnibus ``` -<<<<<<< HEAD ## Upgrading from CE to EE using the Helm Chart If you have installed the Community Edition using this chart, upgrading to Enterprise Edition is easy. If you are using a `values.yaml` file to specify the configuration options, edit the file and set `gitlab=ee`. If you would like to run a specific version of GitLab EE, set `gitlabEEImage` to be the desired GitLab [docker image](https://hub.docker.com/r/gitlab/gitlab-ee/tags/). Then you can use `helm upgrade` to update your GitLab instance to EE: -======= -## Uninstalling GitLab using the Helm Chart ->>>>>>> master ```bash helm upgrade -f values.yaml gitlab gitlab/gitlab-omnibus @@ -172,7 +168,6 @@ helm upgrade -f values.yaml gitlab gitlab/gitlab-omnibus You can also upgrade and specify these options via the command line: ```bash -<<<<<<< HEAD helm upgrade gitlab --set gitlab=ee,gitlabEEImage=gitlab/gitlab-ee:9.5.5-ee.0 gitlab/gitlab-omnibus ``` @@ -184,10 +179,5 @@ To uninstall the GitLab Chart, run the following: helm delete gitlab ``` -======= -helm delete gitlab -``` - ->>>>>>> master [kube-srv]: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services---service-types [storageclass]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#storageclasses |