From 312ac59328577a230a049eb71c56f648508d209f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 30 Jun 2022 09:10:05 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/infrastructure/clusters/index.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/user/infrastructure/clusters/index.md b/doc/user/infrastructure/clusters/index.md index 933b310ff3f..4fa5dde31b4 100644 --- a/doc/user/infrastructure/clusters/index.md +++ b/doc/user/infrastructure/clusters/index.md @@ -13,7 +13,10 @@ To connect clusters to GitLab, use the [GitLab agent](../../clusters/agent/index WARNING: In GitLab 14.5, the certificate-based method to connect Kubernetes clusters to GitLab was [deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8), -as well as its related [features](#deprecated-features). +as well as its related [features](#deprecated-features). In self-managed GitLab 15.0 and later, +this feature is disabled by default. For GitLab SaaS users, this feature is available until +GitLab 15.6 for users who have at least one certificate-based cluster enabled in their namespace hierarchy. +For GitLab SaaS users that never used this feature previously, it is no longer available. The certificate-based Kubernetes integration with GitLab is deprecated. It had the following issues: @@ -40,6 +43,10 @@ for updates. You can find technical information about why we moved away from cluster certificates into the GitLab agent model on the [agent's blueprint documentation](../../../architecture/blueprints/gitlab_to_kubernetes_communication/index.md). +If you need more time to migrate to GitLab agent, you can [enable the feature flag](../../../administration/feature_flags.md) +named `certificate_based_clusters`, which was [introduced in GitLab 15.0](../../../update/deprecations.md#self-managed-certificate-based-integration-with-kubernetes). +This feature flag re-enables the certificate-based Kubernetes integration. + ## Deprecated features - [Connect an existing cluster through cluster certificates](../../project/clusters/add_existing_cluster.md) -- cgit v1.2.3