summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-03-16 17:18:04 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2018-03-16 17:18:04 +0000
commitf864fb46da83058c7f92ec889dd7914cc8bcec09 (patch)
tree39c21801d0d3b38c6962760b07c58fe6ae865bb8
parent07a06baace78cf2835eed8ace7b2f0663e7b6749 (diff)
parentcb9d5f9064b59ec7fe7235a981cb747bfe60dcc1 (diff)
downloadgitlab-ce-f864fb46da83058c7f92ec889dd7914cc8bcec09.tar.gz
Merge branch 'opnshift-docs-patch' into 'master'
OpenShift install docs: Recommend "add-scc-to-user" over "edit scc" See merge request gitlab-org/gitlab-ce!17787
-rw-r--r--doc/install/openshift_and_gitlab/index.md11
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/install/openshift_and_gitlab/index.md b/doc/install/openshift_and_gitlab/index.md
index 1f46ee4c1ea..e6ccfccd33f 100644
--- a/doc/install/openshift_and_gitlab/index.md
+++ b/doc/install/openshift_and_gitlab/index.md
@@ -464,7 +464,9 @@ bother us. In any case, it is something to keep in mind when deploying GitLab
on a production cluster.
In order to deploy GitLab on a production cluster, you will need to assign the
-GitLab service account to the `anyuid` Security Context.
+GitLab service account to the `anyuid` [Security Context Constraints][scc].
+
+For OpenShift v3.0, you will need to do this manually:
1. Edit the Security Context:
```sh
@@ -477,6 +479,12 @@ GitLab service account to the `anyuid` Security Context.
1. Save and exit the editor
+For OpenShift v3.1 and above, you can do:
+
+```sh
+oc adm policy add-scc-to-user anyuid system:serviceaccount:gitlab:gitlab-ce-user
+```
+
## Conclusion
By now, you should have an understanding of the basic OpenShift Origin concepts
@@ -513,3 +521,4 @@ PaaS and managing your applications with the ease of containers.
[autoscaling]: https://docs.openshift.org/latest/dev_guide/pod_autoscaling.html "Documentation - Autoscale"
[basic-cli]: https://docs.openshift.org/latest/cli_reference/basic_cli_operations.html "Documentation - Basic CLI operations"
[openshift-docs]: https://docs.openshift.org "OpenShift documentation"
+[scc]: https://docs.openshift.org/latest/admin_guide/manage_scc.html "Documentation - Managing Security Context Constraints" \ No newline at end of file