@rancher/shell 0.3.16 → 0.3.18

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

@@ -6,10 +6,12 @@ import merge from 'lodash/merge';
 import { mapGetters } from 'vuex';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import FormValidation from '@shell/mixins/form-validation';
+import { normalizeName } from '@shell/utils/kube';
 
 import {
   CAPI,
   MANAGEMENT,
+  NAMESPACE,
   NORMAN,
   SCHEMA,
   DEFAULT_WORKSPACE,
@@ -42,7 +44,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import Loading from '@shell/components/Loading';
 import MatchExpressions from '@shell/components/form/MatchExpressions';
-import NameNsDescription, { normalizeName } from '@shell/components/form/NameNsDescription';
+import NameNsDescription from '@shell/components/form/NameNsDescription';
 import { RadioGroup } from '@components/Form/Radio';
 import Tab from '@shell/components/Tabbed/Tab';
 import Tabbed from '@shell/components/Tabbed';
@@ -69,7 +71,9 @@ import S3Config from './S3Config';
 import SelectCredential from './SelectCredential';
 import AdvancedSection from '@shell/components/AdvancedSection.vue';
 import { ELEMENTAL_SCHEMA_IDS, KIND, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
-import AgentConfiguration, { cleanAgentConfiguration } from './AgentConfiguration';
+import AgentConfiguration from './AgentConfiguration';
+import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
+import { ExtensionPoint, TabLocation } from '@shell/core/types';
 
 const PUBLIC = 'public';
 const PRIVATE = 'private';
@@ -154,122 +158,9 @@ export default {
   },
 
   async fetch() {
-    // Check presence of PSP in RKE2, which is where we show the templates
-    this.psps = await this.checkPsps();
-
-    if ( !this.rke2Versions ) {
-      const hash = {
-        rke2Versions: this.$store.dispatch('management/request', { url: '/v1-rke2-release/releases' }),
-        k3sVersions:  this.$store.dispatch('management/request', { url: '/v1-k3s-release/releases' }),
-      };
-
-      if ( this.$store.getters['management/canList'](MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE) ) {
-        hash.allPSPs = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE });
-      }
-
-      if (this.$store.getters['management/canList'](MANAGEMENT.PSA)) {
-        hash.allPSAs = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PSA });
-      }
-
-      // Get the latest versions from the global settings if possible
-      const globalSettings = await this.$store.getters['management/all'](MANAGEMENT.SETTING) || [];
-      const defaultRke2Setting = globalSettings.find((setting) => setting.id === 'rke2-default-version') || {};
-      const defaultK3sSetting = globalSettings.find((setting) => setting.id === 'k3s-default-version') || {};
-
-      let defaultRke2 = defaultRke2Setting?.value || defaultRke2Setting?.default;
-      let defaultK3s = defaultK3sSetting?.value || defaultK3sSetting?.default;
-
-      // RKE2: Use the channel if we can not get the version from the settings
-      if (!defaultRke2) {
-        hash.rke2Channels = this.$store.dispatch('management/request', { url: '/v1-rke2-release/channels' });
-      }
-
-      // K3S: Use the channel if we can not get the version from the settings
-      if (!defaultK3s) {
-        hash.k3sChannels = this.$store.dispatch('management/request', { url: '/v1-k3s-release/channels' });
-      }
-
-      const res = await allHash(hash);
-
-      this.allPSPs = res.allPSPs || [];
-      this.allPSAs = res.allPSAs || [];
-      this.rke2Versions = res.rke2Versions.data || [];
-      this.k3sVersions = res.k3sVersions.data || [];
-
-      if (!defaultRke2) {
-        const rke2Channels = res.rke2Channels.data || [];
-
-        defaultRke2 = rke2Channels.find((x) => x.id === 'default')?.latest;
-      }
-
-      if (!defaultK3s) {
-        const k3sChannels = res.k3sChannels.data || [];
-
-        defaultK3s = k3sChannels.find((x) => x.id === 'default')?.latest;
-      }
-
-      if ( !this.rke2Versions.length && !this.k3sVersions.length ) {
-        throw new Error('No version info found in KDM');
-      }
-
-      // Store default versions
-      this.defaultRke2 = defaultRke2;
-      this.defaultK3s = defaultK3s;
-    }
-
-    if ( !this.value.spec ) {
-      set(this.value, 'spec', {});
-    }
-
-    if ( !this.value.spec.machineSelectorConfig ) {
-      set(this.value.spec, 'machineSelectorConfig', []);
-    }
-
-    if ( !this.value.spec.machineSelectorConfig.find((x) => !x.machineLabelSelector) ) {
-      this.value.spec.machineSelectorConfig.unshift({ config: {} });
-    }
-
-    if ( this.value.spec.cloudCredentialSecretName ) {
-      await this.$store.dispatch('rancher/findAll', { type: NORMAN.CLOUD_CREDENTIAL });
-      this.credentialId = `${ this.value.spec.cloudCredentialSecretName }`;
-    }
-
-    if ( !this.value.spec.kubernetesVersion ) {
-      set(this.value.spec, 'kubernetesVersion', this.defaultVersion);
-    }
-
-    if ( this.rkeConfig.etcd?.s3?.bucket ) {
-      this.s3Backup = true;
-    }
-
-    if ( !this.rkeConfig.etcd ) {
-      set(this.rkeConfig, 'etcd', {
-        disableSnapshots:     false,
-        s3:                   null,
-        snapshotRetention:    5,
-        snapshotScheduleCron: '0 */5 * * *',
-      });
-    } else if (typeof this.rkeConfig.etcd.disableSnapshots === 'undefined') {
-      const disableSnapshots = !this.rkeConfig.etcd.snapshotRetention && !this.rkeConfig.etcd.snapshotScheduleCron;
-
-      set(this.rkeConfig.etcd, 'disableSnapshots', disableSnapshots);
-    }
-
-    if ( !this.machinePools ) {
-      await this.initMachinePools(this.value.spec.rkeConfig.machinePools);
-      if ( this.mode === _CREATE && !this.machinePools.length ) {
-        await this.addMachinePool();
-      }
-    }
-
-    if ( this.value.spec.defaultPodSecurityPolicyTemplateName === undefined ) {
-      set(this.value.spec, 'defaultPodSecurityPolicyTemplateName', '');
-    }
-
-    if ( this.value.spec.defaultPodSecurityAdmissionConfigurationTemplateName === undefined ) {
-      set(this.value.spec, 'defaultPodSecurityAdmissionConfigurationTemplateName', '');
-    }
-
+    this.psps = await this.getPsps();
+    await this.fetchRke2Versions();
+    await this.initSpecs();
     await this.initAddons();
     await this.initRegistry();
 
