@rancher/shell 0.3.17 → 0.3.18

package/config/types.js

@@ -151,6 +151,8 @@ export const LONGHORN = {
   VOLUMES:       'longhorn.io.volume',
 };
 
+export const LONGHORN_DRIVER = 'driver.longhorn.io';
+
 export const SNAPSHOT = 'rke.cattle.io.etcdsnapshot';
 
 // --------------------------------------

package/core/plugin-helpers.js

@@ -1,7 +1,9 @@
 import { ActionLocation, CardLocation, ExtensionPoint } from '@shell/core/types';
 import { isMac } from '@shell/utils/platform';
 import { ucFirst, randomStr } from '@shell/utils/string';
-import { _EDIT, _CONFIG, _DETAIL, _LIST } from '@shell/config/query-params';
+import {
+  _EDIT, _CONFIG, _DETAIL, _LIST, _CREATE
+} from '@shell/config/query-params';
 import { getProductFromRoute } from '@shell/middleware/authenticated';
 import { isEqual } from '@shell/utils/object';
 
@@ -21,15 +23,18 @@ function checkRouteProduct({ name, params, query }, locationConfigParam) {
 }
 
 function checkRouteMode({ name, query }, locationConfigParam) {
-  if (locationConfigParam === _EDIT && query.mode && query.mode === _EDIT) {
+  if (locationConfigParam === _EDIT && query.mode && query.mode === _EDIT && !query.as) {
     return true;
   } else if (locationConfigParam === _CONFIG && query.as && query.as === _CONFIG) {
     return true;
-  } else if (locationConfigParam === _DETAIL && name.includes('-id')) {
+  } else if (locationConfigParam === _DETAIL && !query.as && name.includes('-id') && (!query.mode || query?.mode !== _EDIT)) {
     return true;
     // alias to target all list views
   } else if (locationConfigParam === _LIST && !name.includes('-id') && name.includes('-resource')) {
     return true;
+    // alias to target create views
+  } else if (locationConfigParam === _CREATE && name.endsWith('-create')) {
+    return true;
   }
 
   return false;
@@ -52,6 +57,7 @@ function checkExtensionRouteBinding($route, locationConfig, context) {
     'cluster',
     'id',
     'mode',
+    'path',
     // url query params
     'queryParam',
     // Custom context specific params provided by the extension, not to be confused with location params
@@ -79,8 +85,18 @@ function checkExtensionRouteBinding($route, locationConfig, context) {
           } else if (param === 'context') {
             // Need all keys and values to match
             res = isEqual(locationConfigParam, context);
+            // evaluate queryParam in route
           } else if (param === 'queryParam') {
             res = isEqual(locationConfigParam, $route.query);
+            // evaluate path in route
+          } else if (param === 'path' && locationConfigParam.urlPath) {
+            if (locationConfigParam.endsWith) {
+              res = $route.path.endsWith(locationConfigParam.urlPath);
+            } else if (!Object.keys(locationConfigParam).includes('exact') || locationConfigParam.exact) {
+              res = locationConfigParam.urlPath === $route.path;
+            } else {
+              res = $route.path.includes(locationConfigParam.urlPath);
+            }
           } else if (locationConfigParam === params[param]) {
             res = true;
           } else {

package/core/types.ts

@@ -139,6 +139,10 @@ export type LocationConfig = {
   cluster?: string[],
   id?: string[],
   mode?: string[],
+  /**
+   * path match from URL (excludes host address)
+   */
+  path?: { [key: string]: string | boolean}[],
   /**
    * Query Params from URL
    */

package/detail/fleet.cattle.io.gitrepo.vue

@@ -31,8 +31,9 @@ export default {
 
   data() {
     return {
-      allFleet:   [],
-      allBundles: []
+      allFleet:             [],
+      allBundles:           [],
+      allBundleDeployments: [],
     };
   },
 
@@ -79,6 +80,12 @@ export default {
         inStoreType: 'management',
         type:        FLEET.BUNDLE
       },
+
+      allBundleDeployments: {
+        inStoreType: 'management',
+        type:        FLEET.BUNDLE_DEPLOYMENT
+      },
+
       allFleet: {
         inStoreType: 'management',
         type:        FLEET.CLUSTER
@@ -89,6 +96,7 @@ export default {
       }
     }, this.$store);
 
+    this.allBundleDeployments = allDispatches.allBundleDeployments || [];
     this.allBundles = allDispatches.allBundles || [];
     this.allFleet = allDispatches.allFleet || [];
   },

package/detail/pod.vue

@@ -14,6 +14,8 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import day from 'dayjs';
 import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
 import { escapeHtml } from '@shell/utils/string';
+import { NAMESPACE } from '@shell/config/types';
+import { PROJECT } from '@shell/config/labels-annotations';
 
 const POD_METRICS_DETAIL_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-pod-containers-1/rancher-pod-containers?orgId=1';
 const POD_METRICS_SUMMARY_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-pod-1/rancher-pod?orgId=1';
@@ -33,6 +35,18 @@ export default {
 
   async fetch() {
     this.showMetrics = await allDashboardsExist(this.$store, this.currentCluster.id, [POD_METRICS_DETAIL_URL, POD_METRICS_SUMMARY_URL]);
+    if (!this.showMetrics) {
+      const namespace = await this.$store.dispatch('cluster/find', { type: NAMESPACE, id: this.value.metadata.namespace });
+
+      const projectId = namespace?.metadata?.labels[PROJECT];
+
+      if (projectId) {
+        this.POD_PROJECT_METRICS_DETAIL_URL = `/api/v1/namespaces/cattle-project-${ projectId }-monitoring/services/http:cattle-project-${ projectId }-monitoring-grafana:80/proxy/d/rancher-pod-containers-1/rancher-pod-containers?orgId=1'`;
+        this.POD_PROJECT_METRICS_SUMMARY_URL = `/api/v1/namespaces/cattle-project-${ projectId }-monitoring/services/http:cattle-project-${ projectId }-monitoring-grafana:80/proxy/d/rancher-pod-1/rancher-pod?orgId=1`;
+
+        this.showProjectMetrics = await allDashboardsExist(this.$store, this.currentCluster.id, [this.POD_PROJECT_METRICS_DETAIL_URL, this.POD_PROJECT_METRICS_SUMMARY_URL], 'cluster', projectId);
+      }
+    }
   },
 
   data() {
@@ -45,10 +59,13 @@ export default {
     return {
       POD_METRICS_DETAIL_URL,
       POD_METRICS_SUMMARY_URL,
+      POD_PROJECT_METRICS_DETAIL_URL:  '',
+      POD_PROJECT_METRICS_SUMMARY_URL: '',
       POD_OPTION,
-      showMetrics: false,
-      selection:   POD_OPTION,
-      metricsID:   null,
+      showMetrics:                     false,
+      showProjectMetrics:              false,
+      selection:                       POD_OPTION,
+      metricsID:                       null,
     };
   },
 
@@ -278,6 +295,22 @@ export default {
         />
       </template>
     </Tab>
+    <Tab
+      v-if="showProjectMetrics"
+      :label="t('workload.container.titles.metrics')"
+      name="pod-metrics"
+      :weight="2.5"
+    >
+      <template #default="props">
+        <DashboardMetrics
+          v-if="props.active"
+          :detail-url="POD_PROJECT_METRICS_DETAIL_URL"
+          :summary-url="POD_PROJECT_METRICS_SUMMARY_URL"
+          :vars="graphVars"
+          graph-height="550px"
+        />
+      </template>
+    </Tab>
   </ResourceTabs>
 </template>
 <style scoped>

package/detail/workload/index.vue

@@ -2,7 +2,7 @@
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { NAMESPACE as NAMESPACE_COL } from '@shell/config/table-headers';
 import {
-  POD, WORKLOAD_TYPES, SCALABLE_WORKLOAD_TYPES, SERVICE, INGRESS, NODE
+  POD, WORKLOAD_TYPES, SCALABLE_WORKLOAD_TYPES, SERVICE, INGRESS, NODE, NAMESPACE,
 } from '@shell/config/types';
 import ResourceTable from '@shell/components/ResourceTable';
 import Tab from '@shell/components/Tabbed/Tab';
@@ -16,6 +16,7 @@ import { mapGetters } from 'vuex';
 import { allDashboardsExist } from '@shell/utils/grafana';
 import PlusMinus from '@shell/components/form/PlusMinus';
 import { matches } from '@shell/utils/selector';
+import { PROJECT } from '@shell/config/labels-annotations';
 
 const SCALABLE_TYPES = Object.values(SCALABLE_WORKLOAD_TYPES);
 const WORKLOAD_METRICS_DETAIL_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-workload-pods-1/rancher-workload-pods?orgId=1';
@@ -85,23 +86,37 @@ export default {
     const isMetricsSupportedKind = METRICS_SUPPORTED_KINDS.includes(this.value.type);
 
     this.showMetrics = isMetricsSupportedKind && await allDashboardsExist(this.$store, this.currentCluster.id, [WORKLOAD_METRICS_DETAIL_URL, WORKLOAD_METRICS_SUMMARY_URL]);
+    if (!this.showMetrics) {
+      const namespace = await this.$store.dispatch('cluster/find', { type: NAMESPACE, id: this.value.metadata.namespace });
 
+      const projectId = namespace?.metadata?.labels[PROJECT];
+
+      if (projectId) {
+        this.WORKLOAD_PROJECT_METRICS_DETAIL_URL = `/api/v1/namespaces/cattle-project-${ projectId }-monitoring/services/http:cattle-project-${ projectId }-monitoring-grafana:80/proxy/d/rancher-pod-containers-1/rancher-workload-pods?orgId=1'`;
+        this.WORKLOAD_PROJECT_METRICS_SUMMARY_URL = `/api/v1/namespaces/cattle-project-${ projectId }-monitoring/services/http:cattle-project-${ projectId }-monitoring-grafana:80/proxy/d/rancher-pod-1/rancher-workload?orgId=1`;
+
+        this.showProjectMetrics = await allDashboardsExist(this.$store, this.currentCluster.id, [this.WORKLOAD_PROJECT_METRICS_DETAIL_URL, this.WORKLOAD_PROJECT_METRICS_SUMMARY_URL], 'cluster', projectId);
+      }
+    }
     this.findMatchingServices();
     this.findMatchingIngresses();
   },
 
   data() {
     return {
-      allPods:           [],
-      allServices:       [],
-      allIngresses:      [],
-      matchingServices:  [],
-      matchingIngresses: [],
-      allJobs:           [],
-      allNodes:          [],
+      allPods:                         [],
+      allServices:                     [],
+      allIngresses:                    [],
+      matchingServices:                [],
+      matchingIngresses:               [],
+      allJobs:                         [],
+      allNodes:                        [],
       WORKLOAD_METRICS_DETAIL_URL,
       WORKLOAD_METRICS_SUMMARY_URL,
-      showMetrics:       false,
+      POD_PROJECT_METRICS_DETAIL_URL:  '',
+      POD_PROJECT_METRICS_SUMMARY_URL: '',
+      showMetrics:                     false,
+      showProjectMetrics:              false,
     };
   },
 
@@ -421,6 +436,22 @@ export default {
           />
         </template>
       </Tab>
+      <Tab
+        v-if="showProjectMetrics"
+        :label="t('workload.container.titles.metrics')"
+        name="workload-metrics"
+        :weight="3"
+      >
+        <template #default="props">
+          <DashboardMetrics
+            v-if="props.active"
+            :detail-url="WORKLOAD_PROJECT_METRICS_DETAIL_URL"
+            :summary-url="WORKLOAD_PROJECT_METRICS_SUMMARY_URL"
+            :vars="graphVars"
+            graph-height="550px"
+          />
+        </template>
+      </Tab>
       <Tab
         v-if="v1MonitoringUrl"
         name="v1Metrics"

package/edit/__tests__/ui.cattle.io.navlink.test.ts

@@ -0,0 +1,110 @@
+/* eslint-disable jest/no-hooks */
+import { mount } from '@vue/test-utils';
+import Navlink from '@shell/edit/ui.cattle.io.navlink.vue';
+import { _CREATE } from '@shell/config/query-params';
+import CruResource from '@shell/components/CruResource';
+
+describe('view: ui.cattle.io.navlink should', () => {
+  const name = 'test';
+  const url = 'http://test.com';
+  let wrapper: any;
+
+  const requiredSetup = () => ({
+    // Remove all these mocks after migration to Vue 2.7/3 due mixin logic
+    mocks: {
+      $store: {
+        getters: {
+          currentStore:              () => 'current_store',
+          'current_store/schemaFor': jest.fn(),
+          'current_store/all':       jest.fn(),
+          'i18n/t':                  (val) => val,
+          'i18n/exists':             jest.fn(),
+        }
+      },
+      $route:  { query: { AS: '' } },
+      $router: { applyQuery: jest.fn() },
+    },
+    propsData: {
+      metadata:   { namespace: 'test' },
+      spec:       { template: {} },
+      targetInfo: { mode: 'all' },
+      value:      {},
+      mode:       _CREATE,
+    },
+
+  });
+
+  beforeEach(() => {
+    wrapper = mount(Navlink, { ...requiredSetup() });
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('have "Create" button disabled before fields are filled in', () => {
+    const saveButton = wrapper.find('[data-testid="form-save"]').element as HTMLInputElement;
+
+    expect(saveButton.disabled).toBe(true);
+  });
+  it('have "Create" button disabled when Link type is URL and only name is filled in', async() => {
+    const saveButton = wrapper.find('[data-testid="form-save"]').element as HTMLInputElement;
+    const nameField = wrapper.find('[data-testid="Navlink-name-field"]').find('input');
+
+    nameField.setValue(name);
+
+    await wrapper.vm.$nextTick();
+
+    expect(saveButton.disabled).toBe(true);
+  });
+  it('have "Create" button enabled when Link type is URL and all required fields are filled in', async() => {
+    const saveButton = wrapper.find('[data-testid="form-save"]').element as HTMLInputElement;
+    const nameField = wrapper.find('[data-testid="Navlink-name-field"]').find('input');
+    const urlField = wrapper.find('[data-testid="Navlink-url-field"]');
+
+    nameField.setValue(name);
+    urlField.setValue(url);
+
+    await wrapper.vm.$nextTick();
+
+    expect(saveButton.disabled).toBe(false);
+  });
+
+  it('have "Create" button disabled when Link type is Service and and only name is filled in', async() => {
+    const saveButton = wrapper.find('[data-testid="form-save"]').element as HTMLInputElement;
+    const nameField = wrapper.find('[data-testid="Navlink-name-field"]').find('input');
+    const rg = wrapper.find('[data-testid="Navlink-link-radiogroup"]');
+
+    const serviceBttn = rg.findAll('.radio-label').at(1);
+
+    nameField.setValue(name);
+    serviceBttn.trigger('click');
+    await wrapper.vm.$nextTick();
+
+    expect(saveButton.disabled).toBe(true);
+  });
+
+  it('have "Create" button enabled when Link type is Service and and all required fields are filled in', async() => {
+    const nameField = wrapper.find('[data-testid="Navlink-name-field"]').find('input');
+    const rg = wrapper.find('[data-testid="Navlink-link-radiogroup"]');
+
+    const serviceBttn = rg.findAll('.radio-label').at(1);
+
+    nameField.setValue(name);
+    serviceBttn.trigger('click');
+    await wrapper.vm.$nextTick();
+
+    const schemeField = wrapper.find('[data-testid="Navlink-scheme-field"]');
+    const serviceField = wrapper.find('[data-testid="Navlink-currentService-field"]');
+
+    schemeField.find('button').trigger('click');
+    await wrapper.trigger('keydown.down');
+    await wrapper.trigger('keydown.enter');
+
+    serviceField.find('button').trigger('click');
+    await wrapper.trigger('keydown.down');
+    await wrapper.trigger('keydown.enter');
+
+    expect(CruResource.computed.canSave()).toBe(true);
+  });
+});

package/edit/fleet.cattle.io.clustergroup.vue

@@ -11,6 +11,7 @@ import { set } from '@shell/utils/object';
 import { FLEET } from '@shell/config/types';
 import { convert, matching, simplify } from '@shell/utils/selector';
 import throttle from 'lodash/throttle';
+import { allHash } from '@shell/utils/promise';
 
 export default {
   name: 'CruClusterGroup',
@@ -27,10 +28,20 @@ export default {
   mixins: [CreateEditView],
 
   async fetch() {
-    if (this.$store.getters['management/schemaFor']( FLEET.CLUSTER )) {
-      this.allClusters = await this.$store.getters['management/all'](FLEET.CLUSTER);
+    const _hash = {};
+
+    if (this.$store.getters['management/schemaFor'](FLEET.CLUSTER)) {
+      _hash.allClusters = await this.$store.dispatch('management/findAll', { type: FLEET.CLUSTER });
+    }
+
+    if (this.$store.getters['management/schemaFor'](FLEET.WORKSPACE)) {
+      _hash.allWorkspaces = this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE });
     }
-    this.allWorkspaces = await this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE });
+
+    const hash = await allHash(_hash);
+
+    this.allClusters = hash.allClusters || [];
+    this.allWorkspaces = hash.allWorkspaces || [];
 
     if ( !this.value.spec?.selector ) {
       this.value.spec = this.value.spec || {};

package/edit/persistentvolume/__tests__/persistentvolume.test.ts

@@ -0,0 +1,82 @@
+import { mount } from '@vue/test-utils';
+import PersistentVolume from '@shell/edit/persistentvolume/index';
+import { ExtendedVue, Vue } from 'vue/types/vue';
+
+describe('view: PersistentVolume', () => {
+  it('should list enabled PV storage option if supported', () => {
+    const plugin = {
+      labelKey: 'persistentVolume.csi.label', supported: true, value: 'csi'
+    };
+    const resource = 'PersistentVolume';
+    const wrapper = mount(PersistentVolume as ExtendedVue<Vue, {}, {}, {}, PersistentVolume>, {
+      propsData: { value: { spec: { } } },
+      mocks:     {
+        $store: {
+          dispatch: () => jest.fn(),
+          getters:  {
+            'i18n/t':            jest.fn(),
+            'i18n/exists':       jest.fn(),
+            currentStore:        () => 'cluster',
+            'features/get':      () => jest.fn(),
+            'prefs/get':         () => resource,
+            'cluster/schemaFor': () => {},
+            'cluster/all':       () => [{}],
+          }
+        },
+        $fetchState: {
+          pending: false, error: true, timestamp: Date.now()
+        },
+        $route: {
+          params: { resource },
+          query:  { AS: '' },
+          hash:   '',
+        },
+        $router: {
+          currentRoute: {},
+          replace:      jest.fn(),
+        }
+      },
+      stubs: { LabeledSelect: true }
+    });
+
+    const select = wrapper.find('[data-testid="persistent-volume-plugin-select"]');
+
+    expect((select.vm as unknown as any).options).toStrictEqual(expect.arrayContaining([plugin]));
+  });
+
+  it('should select current plugin', () => {
+    const plugin = 'csi';
+    const resource = 'PersistentVolume';
+    const wrapper = mount(PersistentVolume as ExtendedVue<Vue, {}, {}, {}, PersistentVolume>, {
+      propsData: { value: { spec: { [plugin]: { value: plugin } } } },
+      mocks:     {
+        $store: {
+          dispatch: () => jest.fn(),
+          getters:  {
+            'i18n/t':            jest.fn(),
+            'i18n/exists':       jest.fn(),
+            currentStore:        () => 'cluster',
+            'features/get':      () => jest.fn(),
+            'prefs/get':         () => resource,
+            'cluster/schemaFor': () => {},
+            'cluster/all':       () => [{}],
+          }
+        },
+        $fetchState: {
+          pending: false, error: true, timestamp: Date.now()
+        },
+        $route: {
+          params: { resource },
+          query:  { AS: '' },
+          hash:   '',
+        },
+        $router: {
+          currentRoute: {},
+          replace:      jest.fn(),
+        }
+      }
+    });
+
+    expect(wrapper.vm.plugin).toBe(plugin);
+  });
+});

package/edit/persistentvolume/index.vue

@@ -13,9 +13,9 @@ import NodeAffinity from '@shell/components/form/NodeAffinity';
 import { Checkbox } from '@components/Form/Checkbox';
 import uniq from 'lodash/uniq';
 import UnitInput from '@shell/components/form/UnitInput';
+import { VOLUME_PLUGINS, LONGHORN_PLUGIN } from '@shell/config/persistentVolume';
 import { NODE, PVC, STORAGE_CLASS } from '@shell/config/types';
 import Loading from '@shell/components/Loading';
-import { LONGHORN_PLUGIN, VOLUME_PLUGINS } from '@shell/models/persistentvolume';
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import { clone } from '@shell/utils/object';
 import InfoBox from '@shell/components/InfoBox';
@@ -258,6 +258,7 @@ export default {
           :label="t('persistentVolume.plugin.label')"
           :localized-label="true"
           option-label="labelKey"
+          data-testid="persistent-volume-plugin-select"
           :options="plugins"
           :mode="modeOverride"
           :required="true"

package/edit/persistentvolume/plugins/csi.vue

@@ -70,7 +70,9 @@ export default {
   },
   methods: {
     selectDriver(e) {
-      set(this.value, 'spec.csi.driver', e.value ? e.value : e.label);
+      const name = e.value || e.label || e;
+
+      set(this.value, 'spec.csi.driver', name);
     }
   }
 };

package/edit/persistentvolume/plugins/longhorn.vue

@@ -3,7 +3,7 @@ import KeyValue from '@shell/components/form/KeyValue';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { RadioGroup } from '@components/Form/Radio';
 import { _CREATE } from '@shell/config/query-params';
-import { LONGHORN_DRIVER } from '@shell/models/persistentvolume';
+import { LONGHORN_DRIVER } from '@shell/config/types';
 
 export default {
   components: {
@@ -54,20 +54,20 @@ export default {
   <div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model="value.spec.csi.fsType"
-          :mode="mode"
-          :label="t('persistentVolume.shared.filesystemType.label')"
-          :placeholder="t('persistentVolume.shared.filesystemType.placeholder')"
+        <LabeledInput
+          v-model="value.spec.csi.fsType"
+          :mode="mode"
+          :label="t('persistentVolume.shared.filesystemType.label')"
+          :placeholder="t('persistentVolume.shared.filesystemType.placeholder')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model="value.spec.csi.volumeHandle"
-          :mode="mode"
-          :label="t('persistentVolume.longhorn.volumeHandle.label')"
-          :placeholder="t('persistentVolume.longhorn.volumeHandle.placeholder')"
-          :required="true"
+        <LabeledInput
+          v-model="value.spec.csi.volumeHandle"
+          :mode="mode"
+          :label="t('persistentVolume.longhorn.volumeHandle.label')"
+          :placeholder="t('persistentVolume.longhorn.volumeHandle.placeholder')"
+          :required="true"
         />
       </div>
     </div>

package/edit/provisioning.cattle.io.cluster/RegistryConfigs.vue

@@ -43,14 +43,28 @@ export default {
     const configMap = this.value.spec.rkeConfig?.registries?.configs || {};
     const entries = [];
 
+    const defaultAddValue = {
+      hostname:             '',
+      authConfigSecretName: null,
+      caBundle:             '',
+      insecureSkipVerify:   false,
+      tlsSecretName:        null,
+    };
+
     for ( const hostname in configMap ) {
+      if (configMap[hostname]) {
+        configMap[hostname].insecureSkipVerify = configMap[hostname].insecureSkipVerify ?? defaultAddValue.insecureSkipVerify;
+        configMap[hostname].authConfigSecretName = configMap[hostname].authConfigSecretName ?? defaultAddValue.authConfigSecretName;
+        configMap[hostname].caBundle = configMap[hostname].caBundle ?? defaultAddValue.caBundle;
+        configMap[hostname].tlsSecretName = configMap[hostname].tlsSecretName ?? defaultAddValue.tlsSecretName;
+      }
       entries.push({
         hostname,
         ...configMap[hostname],
       });
     }
 
-    return { entries };
+    return { entries, defaultAddValue };
   },
 
   computed: {
@@ -59,16 +73,6 @@ export default {
         return TYPES.TLS;
       },
     },
-
-    defaultAddValue() {
-      return {
-        hostname:             '',
-        authConfigSecretName: null,
-        caBundle:             '',
-        insecureSkipVerify:   false,
-        tlsSecretName:        null,
-      };
-    },
   },
 
   mounted() {

package/edit/provisioning.cattle.io.cluster/index.vue

@@ -17,7 +17,7 @@ import { CATALOG } from '@shell/config/labels-annotations';
 import { CAPI, MANAGEMENT, DEFAULT_WORKSPACE } from '@shell/config/types';
 import { mapFeature, RKE2 as RKE2_FEATURE } from '@shell/store/features';
 import { allHash } from '@shell/utils/promise';
-import { BLANK_CLUSTER } from '@shell/store';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { ELEMENTAL_PRODUCT_NAME, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
 import Rke2Config from './rke2';
 import Import from './import';

package/edit/provisioning.cattle.io.cluster/rke2.vue

@@ -1645,7 +1645,11 @@ export default {
           const harvesterKubeconfigSecret = await this.createKubeconfigSecret(kubeconfig);
 
           set(this.agentConfig, 'cloud-provider-config', `secret://fleet-default:${ harvesterKubeconfigSecret?.metadata?.name }`);
-          set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.clusterName`, this.value.metadata.name);
+
+          if (this.isCreate) {
+            set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.global.cattle.clusterName`, this.value.metadata.name);
+          }
+
           set(this.chartValues, `${ HARVESTER_CLOUD_PROVIDER }.cloudConfigPath`, '/var/lib/rancher/rke2/etc/config-files/cloud-provider-config');
         }
       } catch (err) {

package/edit/storage.k8s.io.storageclass/index.vue

@@ -11,8 +11,7 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import { PROVISIONER_OPTIONS } from '@shell/models/storage.k8s.io.storageclass';
 import { mapFeature, UNSUPPORTED_STORAGE_DRIVERS } from '@shell/store/features';
-import { CSI_DRIVER } from '@shell/config/types';
-import { LONGHORN_DRIVER } from '@shell/models/persistentvolume';
+import { CSI_DRIVER, LONGHORN_DRIVER } from '@shell/config/types';
 
 export default {
   name: 'StorageClass',