Update KubernetesService deprecation warningremove-kubernetes-service-deployment-platform

4 files changed, 8 insertions, 16 deletions

diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb
index edf7e886e77..27b7827d55e 100644
--- a/app/models/project_services/kubernetes_service.rb
+++ b/app/models/project_services/kubernetes_service.rb
@@ -170,12 +170,11 @@ class KubernetesService < Service
 
   def deprecation_message
     content = if project
-                _("Kubernetes service integration has been deprecated. %{deprecated_message_content} your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page") % {
-                  deprecated_message_content: deprecated_message_content,
+                _("Kubernetes service integration has been disabled. Fields on this page are not used by GitLab, you can configure your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page") % {
                   url: Gitlab::Routing.url_helpers.project_clusters_path(project)
                 }
               else
-                _("The instance-level Kubernetes service integration is deprecated. Your data has been migrated to an <a href=\"%{url}\"/>instance-level cluster</a>.") % {
+                _("The instance-level Kubernetes service integration is disabled. Your data has been migrated to an <a href=\"%{url}\"/>instance-level cluster</a>.") % {
                   url: Gitlab::Routing.url_helpers.admin_clusters_path
                 }
               end
@@ -260,8 +259,4 @@ class KubernetesService < Service
       errors[:base] << deprecation_message
     end
   end
-
-  def deprecated_message_content
-    _("Fields on this page are now uneditable, you can configure")
-  end
 end
diff --git a/changelogs/unreleased/remove-kubernetes-service-deployment-platform.yml b/changelogs/unreleased/remove-kubernetes-service-deployment-platform.yml
index 423ab00a469..17421fca234 100644
--- a/changelogs/unreleased/remove-kubernetes-service-deployment-platform.yml
+++ b/changelogs/unreleased/remove-kubernetes-service-deployment-platform.yml
@@ -1,5 +1,5 @@
 ---
-title: Remove Kubernetes service template from available deployment platforms
+title: Remove Kubernetes service integration and Kubernetes service template from available deployment platforms
 merge_request: 29786
 author:
 type: removed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e89b1e754f2..8f010b2184c 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4408,9 +4408,6 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-msgid "Fields on this page are now uneditable, you can configure"
-msgstr ""
-
 msgid "File"
 msgid_plural "Files"
 msgstr[0] ""
@@ -5645,7 +5642,7 @@ msgstr ""
 msgid "Kubernetes error: %{error_code}"
 msgstr ""
 
-msgid "Kubernetes service integration has been deprecated. %{deprecated_message_content} your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page"
+msgid "Kubernetes service integration has been disabled. Fields on this page are not used by GitLab, you can configure your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page"
 msgstr ""
 
 msgid "LFS"
@@ -10002,7 +9999,7 @@ msgstr ""
 msgid "The import will time out after %{timeout}. For repositories that take longer, use a clone/push combination."
 msgstr ""
 
-msgid "The instance-level Kubernetes service integration is deprecated. Your data has been migrated to an <a href=\"%{url}\"/>instance-level cluster</a>."
+msgid "The instance-level Kubernetes service integration is disabled. Your data has been migrated to an <a href=\"%{url}\"/>instance-level cluster</a>."
 msgstr ""
 
 msgid "The invitation could not be accepted."
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 92e546b7880..5d7d6c34e67 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -78,7 +78,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
 
       it 'includes an error with a deprecation message' do
         kubernetes_service.valid?
-        expect(kubernetes_service.errors[:base].first).to match(/Kubernetes service integration has been deprecated/)
+        expect(kubernetes_service.errors[:base].first).to match(/Kubernetes service integration has been disabled/)
       end
     end
 
@@ -383,13 +383,13 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
     let(:kubernetes_service) { create(:kubernetes_service) }
 
     it 'indicates the service is deprecated' do
-      expect(kubernetes_service.deprecation_message).to match(/Kubernetes service integration has been deprecated/)
+      expect(kubernetes_service.deprecation_message).to match(/Kubernetes service integration has been disabled/)
     end
 
     context 'if the service is not active' do
       it 'returns a message' do
         kubernetes_service.update_attribute(:active, false)
-        expect(kubernetes_service.deprecation_message).to match(/Fields on this page are now uneditable/)
+        expect(kubernetes_service.deprecation_message).to match(/Fields on this page are not used by GitLab/)
       end
     end
   end