@@ -279,17 +170,7 @@ export default {
       this.userChartValues[key] = value;
     });
 
-    // Ensure we have empty models for the two agent configurations
-
-    // Cluster Agent Configuration
-    if ( !this.value.spec[CLUSTER_AGENT_CUSTOMIZATION]) {
-      set(this.value.spec, CLUSTER_AGENT_CUSTOMIZATION, {});
-    }
-
-    // Fleet Agent Configuration
-    if ( !this.value.spec[FLEET_AGENT_CUSTOMIZATION] ) {
-      set(this.value.spec, FLEET_AGENT_CUSTOMIZATION, {});
-    }
+    this.setAgentConfiguration();
   },
 
   data() {
@@ -362,7 +243,9 @@ export default {
       truncateHostnames:     truncateLimit === NETBIOS_TRUNCATION_LENGTH,
       truncateLimit,
       busy:                  false,
-      machinePoolValidation: {} // map of validation states for each machine pool
+      machinePoolValidation: {}, // map of validation states for each machine pool
+      allNamespaces:         [],
+      extensionTabs:         getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
     };
   },
 
@@ -370,6 +253,7 @@ export default {
     ...mapGetters({ allCharts: 'catalog/charts' }),
     ...mapGetters(['currentCluster']),
     ...mapGetters({ features: 'features/get' }),
+    ...mapGetters(['namespaces']),
 
     PUBLIC:   () => PUBLIC,
     PRIVATE:  () => PRIVATE,
@@ -734,6 +618,33 @@ export default {
       return (this.machinePools || []).filter((x) => !x.remove);
     },
 
+    /**
+     * Extension provider where being provisioned by an extension
+     */
+    extensionProvider() {
+      const extClass = this.$plugin.getDynamic('provisioner', this.provider);
+
+      if (extClass) {
+        return new extClass({
+          dispatch: this.$store.dispatch,
+          getters:  this.$store.getters,
+          axios:    this.$store.$axios,
+          $plugin:  this.$store.app.$plugin,
+          $t:       this.t,
+          isCreate: this.isCreate
+        });
+      }
+
+      return undefined;
+    },
+
+    /**
+     * Is a namespace needed? Only supported for providers from extensions, otherwise default is no
+     */
+    needsNamespace() {
+      return this.extensionProvider ? !!this.extensionProvider.namespaced : false;
+    },
+
     machineConfigSchema() {
       let schema;
 
@@ -745,6 +656,19 @@ export default {
         schema = `${ CAPI.MACHINE_CONFIG_GROUP }.${ this.provider }config`;
       }
 
+      // If this is an extension provider then the extension can provide the schema
+      const extensionSchema = this.extensionProvider?.machineConfigSchema;
+
+      if (extensionSchema) {
+        // machineConfigSchema can either be the schema name (string) or the schema itself (object)
+        if (typeof extensionSchema === 'object') {
+          return extensionSchema;
+        }
+
+        // Name of schema to use
+        schema = extensionSchema;
+      }
+
       return this.$store.getters['management/schemaFor'](schema);
     },
 
@@ -1033,7 +957,7 @@ export default {
     validationPassed() {
       const validRequiredPools = this.hasMachinePools ? this.hasRequiredNodes() : true;
 
-      let base = (this.provider === 'custom' || this.isElementalCluster || !!this.credentialId);
+      let base = (this.provider === 'custom' || this.isElementalCluster || !!this.credentialId || !this.needCredential);
 
       // and in all of the validation statuses for each machine pool
       Object.values(this.machinePoolValidation).forEach((v) => (base = base && v));
@@ -1121,19 +1045,198 @@ export default {
   created() {
     this.registerBeforeHook(this.saveMachinePools, 'save-machine-pools');
     this.registerBeforeHook(this.setRegistryConfig, 'set-registry-config');
-    this.registerBeforeHook(this.agentConfigurationCleanup, 'cleanup-agent-config');
     this.registerAfterHook(this.cleanupMachinePools, 'cleanup-machine-pools');
     this.registerAfterHook(this.saveRoleBindings, 'save-role-bindings');
+
+    // Register any hooks for this extension provider
+    if (this.extensionProvider?.registerSaveHooks) {
+      this.extensionProvider.registerSaveHooks(this.registerBeforeHook, this.registerAfterHook, this.value);
+    }
   },
 
   methods: {
     nlToBr,
     set,
 
+    /**
+     * Initialize all the cluster specs
+     */
+    async initSpecs() {
+      if ( !this.value.spec ) {
+        set(this.value, 'spec', {});
+      }
+
+      if ( !this.value.spec.machineSelectorConfig ) {
+        set(this.value.spec, 'machineSelectorConfig', []);
+      }
+
+      if ( !this.value.spec.machineSelectorConfig.find((x) => !x.machineLabelSelector) ) {
+        this.value.spec.machineSelectorConfig.unshift({ config: {} });
+      }
+
+      if ( this.value.spec.cloudCredentialSecretName ) {
+        await this.$store.dispatch('rancher/findAll', { type: NORMAN.CLOUD_CREDENTIAL });
+        this.credentialId = `${ this.value.spec.cloudCredentialSecretName }`;
+      }
+
+      if ( !this.value.spec.kubernetesVersion ) {
+        set(this.value.spec, 'kubernetesVersion', this.defaultVersion);
+      }
+
+      if ( this.rkeConfig.etcd?.s3?.bucket ) {
+        this.s3Backup = true;
+      }
+
+      if ( !this.rkeConfig.etcd ) {
+        set(this.rkeConfig, 'etcd', {
+          disableSnapshots:     false,
+          s3:                   null,
+          snapshotRetention:    5,
+          snapshotScheduleCron: '0 */5 * * *',
+        });
+      } else if (typeof this.rkeConfig.etcd.disableSnapshots === 'undefined') {
+        const disableSnapshots = !this.rkeConfig.etcd.snapshotRetention && !this.rkeConfig.etcd.snapshotScheduleCron;
+
+        set(this.rkeConfig.etcd, 'disableSnapshots', disableSnapshots);
+      }
+
+      // Namespaces if required - this is mainly for custom provisioners via extensions that want
+      // to allow creating their resources in a different namespace
+      if (this.needsNamespace) {
+        this.allNamespaces = await this.$store.dispatch('management/findAll', { type: NAMESPACE });
+      }
+
+      if ( !this.machinePools ) {
+        await this.initMachinePools(this.value.spec.rkeConfig.machinePools);
+        if ( this.mode === _CREATE && !this.machinePools.length ) {
+          await this.addMachinePool();
+        }
+      }
+
+      if ( this.value.spec.defaultPodSecurityPolicyTemplateName === undefined ) {
+        set(this.value.spec, 'defaultPodSecurityPolicyTemplateName', '');
+      }
+
+      if ( this.value.spec.defaultPodSecurityAdmissionConfigurationTemplateName === undefined ) {
+        set(this.value.spec, 'defaultPodSecurityAdmissionConfigurationTemplateName', '');
+      }
+    },
+
+    /**
+     * Fetch RKE versions and their configurations to be mapped to the form
+     */
+    async fetchRke2Versions() {
+      if ( !this.rke2Versions ) {
+        const hash = {
+          rke2Versions: this.$store.dispatch('management/request', { url: '/v1-rke2-release/releases' }),
+          k3sVersions:  this.$store.dispatch('management/request', { url: '/v1-k3s-release/releases' }),
+        };
+
+        if ( this.$store.getters['management/canList'](MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE) ) {
+          hash.allPSPs = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE });
+        }
+
+        if (this.$store.getters['management/canList'](MANAGEMENT.PSA)) {
+          hash.allPSAs = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PSA });
+        }
+
+        // Get the latest versions from the global settings if possible
+        const globalSettings = await this.$store.getters['management/all'](MANAGEMENT.SETTING) || [];
+        const defaultRke2Setting = globalSettings.find((setting) => setting.id === 'rke2-default-version') || {};
+        const defaultK3sSetting = globalSettings.find((setting) => setting.id === 'k3s-default-version') || {};
+
+        let defaultRke2 = defaultRke2Setting?.value || defaultRke2Setting?.default;
+        let defaultK3s = defaultK3sSetting?.value || defaultK3sSetting?.default;
+
+        // RKE2: Use the channel if we can not get the version from the settings
+        if (!defaultRke2) {
+          hash.rke2Channels = this.$store.dispatch('management/request', { url: '/v1-rke2-release/channels' });
+        }
+
+        // K3S: Use the channel if we can not get the version from the settings
+        if (!defaultK3s) {
+          hash.k3sChannels = this.$store.dispatch('management/request', { url: '/v1-k3s-release/channels' });
+        }
+
+        const res = await allHash(hash);
+
+        this.allPSPs = res.allPSPs || [];
+        this.allPSAs = res.allPSAs || [];
+        this.rke2Versions = res.rke2Versions.data || [];
+        this.k3sVersions = res.k3sVersions.data || [];
+
+        if (!defaultRke2) {
+          const rke2Channels = res.rke2Channels.data || [];
+
+          defaultRke2 = rke2Channels.find((x) => x.id === 'default')?.latest;
+        }
+
+        if (!defaultK3s) {
+          const k3sChannels = res.k3sChannels.data || [];
+
+          defaultK3s = k3sChannels.find((x) => x.id === 'default')?.latest;
+        }
+
+        if ( !this.rke2Versions.length && !this.k3sVersions.length ) {
+          throw new Error('No version info found in KDM');
+        }
+
+        // Store default versions
+        this.defaultRke2 = defaultRke2;
+        this.defaultK3s = defaultK3s;
+      }
+    },
+
+    cleanAgentConfiguration(model, key) {
+      if (!model || !model[key]) {
+        return;
+      }
+
+      const v = model[key];
+
+      if (Array.isArray(v) && v.length === 0) {
+        delete model[key];
+      } else if (v && typeof v === 'object') {
+        Object.keys(v).forEach((k) => {
+          // delete these auxiliary props used in podAffinity and nodeAffinity that shouldn't be sent to the server
+          if (k === '_namespaceOption' || k === '_namespaces' || k === '_anti' || k === '_id') {
+            delete v[k];
+          }
+
+          // prevent cleanup of "namespaceSelector" when an empty object because it represents all namespaces in pod/node affinity
+          // https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#podaffinityterm-v1-core
+          if (k !== 'namespaceSelector') {
+            this.cleanAgentConfiguration(v, k);
+          }
+        });
+
+        if (Object.keys(v).length === 0) {
+          delete model[key];
+        }
+      }
+    },
+
+    /**
+     * Clean agent configuration objects, so we only send values when the user has configured something
+     */
     agentConfigurationCleanup() {
-      // Clean agent configuration objects, so we only send values when the user has configured something
-      cleanAgentConfiguration(this.value.spec, CLUSTER_AGENT_CUSTOMIZATION);
-      cleanAgentConfiguration(this.value.spec, FLEET_AGENT_CUSTOMIZATION);
+      this.cleanAgentConfiguration(this.value.spec, CLUSTER_AGENT_CUSTOMIZATION);
+      this.cleanAgentConfiguration(this.value.spec, FLEET_AGENT_CUSTOMIZATION);
+    },
+
+    /**
+     * Ensure we have empty models for the two agent configurations
+     */
+    setAgentConfiguration() {
+      // Cluster Agent Configuration
+      if ( !this.value.spec[CLUSTER_AGENT_CUSTOMIZATION]) {
+        set(this.value.spec, CLUSTER_AGENT_CUSTOMIZATION, {});
+      }
+
+      // Fleet Agent Configuration
+      if ( !this.value.spec[FLEET_AGENT_CUSTOMIZATION] ) {
+        set(this.value.spec, FLEET_AGENT_CUSTOMIZATION, {});
+      }
     },
 
     /**
@@ -1213,18 +1316,27 @@ export default {
     },
 
     async addMachinePool(idx) {
+      // this.machineConfigSchema is the schema for the Machine Pool's machine configuration for the given provider
       if ( !this.machineConfigSchema ) {
         return;
       }
 
       const numCurrentPools = this.machinePools.length || 0;
 
-      const config = await this.$store.dispatch('management/createPopulated', {
-        type:     this.machineConfigSchema.id,
-        metadata: { namespace: DEFAULT_WORKSPACE }
-      });
+      let config;
+
+      if (this.extensionProvider?.createMachinePoolMachineConfig) {
+        config = await this.extensionProvider.createMachinePoolMachineConfig(idx, this.machinePools, this.value);
+      } else {
+        // Default - use the schema
+        config = await this.$store.dispatch('management/createPopulated', {
+          type:     this.machineConfigSchema.id,
+          metadata: { namespace: DEFAULT_WORKSPACE }
+        });
 
-      config.applyDefaults(idx, this.machinePools);
+        // If there is no specific model, the applyDefaults does nothing by default
+        config.applyDefaults(idx, this.machinePools);
+      }
 
       const name = `pool${ ++this.lastIdx }`;
       const pool = {
@@ -1233,6 +1345,7 @@ export default {
         remove: false,
         create: true,
         update: false,
+        uid:    name,
         pool:   {
           name,
           etcdRole:             numCurrentPools === 0,
@@ -1243,7 +1356,7 @@ export default {
           quantity:             1,
           unhealthyNodeTimeout: '0m',
           machineConfigRef:     {
-            kind: this.machineConfigSchema.attributes.kind,
+            kind: this.machineConfigSchema.attributes?.kind,
             name: null,
           },
         },
@@ -1301,6 +1414,11 @@ export default {
     async saveMachinePools() {
       const finalPools = [];
 
+      // If the extension provider wants to do this, let them
+      if (this.extensionProvider?.saveMachinePoolConfigs) {
+        return await this.extensionProvider.saveMachinePoolConfigs(this.machinePools, this.value);
+      }
+
       for ( const entry of this.machinePools ) {
         if ( entry.remove ) {
           continue;
@@ -1420,7 +1538,24 @@ export default {
     async saveOverride(btnCb) {
       this.$set(this, 'busy', true);
 
-      return await this._doSaveOverride((done) => {
+      // If the provider is from an extension, let it do the provision step
+      if (this.extensionProvider?.provision) {
+        const errors = await this.extensionProvider?.provision(this.value, this.machinePools);
+        const okay = (errors || []).length === 0;
+
+        this.errors = errors;
+        this.$set(this, 'busy', false);
+
+        btnCb(okay);
+
+        if (okay) {
+          // If saved okay, go to the done route
+          return this.done();
+        }
+      }
+
+      // Default save
+      return this._doSaveOverride((done) => {
         this.$set(this, 'busy', false);
 
         return btnCb(done);
@@ -1428,6 +1563,9 @@ export default {
     },
 
     async _doSaveOverride(btnCb) {
+      // We cannot use the hook, because it is triggered on YAML toggle without restore initialized data
+      this.agentConfigurationCleanup();
+
       if ( this.errors ) {
         clear(this.errors);
       }
@@ -1507,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) {
@@ -1523,10 +1665,10 @@ export default {
         delete this.value.spec.rkeConfig.machineGlobalConfig.profile;
       }
 
-      // store the current data for fleet and cluster agent so that we can re-apply it later if the save fails
-      // we also have a before hook (check created() hooks) where the cleanup of the data occurs
-      const clusterAgentDeploymentCustomization = JSON.parse(JSON.stringify(this.value.spec[CLUSTER_AGENT_CUSTOMIZATION]));
-      const fleetAgentDeploymentCustomization = JSON.parse(JSON.stringify(this.value.spec[FLEET_AGENT_CUSTOMIZATION]));
+      // Store the current data for fleet and cluster agent so that we can re-apply it later if the save fails
+      // The cleanup occurs before save with agentConfigurationCleanup()
+      const clusterAgentDeploymentCustomization = this.value.spec[CLUSTER_AGENT_CUSTOMIZATION] ? JSON.parse(JSON.stringify(this.value.spec[CLUSTER_AGENT_CUSTOMIZATION])) : null;
+      const fleetAgentDeploymentCustomization = this.value.spec[FLEET_AGENT_CUSTOMIZATION] ? JSON.parse(JSON.stringify(this.value.spec[FLEET_AGENT_CUSTOMIZATION])) : null;
 
       await this.save(btnCb);
 
@@ -1538,6 +1680,24 @@ export default {
         set(this.value.spec, FLEET_AGENT_CUSTOMIZATION, fleetAgentDeploymentCustomization);
       }
     },
+
+    async actuallySave(url) {
+      if (this.extensionProvider?.saveCluster) {
+        return await this.extensionProvider?.saveCluster(this.value, this.schema);
+      }
+
+      if ( this.isCreate ) {
+        url = url || this.schema.linkFor('collection');
+        const res = await this.value.save({ url });
+
+        if (res) {
+          Object.assign(this.value, res);
+        }
+      } else {
+        await this.value.save();
+      }
+    },
+
     // create a secret to reference the harvester cluster kubeconfig in rkeConfig
     async createKubeconfigSecret(kubeconfig = '') {
       const clusterName = this.value.metadata.name;
@@ -1982,10 +2142,9 @@ export default {
     },
 
     /**
-     * Check if current cluster has PSP enabled
-     * Consider exclusively RKE2 provisioned clusters in edit mode
+     * Get provisioned RKE2 cluster PSPs in edit mode
      */
-    async checkPsps() {
+    async getPsps() {
       // As server returns 500 we exclude all the possible cases
       if (
         this.mode !== _CREATE &&
@@ -2142,7 +2301,8 @@ export default {
         v-if="!isView"
         v-model="value"
         :mode="mode"
-        :namespaced="false"
+        :namespaced="needsNamespace"
+        :namespace-options="allNamespaces"
         name-label="cluster.name.label"
         name-placeholder="cluster.name.placeholder"
         description-label="cluster.description.label"
@@ -2916,7 +3076,9 @@ export default {
           label-key="cluster.agentConfig.tabs.cluster"
         >
           <AgentConfiguration
+            v-if="value.spec.clusterAgentDeploymentCustomization"
             v-model="value.spec.clusterAgentDeploymentCustomization"
+            data-testid="rke2-cluster-agent-config"
             type="cluster"
             :mode="mode"
           />
@@ -2928,7 +3090,9 @@ export default {
           label-key="cluster.agentConfig.tabs.fleet"
         >
           <AgentConfiguration
+            v-if="value.spec.fleetAgentDeploymentCustomization"
             v-model="value.spec.fleetAgentDeploymentCustomization"
+            data-testid="rke2-fleet-agent-config"
             type="fleet"
             :mode="mode"
           />
@@ -3026,6 +3190,26 @@ export default {
           v-model="value"
           :mode="mode"
         />
+
+        <!-- Extension tabs -->
+        <Tab
+          v-for="tab, i in extensionTabs"
+          :key="`${tab.name}${i}`"
+          :name="tab.name"
+          :label="tab.label"
+          :label-key="tab.labelKey"
+          :weight="tab.weight"
+          :tooltip="tab.tooltip"
+          :show-header="tab.showHeader"
+          :display-alert-icon="tab.displayAlertIcon"
+          :error="tab.error"
+          :badge="tab.badge"
+        >
+          <component
+            :is="tab.component"
+            :resource="value"
+          />
+        </Tab>
       </Tabbed>
     </div>
 

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',