Merge branch...

Merge branch '12867-deployment-board-help-text-suggests-incorrect-kubernetes-namespace' into 'master'

Fix suggested namespace in deploy boards help text

See merge request gitlab-org/gitlab-ee!14739

ee/app/assets/javascripts/environments/components/deploy_board_component.vue

@@ -90,9 +90,6 @@ export default {
     instanceTitle() {
       return n__('Instance', 'Instances', this.instanceCount);
     },
-    projectName() {
-      return '<projectname>';
-    },
     deployBoardSvg() {
       return deployBoardSvg;
     },
@@ -169,9 +166,8 @@ export default {
         <section class="deploy-board-empty-state-text">
           <span class="deploy-board-empty-state-title d-flex">Kubernetes deployment not found</span>
           <span>
-            To see deployment progress for your environments, make sure your deployments are in
-            Kubernetes namespace <code>{{ projectName }}</code
-            >, and annotated with
+            To see deployment progress for your environments, make sure you are deploying to
+            <code>$KUBE_NAMESPACE</code> and annotating with
             <code>app.gitlab.com/app=$CI_PROJECT_PATH_SLUG</code>
             and <code>app.gitlab.com/env=$CI_ENVIRONMENT_SLUG</code>.
           </span>

ee/changelogs/unreleased/12867-deployment-board-help-text-suggests-incorrect-kubernetes-namespace.yml

+---
+title: Fix suggested namespace in deploy boards help text
+merge_request: 14739
+author:
+type: fixed