GitLab-15-Breaking-Changes.md

@@ -769,12 +769,16 @@ In GitLab 16.0, we will [remove the feature, its related code, and the feature f
 
 - [Epic](https://gitlab.com/groups/gitlab-org/configure/-/epics/8)
 
-#### :ballot_box_with_check:  K8S  :gem: :gear:  [-TODO-]
+#### :ballot_box_with_check: certificate based K8S goes in 17.0 :wheel_of_dharma:
 
 - If you are not integrating with Kubernetes, this definitely won't be an issue
-- existing projects will carry on working on self-managed
-- can be easily re-enabled 
-- would be nice to have some way to scope projects with cert based integration
+- I think self-managed instances will need to set the feature flag on, via the Rails console
+
+```ruby
+Feature.enable("certificate_based_clusters")
+```
+
+- [Full removal is now in 17.0](https://docs.gitlab.com/ee/update/deprecations.html#self-managed-certificate-based-integration-with-kubernetes).
 
 ---
 
@@ -789,10 +793,16 @@ The logging features in GitLab allow users to install the ELK stack (Elasticsear
 
 - [Issue](https://gitlab.com/gitlab-org/gitlab/-/issues/346485)
 
-#### :ballot_box_with_check:  K8S  :gem: :gear:  [-TODO-]
+#### :ballot_box_with_check: certificate based K8S goes in 17.0 :wheel_of_dharma:
 
 - If you are not integrating with Kubernetes, this definitely won't be an issue
-- would be nice to have some way to scope what managd apps have been deployed
+- I think self-managed instances will need to set the feature flag on, via the Rails console
+
+```ruby
+Feature.enable("certificate_based_clusters")
+```
+
+- [Full removal is now in 17.0](https://docs.gitlab.com/ee/update/deprecations.html#self-managed-certificate-based-integration-with-kubernetes).
 
 ---