Merge branch 'triggermesh-phase2-knative-description' into 'master'

Reword Knative cluster application

See merge request gitlab-org/gitlab-ce!23289

3 files changed, 13 insertions, 9 deletions

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 8354c28778c..16acb4c3153 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -408,12 +408,11 @@ export default {
         <div slot="description">
           <p>
             {{
-              s__(`ClusterIntegration|A Knative build extends Kubernetes
-              and utilizes existing Kubernetes primitives to provide you with
-              the ability to run on-cluster container builds from source.
-              For example, you can write a build that uses Kubernetes-native
-              resources to obtain your source code from a repository,
-              build it into container a image, and then run that image.`)
+              s__(`ClusterIntegration|Knative (pronounced kay-nay-tiv) extends
+              Kubernetes to provide a set of middleware components that are
+              essential to build modern, source-centric, and container-based
+              applications that can run anywhere: on premises, in the cloud, or
+              even in a third-party data center.`)
             }}
           </p>
 
diff --git a/changelogs/unreleased/triggermesh-phase2-knative-description.yml b/changelogs/unreleased/triggermesh-phase2-knative-description.yml
new file mode 100644
index 00000000000..c6cee1984d5
--- /dev/null
+++ b/changelogs/unreleased/triggermesh-phase2-knative-description.yml
@@ -0,0 +1,5 @@
+---
+title: Modify the wording for the knative cluster application to match upstream
+merge_request: 23289
+author: Chris Baumbauer
+type: fixed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 71374388a7d..f76b61a2258 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1385,9 +1385,6 @@ msgstr ""
 msgid "ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which may incur additional costs depending on the hosting provider your Kubernetes cluster is installed on. If you are using Google Kubernetes Engine, you can %{pricingLink}."
 msgstr ""
 
-msgid "ClusterIntegration|A Knative build extends Kubernetes and utilizes existing Kubernetes primitives to provide you with the ability to run on-cluster container builds from source. For example, you can write a build that uses Kubernetes-native resources to obtain your source code from a repository, build it into container a image, and then run that image."
-msgstr ""
-
 msgid "ClusterIntegration|API URL"
 msgstr ""
 
@@ -1556,6 +1553,9 @@ msgstr ""
 msgid "ClusterIntegration|Knative"
 msgstr ""
 
+msgid "ClusterIntegration|Knative (pronounced kay-nay-tiv) extends Kubernetes to provide a set of middleware components that are essential to build modern, source-centric, and container-based applications that can run anywhere: on premises, in the cloud, or even in a third-party data center."
+msgstr ""
+
 msgid "ClusterIntegration|Knative Domain Name:"
 msgstr ""