1 files changed, 13 insertions, 13 deletions
diff --git a/app/assets/javascripts/environments/components/new_environment_item.vue b/app/assets/javascripts/environments/components/new_environment_item.vue
index 1f3d429cc3e..fda1c85f739 100644
--- a/app/assets/javascripts/environments/components/new_environment_item.vue
+++ b/app/assets/javascripts/environments/components/new_environment_item.vue
@@ -14,6 +14,7 @@ import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import isLastDeployment from '../graphql/queries/is_last_deployment.query.graphql';
 import getEnvironmentClusterAgent from '../graphql/queries/environment_cluster_agent.query.graphql';
+import getEnvironmentClusterAgentWithNamespace from '../graphql/queries/environment_cluster_agent_with_namespace.query.graphql';
 import ExternalUrl from './environment_external_url.vue';
 import Actions from './environment_actions.vue';
 import StopComponent from './environment_stop.vue';
@@ -82,7 +83,7 @@ export default {
     tierTooltip: s__('Environment|Deployment tier'),
   },
   data() {
-    return { visible: false, clusterAgent: null };
+    return { visible: false, clusterAgent: null, kubernetesNamespace: '' };
   },
   computed: {
     icon() {
@@ -164,11 +165,8 @@ export default {
     rolloutStatus() {
       return this.environment?.rolloutStatus;
     },
-    isKubernetesOverviewAvailable() {
-      return this.glFeatures?.kasUserAccessProject;
-    },
-    showKubernetesOverview() {
-      return Boolean(this.isKubernetesOverviewAvailable && this.clusterAgent);
+    isKubernetesNamespaceAvailable() {
+      return this.glFeatures?.kubernetesNamespaceForEnvironment;
     },
   },
   methods: {
@@ -180,15 +178,20 @@ export default {
       }
     },
     getClusterAgent() {
-      if (!this.isKubernetesOverviewAvailable || this.clusterAgent) return;
+      if (this.clusterAgent) return;
 
       this.$apollo.addSmartQuery('environmentClusterAgent', {
         variables() {
           return { environmentName: this.environment.name, projectFullPath: this.projectPath };
         },
-        query: getEnvironmentClusterAgent,
+        query() {
+          return this.isKubernetesNamespaceAvailable
+            ? getEnvironmentClusterAgentWithNamespace
+            : getEnvironmentClusterAgent;
+        },
         update(data) {
           this.clusterAgent = data?.project?.environment?.clusterAgent;
+          this.kubernetesNamespace = data?.project?.environment?.kubernetesNamespace || '';
         },
       });
     },
@@ -368,11 +371,8 @@ export default {
           </template>
         </gl-sprintf>
       </div>
-      <div v-if="showKubernetesOverview" :class="$options.kubernetesOverviewClasses">
-        <kubernetes-overview
-          :cluster-agent="clusterAgent"
-          :namespace="environment.kubernetesNamespace"
-        />
+      <div v-if="clusterAgent" :class="$options.kubernetesOverviewClasses">
+        <kubernetes-overview :cluster-agent="clusterAgent" :namespace="kubernetesNamespace" />
       </div>
       <div v-if="rolloutStatus" :class="$options.deployBoardClasses">
         <deploy-board-wrapper