summaryrefslogtreecommitdiff
path: root/doc/user/project/integrations
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-01-12 18:18:09 +0100
committerAchilleas Pipinellis <axil@gitlab.com>2018-01-12 18:18:09 +0100
commit5b353d2dac2ba10bb581ab774afbd56cc3d0da4d (patch)
tree0f3293832e61e78161da7df551d0ba68318ca68a /doc/user/project/integrations
parent469ea1ad3316ecef0fb79fff9adfb18f5b8b3f6e (diff)
downloadgitlab-ce-docs/refactor-k8s-cluster.tar.gz
Copy k8s service integration info into clustersdocs/refactor-k8s-cluster
Now that the k8s service is being deprecated in favor of the Clusters integration, copy all info from the old to the new page.
Diffstat (limited to 'doc/user/project/integrations')
-rw-r--r--doc/user/project/integrations/kubernetes.md10
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md
index 710cf78e84f..543baaa81e1 100644
--- a/doc/user/project/integrations/kubernetes.md
+++ b/doc/user/project/integrations/kubernetes.md
@@ -2,11 +2,15 @@
last_updated: 2017-12-28
---
-CAUTION: **Warning:**
-Kubernetes service integration has been deprecated in GitLab 10.3. If the service is active the cluster information still be editable, however we advised to disable and reconfigure the clusters using the new [Clusters](../clusters/index.md) page. If the service is inactive the fields will be uneditable. Read [GitLab 10.3 release post](https://about.gitlab.com/2017/12/22/gitlab-10-3-released/#kubernetes-integration-service) for more information.
-
# GitLab Kubernetes / OpenShift integration
+CAUTION: **Warning:**
+The Kubernetes service integration has been deprecated in GitLab 10.3. If the
+service is active, the cluster information will still be editable, however we
+advise to disable and reconfigure the clusters using the new
+[Clusters](../clusters/index.md) page. If the service is inactive, the fields
+will not be editable. Read [GitLab 10.3 release post](https://about.gitlab.com/2017/12/22/gitlab-10-3-released/#kubernetes-integration-service) for more information.
+
GitLab can be configured to interact with Kubernetes, or other systems using the
Kubernetes API (such as OpenShift).