@rancher/shell 3.0.0-rc.8 → 3.0.0

package/edit/workload/mixins/workload.js

@@ -947,7 +947,7 @@ export default {
         nameNumber++;
       }
       const container = {
-        ...defaultContainer,
+        ...structuredClone(defaultContainer),
         name:   `container-${ nameNumber }`,
         active: true
       };

package/mixins/browser-tab-visibility.js

@@ -25,7 +25,7 @@ export default {
   mounted() {
     this.setTabVisibilityListener(true);
   },
-  beforeDestroy() {
+  beforeUnmount() {
     this.setTabVisibilityListener(false);
   },
 };

package/mixins/chart.js

@@ -291,6 +291,8 @@ export default {
             id:   `${ this.query.appNamespace }/${ this.query.appName }`,
           });
 
+          await this.existing?.fetchValues(true);
+
           this.mode = _EDIT;
         } catch (e) {
           this.mode = _CREATE;
@@ -450,10 +452,12 @@ export default {
               }
             }
             if (existingCRDApp) {
+              await existingCRDApp.fetchValues(true);
+
               // spec.values are any non-default values the user configured
               // the installation form should show these, as well as any default values from the chart
-              const existingValues = clone(existingCRDApp.spec?.values || {});
-              const defaultValues = clone(existingCRDApp.spec?.chart?.values || {});
+              const existingValues = clone(existingCRDApp.values || {});
+              const defaultValues = clone(existingCRDApp.chartValues || {});
 
               crdVersionInfo.existingValues = existingValues;
               crdVersionInfo.allValues = merge(defaultValues, existingValues);

package/mixins/metric-poller.js

@@ -13,7 +13,7 @@ export default {
     this.metricPoller.start();
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     this.metricPoller.stop();
   },
 };

package/mixins/resource-fetch.js

