diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 06:09:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 06:09:28 +0300 |
| commit | be2f4c5788975597dd7be1c8a3525549770c1216 (patch) | |
| tree | 083ed0d7e29e26d479c00e00d9cb89d74ebbb0ef /doc/user/clusters | |
| parent | 2711c26beaca6c3a5a3be4b65e01557faf0185b6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/clusters')
| -rw-r--r-- | doc/user/clusters/applications.md | 4 | ||||
| -rw-r--r-- | doc/user/clusters/crossplane.md | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index 9165b5c2f5d..14223cbc0e0 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -351,8 +351,8 @@ file. #### Jupyter Git Integration -> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/28783) in GitLab 12.0 for project-level clusters. -> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/32512) in GitLab 12.3 for group and instance-level clusters. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/28783) in GitLab 12.0 for project-level clusters. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/32512) in GitLab 12.3 for group and instance-level clusters. When installing JupyterHub onto your Kubernetes cluster, [JupyterLab's Git extension](https://github.com/jupyterlab/jupyterlab-git) is automatically provisioned and configured using the authenticated user's: diff --git a/doc/user/clusters/crossplane.md b/doc/user/clusters/crossplane.md index 12a5626937a..c92337ee5f0 100644 --- a/doc/user/clusters/crossplane.md +++ b/doc/user/clusters/crossplane.md @@ -143,9 +143,9 @@ kubectl describe globaladdress.compute.gcp.crossplane.io gitlab-ad-globaladdress ## Setting up Resource classes -Resource classes are a way of defining a configuration for the required managed service. We will define the Postgres Resource class +Resource classes are a way of defining a configuration for the required managed service. We will define the PostgreSQL Resource class -- Define a gcp-postgres-standard.yaml resourceclass which contains +- Define a `gcp-postgres-standard.yaml` resourceclass which contains 1. A default CloudSQLInstanceClass. 1. A CloudSQLInstanceClass with labels. @@ -285,4 +285,4 @@ serverCACertificateSha1Fingerprint: 40 bytes ## Connect to the PostgreSQL instance Follow this [GCP guide](https://cloud.google.com/sql/docs/postgres/connect-kubernetes-engine) if you -would like to connect to the newly provisioned Postgres database instance on CloudSQL. +would like to connect to the newly provisioned PostgreSQL database instance on CloudSQL. |