@@ -48,7 +48,7 @@ export default {
     };
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     // make sure this only runs once, for the initialized instance
     if (this.init) {
       // clear up the store to make sure we aren't storing anything that might interfere with the next rendered list view

package/models/catalog.cattle.io.app.js

@@ -4,7 +4,7 @@ import {
 import { CATALOG as CATALOG_ANNOTATIONS, FLEET } from '@shell/config/labels-annotations';
 import { compare, isPrerelease, sortable } from '@shell/utils/version';
 import { filterBy } from '@shell/utils/array';
-import { CATALOG, MANAGEMENT, NORMAN } from '@shell/config/types';
+import { CATALOG, MANAGEMENT, NORMAN, SECRET } from '@shell/config/types';
 import { SHOW_PRE_RELEASE } from '@shell/store/prefs';
 import { set } from '@shell/utils/object';
 
@@ -280,28 +280,115 @@ export default class CatalogApp extends SteveModel {
     };
   }
 
-  get deployedAsLegacy() {
-    return async() => {
-      if (this.spec?.values?.global) {
-        const { clusterName, projectName } = this.spec.values.global;
-
-        if (clusterName && projectName) {
-          try {
-            const legacyApp = await this.$dispatch('rancher/find', {
-              type: NORMAN.APP,
-              id:   `${ projectName }:${ this.metadata?.name }`,
-              opt:  { url: `/v3/project/${ clusterName }:${ projectName }/apps/${ projectName }:${ this.metadata?.name }` }
-            }, { root: true });
-
-            if (legacyApp) {
-              return legacyApp;
-            }
-          } catch (e) {}
-        }
+  async deployedAsLegacy() {
+    await this.fetchValues();
+
+    if (this.values?.global) {
+      const { clusterName, projectName } = this.values.global;
+
+      if (clusterName && projectName) {
+        try {
+          const legacyApp = await this.$dispatch('rancher/find', {
+            type: NORMAN.APP,
+            id:   `${ projectName }:${ this.metadata?.name }`,
+            opt:  { url: `/v3/project/${ clusterName }:${ projectName }/apps/${ projectName }:${ this.metadata?.name }` }
+          }, { root: true });
+
+          if (legacyApp) {
+            return legacyApp;
+          }
+        } catch (e) {}
       }
+    }
 
-      return false;
-    };
+    return false;
+  }
+
+  /**
+   * User and Chart values live in a helm secret, so fetch it (with special param)
+   */
+  async fetchValues(force = false) {
+    if (!this.secretId) {
+      // If there's no secret id this isn't ever going to work, no need to carry on
+      return;
+    }
+
+    const haveValues = !!this._values && !!this._chartValues;
+
+    if (haveValues && !force) {
+      // If we already have the required values and we're not forced to re-fetch, no need to carry on
+      return;
+    }
+
+    try {
+      await this.$dispatch('find', {
+        type: SECRET,
+        id:   this.secretId,
+        opt:  {
+          force:  force || (!!this._secret && !haveValues), // force if explicitly requested or there's ean existing secret without the required values we have a secret without the values in (Secret has been fetched another way)
+          watch:  false, // Cannot watch with custom params (they are dropped on calls made when resyncing over socket)
+          params: { includeHelmData: true }
+        }
+      });
+    } catch (e) {
+      console.error(`Cannot find values for ${ this.id } (unable to fetch)`, e); // eslint-disable-line no-console
+    }
+  }
+
+  get secretId() {
+    const metadata = this.metadata;
+    const secretReference = metadata.ownerReferences?.find((ow) => ow.kind.toLowerCase() === SECRET);
+
+    const secretId = secretReference?.name;
+    const secretNamespace = metadata.namespace;
+
+    if (!secretNamespace || !secretId) {
+      console.warn(`Cannot find values for ${ this.id } (cannot find related secret namespace or id)`); // eslint-disable-line no-console
+
+      return null;
+    }
+
+    return `${ secretNamespace }/${ secretId }`;
+  }
+
+  get _secret() {
+    return this.secretId ? this.$getters['byId'](SECRET, this.secretId) : null;
+  }
+
+  _validateSecret(noun) {
+    if (this._secret === undefined) {
+      throw new Error(`Cannot find ${ noun } for  ${ this.id } (chart secret has not been fetched via app \`fetchValues\`)`);
+    }
+
+    if (this._secret === null) {
+      throw new Error(`Cannot find ${ noun } for ${ this.id } (chart secret cannot or has failed to fetch) `);
+    }
+  }
+
+  /**
+   * The user's helm values
+   */
+  get values() {
+    this._validateSecret('values');
+
+    return this._values;
+  }
+
+  get _values() {
+    return this._secret?.data?.release?.config;
+  }
+
+  /**
+   * The Charts default helm values
+   */
+  get chartValues() {
+    this._validateSecret('chartValues');
+
+    return this._chartValues;
+  }
+
+  get _chartValues() {
+    return this._secret?.data?.release?.chart?.values;
   }
 }
 

package/models/cloudcredential.js

@@ -241,9 +241,9 @@ export default class CloudCredential extends NormanModel {
   }
 
   get expiresForSort() {
-    // Why not just `expires`? Ensures the correct sort order of 'no expiration' --> 'expired' --> 'expiring'
-    // (instead of expired --> expiring --> no expiration)
-    return this.expires || Number.MAX_SAFE_INTEGER;
+    // Why not just `expires`? Ensures the correct sort order of expired --> expiring --> never expires
+    // (instead of 'never expired' --> 'expired' --> 'expiring')
+    return this.expires !== undefined ? this.expires : Number.MAX_SAFE_INTEGER;
   }
 
   get expires() {
@@ -296,7 +296,7 @@ export default class CloudCredential extends NormanModel {
   }
 
   get expiresIn() {
-    if (!this.expires) {
+    if (this.expires === undefined) {
       return null;
     }
 

package/models/fleet.cattle.io.gitrepo.js

@@ -176,6 +176,10 @@ export default class GitRepo extends SteveModel {
   get repoDisplay() {
     let repo = this.spec.repo;
 
+    if (!repo) {
+      return null;
+    }
+
     repo = repo.replace(/.git$/, '');
     repo = repo.replace(/^https:\/\//, '');
     repo = repo.replace(/\/+$/, '');
@@ -307,20 +311,11 @@ export default class GitRepo extends SteveModel {
       bundle.namespacedName.startsWith(`${ this.namespace }:${ this.name }`));
   }
 
+  /**
+   * Bundles with state of active
+   */
   get bundlesReady() {
-    if (this.bundles && this.bundles.length) {
-      return this.bundles.filter((bundle) => bundle.state === 'active');
-    }
-
-    return 0;
-  }
-
-  get targetClustersReady() {
-    if (this.targetClusters && this.targetClusters.length) {
-      return this.targetClusters.filter((cluster) => cluster.state === 'active');
-    }
-
-    return 0;
+    return this.bundles?.filter((bundle) => bundle.state === 'active');
   }
 
   get bundleDeployments() {

package/models/management.cattle.io.cluster.js

@@ -16,6 +16,8 @@ import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
 import { PINNED_CLUSTERS } from '@shell/store/prefs';
 import { copyTextToClipboard } from '@shell/utils/clipboard';
 
+const DEFAULT_BADGE_COLOR = '#707070';
+
 // See translation file cluster.providers for list of providers
 // If the logo is not named with the provider name, add an override here
 const PROVIDER_LOGO_OVERRIDE = {};
@@ -306,13 +308,22 @@ export default class MgmtCluster extends SteveModel {
       return undefined;
     }
 
-    const color = this.metadata?.annotations[CLUSTER_BADGE.COLOR] || '#7f7f7f';
+    let color = this.metadata?.annotations[CLUSTER_BADGE.COLOR] || DEFAULT_BADGE_COLOR;
     const iconText = this.metadata?.annotations[CLUSTER_BADGE.ICON_TEXT] || '';
+    let foregroundColor;
+
+    try {
+      foregroundColor = textColor(parseColor(color.trim())); // Remove any whitespace
+    } catch (_e) {
+      // If we could not parse the badge color, use the defaults
+      color = DEFAULT_BADGE_COLOR;
+      foregroundColor = textColor(parseColor(color));
+    }
 
     return {
       text:      comment || undefined,
       color,
-      textColor: textColor(parseColor(color)),
+      textColor: foregroundColor,
       iconText:  iconText.substr(0, 3)
     };
   }

package/models/management.cattle.io.project.js

@@ -62,6 +62,10 @@ export default class Project extends HybridModel {
     });
   }
 
+  get description() {
+    return this.spec?.description;
+  }
+
   get doneOverride() {
     return this.listLocation;
   }

package/models/provisioning.cattle.io.cluster.js

@@ -10,7 +10,6 @@ import { compare } from '@shell/utils/version';
 import { AS, MODE, _VIEW, _YAML } from '@shell/config/query-params';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { CAPI as CAPI_ANNOTATIONS, NODE_ARCHITECTURE } from '@shell/config/labels-annotations';
-import capitalize from 'lodash/capitalize';
 
 /**
  * Class representing Cluster resource.
@@ -424,7 +423,7 @@ export default class ProvCluster extends SteveModel {
       if (!node.metadata?.state?.transitioning) {
         const architecture = node.status?.nodeLabels?.[NODE_ARCHITECTURE];
 
-        const key = architecture ? capitalize(architecture) : this.t('cluster.architecture.label.unknown');
+        const key = architecture || this.t('cluster.architecture.label.unknown');
 
         obj[key] = (obj[key] || 0) + 1;
       }

package/models/workload.js

@@ -110,7 +110,7 @@ export default class Workload extends WorkloadService {
         spec.template = {
           spec: {
             restartPolicy:  this.type === WORKLOAD_TYPES.JOB ? 'Never' : 'Always',
-            containers:     [{ ...defaultContainer }],
+            containers:     [{ ...structuredClone(defaultContainer) }],
             initContainers: []
           }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.0-rc.8",
+  "version": "3.0.0",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -41,6 +41,7 @@
     "@rancher/icons": "2.0.29",
     "@types/is-url": "1.2.30",
     "@types/node": "16.4.3",
+    "@types/semver": "^7.5.8",
     "@typescript-eslint/eslint-plugin": "~5.4.0",
     "@typescript-eslint/parser": "~5.4.0",
     "@vue/cli-plugin-babel": "~5.0.0",
@@ -53,7 +54,9 @@
     "babel-eslint": "10.1.0",
     "babel-plugin-module-resolver": "4.0.0",
     "babel-preset-vue": "2.0.2",
+    "cache-loader": "4.1.0",
     "clipboard-polyfill": "4.0.1",
+    "color": "4.2.3",
     "codemirror": ">=5.64.0 <6",
     "codemirror-editor-vue3": "2.7.1",
     "cookie": "0.5.0",
@@ -71,7 +74,7 @@
     "dagre-d3": "0.6.4",
     "dayjs": "1.8.29",
     "diff2html": "3.4.24",
-    "dompurify": "2.4.5",
+    "dompurify": "2.5.4",
     "element-matches": "^0.1.2",
     "eslint": "7.32.0",
     "eslint-config-standard": "16.0.3",
@@ -89,6 +92,7 @@
     "frontmatter-markdown-loader": "3.7.0",
     "identicon.js": "2.3.3",
     "intl-messageformat": "7.8.4",
+    "ip": "2.0.1",
     "is-url": "1.2.4",
     "jest": "27.5.1",
     "jest-serializer-vue": "2.0.2",
@@ -98,13 +102,14 @@
     "js-yaml": "4.1.0",
     "js-yaml-loader": "1.2.2",
     "jsdiff": "1.1.1",
-    "jsonpath-plus": "6.0.1",
+    "jsonpath-plus": "10.0.0",
     "jsrsasign": "10.5.25",
     "jszip": "3.8.0",
     "lodash": "4.17.21",
     "marked": "4.0.17",
     "nodemon": "2.0.22",
     "nyc": "15.1.0",
+    "node-polyfill-webpack-plugin": "3.0.0",
     "papaparse": "5.3.0",
     "portal-vue": "~3.0.0",
     "sass": "1.51.0",
@@ -153,7 +158,9 @@
     "qs": "6.11.1",
     "roarr": "7.0.4",
     "semver": "7.5.4",
-    "@vue/cli-service/html-webpack-plugin": "^5.0.0"
+    "@types/lodash": "4.17.5",
+    "@types/node": "~20.10.0",
+    "@vue/cli-service/html-webpack-plugin": "^5.0.0"  
   },
   "nyc": {
     "extension": [

package/pages/auth/logout.vue

@@ -1,21 +1,19 @@
 <script>
-import { authProvidersInfo } from '@shell/utils/auth';
+import { configType } from '@shell/models/management.cattle.io.authconfig';
 
 export default {
   async fetch() {
-    const authInfo = await authProvidersInfo(this.$store);
+    const publicAuthProviders = await this.$store.dispatch('auth/getAuthProviders');
 
-    if (authInfo.enabled?.length) {
-      const authProvider = authInfo.enabled[0];
+    const samlAuthProvider = publicAuthProviders.find((authProvider) => configType[authProvider.id] === 'saml');
 
-      const {
-        logoutAllSupported, logoutAllEnabled, logoutAllForced, configType
-      } = authProvider;
+    if (!!samlAuthProvider) {
+      const { logoutAllSupported, logoutAllEnabled, logoutAllForced } = samlAuthProvider;
 
-      if (configType === 'saml' && logoutAllSupported && logoutAllEnabled && logoutAllForced) {
+      if (logoutAllSupported && logoutAllEnabled && logoutAllForced) {
         // SAML - force SLO (logout from all apps)
         await this.$store.dispatch('auth/logout', {
-          force: true, slo: true, provider: authProvider
+          force: true, slo: true, provider: samlAuthProvider
         }, { root: true });
       } else {
         // simple logout

package/pages/auth/setup.vue

@@ -496,6 +496,7 @@ export default {
 
       .span-6 {
         padding: 0 60px;
+        margin: 0;
       }
 
       .landscape {
@@ -503,6 +504,7 @@ export default {
         margin: 0;
         object-fit: cover;
         padding: 0;
+        width: 49%;
       }
     }
 
@@ -512,6 +514,7 @@ export default {
       overflow-y: auto;
       position: relative;
       height: 100vh;
+      width: 51%;
 
       & > div:first-of-type {
         flex:3;

package/pages/c/_cluster/apps/charts/install.vue

@@ -294,8 +294,9 @@ export default {
         */
         userValues = diff(this.loadedVersionValues, this.chartValues);
       } else if ( this.existing ) {
+        await this.existing.fetchValues(); // In theory this has already been called, but do again to be safe
         /* For an already installed app, use the values from the previous install. */
-        userValues = clone(this.existing.spec?.values || {});
+        userValues = clone(this.existing.values || {});
       } else {
         /* For an new app, start empty. */
         userValues = {};
@@ -1457,6 +1458,7 @@ export default {
           <Banner
             v-if="isNamespaceNew && value.metadata.namespace.length"
             color="info"
+            class="namespace-create-banner"
           >
             <div v-clean-html="t('catalog.install.steps.basics.createNamespace', {namespace: value.metadata.namespace}, true) " />
           </Banner>
@@ -1661,9 +1663,10 @@ export default {
           class="mt-10"
         >
           <UnitInput
-            v-model.number="customCmdOpts.timeout"
+            v-model:value="customCmdOpts.timeout"
             :label="t('catalog.install.helm.timeout.label')"
             :suffix="t('catalog.install.helm.timeout.unit', {value: customCmdOpts.timeout})"
+            type="number"
           />
         </div>
         <div
@@ -1672,9 +1675,10 @@ export default {
         >
           <UnitInput
             v-if="existing"
-            v-model.number="customCmdOpts.historyMax"
+            v-model:value="customCmdOpts.historyMax"
             :label="t('catalog.install.helm.historyMax.label')"
             :suffix="t('catalog.install.helm.historyMax.unit', {value: customCmdOpts.historyMax})"
+            type="number"
           />
         </div>
         <div
@@ -1852,6 +1856,10 @@ export default {
       .spacer {
         line-height: 2;
       }
+
+      .namespace-create-banner {
+        margin-bottom: 70px;
+      }
     }
     &__values {
       &__controls {

package/pages/c/_cluster/explorer/__tests__/index.test.ts

@@ -25,9 +25,12 @@ describe('page: cluster dashboard', () => {
             'cluster/inError':   () => false,
             'cluster/schemaFor': jest.fn(),
             'cluster/canList':   jest.fn(),
-            'cluster/all':       jest.fn(),
-            'i18n/exists':       jest.fn(),
-            'i18n/t':            (label: string) => label === 'generic.provisioning' ? '—' : jest.fn()(),
+            'cluster/byId':      () => {
+              return {};
+            },
+            'cluster/all': jest.fn(),
+            'i18n/exists': jest.fn(),
+            'i18n/t':      (label: string) => label === 'generic.provisioning' ? '—' : jest.fn()(),
           }
         }
       },
@@ -161,7 +164,7 @@ describe('page: cluster dashboard', () => {
       ['created', 'glance.created', []],
       ['architecture', 'mixed', [{ labels: { [NODE_ARCHITECTURE]: 'amd64' } }, { labels: { [NODE_ARCHITECTURE]: 'intel' } }]],
       ['architecture', 'mixed', [{ labels: { [NODE_ARCHITECTURE]: 'amd64' } }, { labels: { } }]],
-      ['architecture', 'Amd64', [{ labels: { [NODE_ARCHITECTURE]: 'amd64' } }]],
+      ['architecture', 'amd64', [{ labels: { [NODE_ARCHITECTURE]: 'amd64' } }]],
       ['architecture', 'unknown', [{ labels: { } }]],
       ['architecture', 'glance.architecture', [{ metadata: { state: { transitioning: true } } }]],
     ])('should show %p label %p', (label, text, nodes) => {

package/pages/c/_cluster/explorer/index.vue

@@ -47,7 +47,6 @@ import Certificates from '@shell/components/Certificates';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import TabTitle from '@shell/components/TabTitle';
 import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
-import capitalize from 'lodash/capitalize';
 
 export const RESOURCES = [NAMESPACE, INGRESS, PV, WORKLOAD_TYPES.DEPLOYMENT, WORKLOAD_TYPES.STATEFUL_SET, WORKLOAD_TYPES.JOB, WORKLOAD_TYPES.DAEMON_SET, SERVICE];
 
@@ -115,12 +114,6 @@ export default {
       if (this.currentCluster.isLocal && this.$store.getters['management/schemaFor'](MANAGEMENT.NODE)) {
         this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE });
       }
-
-      this.canViewAgents = this.$store.getters['cluster/canList'](WORKLOAD_TYPES.DEPLOYMENT) && this.$store.getters['cluster/canList'](WORKLOAD_TYPES.STATEFUL_SET);
-
-      if (this.canViewAgents) {
-        this.loadAgents();
-      }
     }
   },
 
@@ -138,7 +131,6 @@ export default {
       cattleDeployment:   'loading',
       fleetDeployment:    'loading',
       fleetStatefulSet:   'loading',
-      canViewAgents:      false,
       disconnected:       false,
       events:             [],
       nodeMetrics:        [],
@@ -172,6 +164,17 @@ export default {
     clearInterval(this.interval);
   },
 
+  watch: {
+    canViewAgents: {
+      handler(neu, old) {
+        if (neu && !old) {
+          this.loadAgents();
+        }
+      },
+      immediate: true
+    }
+  },
+
   computed: {
     ...mapGetters(['currentCluster']),
     ...monitoringStatus(),
@@ -184,6 +187,22 @@ export default {
       return this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
     },
 
+    fleetAgentNamespace() {
+      return this.$store.getters['cluster/byId'](NAMESPACE, 'cattle-fleet-system');
+    },
+
+    cattleAgentNamespace() {
+      if (this.currentCluster.isLocal) {
+        return;
+      }
+
+      return this.$store.getters['cluster/byId'](NAMESPACE, 'cattle-system');
+    },
+
+    canViewAgents() {
+      return !!this.fleetAgentNamespace || (!this.currentCluster.isLocal && this.cattleAgentNamespace);
+    },
+
     showClusterTools() {
       return this.$store.getters['cluster/canList'](CATALOG.CLUSTER_REPO) &&
       this.$store.getters['cluster/canList'](CATALOG.APP);
@@ -212,7 +231,7 @@ export default {
         if (!node.metadata?.state?.transitioning) {
           const architecture = node.labels?.[NODE_ARCHITECTURE];
 
-          const key = architecture ? capitalize(architecture) : this.t('cluster.architecture.label.unknown');
+          const key = architecture || this.t('cluster.architecture.label.unknown');
 
           obj[key] = (obj[key] || 0) + 1;
         }
@@ -268,15 +287,15 @@ export default {
         });
       });
 
-      if (this.canViewAgents) {
-        if (!this.currentCluster.isLocal) {
-          services.push({
-            name:     'cattle',
-            status:   this.cattleStatus,
-            labelKey: 'clusterIndexPage.sections.componentStatus.cattle',
-          });
-        }
+      if (this.cattleAgentNamespace) {
+        services.push({
+          name:     'cattle',
+          status:   this.cattleStatus,
+          labelKey: 'clusterIndexPage.sections.componentStatus.cattle',
+        });
+      }
 
+      if (this.fleetAgentNamespace) {
         services.push({
           name:     'fleet',
           status:   this.fleetStatus,
@@ -485,14 +504,16 @@ export default {
 
   methods: {
     loadAgents() {
-      if (this.currentCluster.isLocal) {
-        this.setAgentResource('fleetDeployment', WORKLOAD_TYPES.DEPLOYMENT, 'cattle-fleet-system/fleet-controller');
-        this.setAgentResource('fleetStatefulSet', WORKLOAD_TYPES.STATEFUL_SET, 'cattle-fleet-local-system/fleet-agent');
-      } else {
-        this.setAgentResource('fleetStatefulSet', WORKLOAD_TYPES.STATEFUL_SET, 'cattle-fleet-system/fleet-agent');
+      if (this.fleetAgentNamespace) {
+        if (this.currentCluster.isLocal) {
+          this.setAgentResource('fleetDeployment', WORKLOAD_TYPES.DEPLOYMENT, 'cattle-fleet-system/fleet-controller');
+          this.setAgentResource('fleetStatefulSet', WORKLOAD_TYPES.STATEFUL_SET, 'cattle-fleet-local-system/fleet-agent');
+        } else {
+          this.setAgentResource('fleetStatefulSet', WORKLOAD_TYPES.STATEFUL_SET, 'cattle-fleet-system/fleet-agent');
+        }
+      }
+      if (this.cattleAgentNamespace) {
         this.setAgentResource('cattleDeployment', WORKLOAD_TYPES.DEPLOYMENT, 'cattle-system/cattle-cluster-agent');
-
-        // Scaling Up/Down cattle deployment causes web sockets disconnection;
         this.interval = setInterval(() => {
           this.disconnected = !!this.$store.getters['cluster/inError']({ type: NODE });
         }, 1000);