@rancher/shell 0.3.27 → 0.3.28

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

@@ -40,12 +40,6 @@ export default {
       required: true,
     },
 
-    psps: {
-      type:     Object,
-      default:  null,
-      required: false
-    },
-
     credential: {
       type:     Object,
       default:  null,
@@ -61,15 +55,6 @@ export default {
       required: true
     },
 
-    cisPsaChangeBanner: {
-      type:     Boolean,
-      required: true
-    },
-    allPsps: {
-      type:     Array,
-      required: false,
-      default:  null
-    },
     allPsas: {
       type:     Array,
       required: true
@@ -80,10 +65,7 @@ export default {
       required: false,
       default:  null
     },
-    needsPsp: {
-      type:     Boolean,
-      required: true
-    },
+
     selectedVersion: {
       type:     Object,
       required: true
@@ -112,10 +94,6 @@ export default {
       type:     Boolean,
       required: true
     },
-    hasPsaTemplates: {
-      type:     Boolean,
-      required: true
-    },
     isK3s: {
       type:     Boolean,
       required: true
@@ -145,14 +123,6 @@ export default {
   computed: {
     ...mapGetters({ features: 'features/get' }),
 
-    /**
-     * Check presence of PSPs as template or CLI creation
-     */
-
-    hasPsps() {
-      return !!this.psps?.count;
-    },
-
     serverConfig() {
       return this.value.spec.rkeConfig.machineGlobalConfig;
     },
@@ -161,17 +131,6 @@ export default {
       return this.value.agentConfig;
     },
 
-    /**
-     * Define introduction of PSA and return need of PSA templates based on min k8s version
-     */
-    needsPSA() {
-      const release = this.value?.spec?.kubernetesVersion || '';
-      const version = release.match(/\d+/g);
-      const isRequiredVersion = version?.length ? +version[0] > 1 || +version[1] >= 23 : false;
-
-      return isRequiredVersion;
-    },
-
     profileOptions() {
       const out = (this.agentArgs?.profile?.options || []).map((x) => {
         return { label: x, value: x };
@@ -189,35 +148,9 @@ export default {
      * Allow to display override if PSA is needed and profile is set
      */
     hasCisOverride() {
-      return (this.serverConfig?.profile || this.agentConfig?.profile) && this.needsPSA &&
+      return (this.serverConfig?.profile || this.agentConfig?.profile) &&
         // Also check other cases on when to display the override
-        this.hasPsaTemplates && this.showCisProfile && this.isCisSupported;
-    },
-
-    pspOptions() {
-      if ( this.isK3s ) {
-        return null;
-      }
-      const out = [{
-        label: this.$store.getters['i18n/t']('cluster.rke2.defaultPodSecurityPolicyTemplateName.option'),
-        value: ''
-      }];
-
-      if ( this.allPsps ) {
-        for ( const pspt of this.allPsps ) {
-          out.push({
-            label: pspt.nameDisplay,
-            value: pspt.id,
-          });
-        }
-      }
-      const cur = this.value.spec.defaultPodSecurityPolicyTemplateName;
-
-      if ( cur && !out.find((x) => x.value === cur) ) {
-        out.unshift({ label: `${ cur } (Current)`, value: cur });
-      }
-
-      return out;
+        this.showCisProfile && this.isCisSupported;
     },
 
     /**
@@ -226,14 +159,14 @@ export default {
     isPsaDisabled() {
       const cisValue = this.agentConfig?.profile || this.serverConfig?.profile;
 
-      return !(!cisValue || this.cisOverride) && this.hasPsaTemplates && this.isCisSupported;
+      return !(!cisValue || this.cisOverride) && this.isCisSupported;
     },
 
     /**
      * Get the default label for the PSA template option
      */
     defaultPsaOptionLabel() {
-      const optionCase = !this.needsPsp && !this.isK3s ? 'default' : 'none';
+      const optionCase = !this.isK3s ? 'default' : 'none';
 
       return this.$store.getters['i18n/t'](`cluster.rke2.defaultPodSecurityAdmissionConfigurationTemplateName.option.${ optionCase }`);
     },
@@ -242,9 +175,6 @@ export default {
      * Convert PSA templates into options, sorting and flagging if any selected
      */
     psaOptions() {
-      if ( !this.needsPSA ) {
-        return [];
-      }
       const out = [{
         label: this.defaultPsaOptionLabel,
         value: ''
@@ -515,21 +445,6 @@ export default {
     <h3>
       {{ t('cluster.rke2.security.header') }}
     </h3>
-    <Banner
-      v-if="isEdit && !needsPsp && hasPsps"
-      color="warning"
-      :label="t('cluster.banner.invalidPsps')"
-    />
-    <Banner
-      v-else-if="isCreate && !needsPsp"
-      color="info"
-      :label="t('cluster.banner.removedPsp')"
-    />
-    <Banner
-      v-else-if="isCreate && hasPsps"
-      color="info"
-      :label="t('cluster.banner.deprecatedPsp')"
-    />
 
     <Banner
       v-if="showCisProfile && !isCisSupported && isEdit"
@@ -539,21 +454,6 @@ export default {
     </Banner>
 
     <div class="row mb-10">
-      <div
-        v-if="pspOptions && needsPsp"
-        class="col span-6"
-      >
-        <!-- PSP template selector -->
-        <LabeledSelect
-          v-model="value.spec.defaultPodSecurityPolicyTemplateName"
-          data-testid="rke2-custom-edit-psp"
-          :mode="mode"
-          :options="pspOptions"
-          :label="t('cluster.rke2.defaultPodSecurityPolicyTemplateName.label')"
-          @input="$emit('psp-changed', $event)"
-        />
-      </div>
-
       <div
         v-if="showCisProfile"
         class="col span-6"
@@ -592,14 +492,13 @@ export default {
         :label="t('cluster.rke2.banner.cisOverride')"
       />
       <Banner
-        v-if="cisPsaChangeBanner && !cisOverride"
+        v-if="!cisOverride"
         color="info"
         :label="t('cluster.rke2.banner.psaChange')"
       />
     </template>
 
     <div
-      v-if="needsPSA"
       class="row mb-10 mt-10"
     >
       <div class="col span-6">

package/edit/provisioning.cattle.io.cluster/__tests__/Basics.tests.ts

@@ -95,7 +95,6 @@ describe('component: Basics', () => {
         cisOverride:                 false,
         cisPsaChangeBanner:          true,
         allPsas:                     [],
-        needsPsp:                    false,
         selectedVersion:             k8s,
         versionOptions:              mockVersionOptions,
         isHarvesterDriver:           false,
@@ -149,7 +148,6 @@ describe('component: Basics', () => {
         cisOverride:                 false,
         cisPsaChangeBanner:          true,
         allPsas:                     [],
-        needsPsp:                    false,
         selectedVersion:             mockVersionOptions[0],
         versionOptions:              mockVersionOptions,
         isHarvesterDriver:           false,
@@ -200,7 +198,6 @@ describe('component: Basics', () => {
         userChartValues:    {},
         cisPsaChangeBanner: true,
         allPsas:            [],
-        needsPsp:           false,
         cisOverride:        override,
         selectedVersion:    mockVersionOptions[0],
         versionOptions:     [{

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

@@ -16,7 +16,6 @@ import {
   DEFAULT_WORKSPACE,
   SECRET,
   HCI,
-  PSPS,
 } from '@shell/config/types';
 import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 
@@ -31,7 +30,6 @@ import { sortBy } from '@shell/utils/sort';
 import { camelToTitle } from '@shell/utils/string';
 import { compare, sortable } from '@shell/utils/version';
 import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
-import * as VERSION from '@shell/utils/version';
 
 import ArrayList from '@shell/components/form/ArrayList';
 import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
@@ -155,7 +153,6 @@ export default {
   },
 
   async fetch() {
-    this.psps = await this.getPsps();
     await this.fetchRke2Versions();
     await this.initSpecs();
     await this.initAddons();
@@ -196,16 +193,11 @@ export default {
       set(this.value.spec, 'rkeConfig.machineSelectorConfig', [{ config: {} }]);
     }
 
-    // Store the initial PSP template name, so we can set it back if needed
-    const lastDefaultPodSecurityPolicyTemplateName = this.value.spec.defaultPodSecurityPolicyTemplateName;
-    const previousKubernetesVersion = this.value.spec.kubernetesVersion;
-
     const truncateLimit = this.value.defaultHostnameLengthLimit;
 
     return {
       loadedOnce:                      false,
       lastIdx:                         0,
-      allPSPs:                         null,
       allPSAs:                         [],
       credentialId:                    '',
       credential:                      null,
@@ -238,11 +230,7 @@ export default {
         path: 'metadata.name', rules: ['subDomain'], translationKey: 'nameNsDescription.name.label'
       }],
       harvesterVersionRange: {},
-      lastDefaultPodSecurityPolicyTemplateName, // Used for reset on k8s version changes
-      previousKubernetesVersion,
       cisOverride:           false,
-      cisPsaChangeBanner:    false,
-      psps:                  null, // List of policies if any
       truncateHostnames:     truncateLimit === NETBIOS_TRUNCATION_LENGTH,
       truncateLimit,
       busy:                  false,
@@ -286,20 +274,6 @@ export default {
       return this.value.agentConfig;
     },
 
-    /**
-     * Define PSP deprecation and restrict use of PSP based on min k8s version
-     */
-    needsPSP() {
-      return this.getNeedsPSP();
-    },
-
-    /**
-     * Define introduction of Rancher defined PSA templates
-     */
-    hasPsaTemplates() {
-      return !this.needsPSP;
-    },
-
     unsupportedSelectorConfig() {
       let global = 0;
       let kubeletOnly = 0;
@@ -933,10 +907,6 @@ export default {
         }
       }
 
-      if ( this.value.spec.defaultPodSecurityPolicyTemplateName === undefined ) {
-        set(this.value.spec, 'defaultPodSecurityPolicyTemplateName', '');
-      }
-
       if ( this.value.spec.defaultPodSecurityAdmissionConfigurationTemplateName === undefined ) {
         set(this.value.spec, 'defaultPodSecurityAdmissionConfigurationTemplateName', '');
       }
@@ -952,10 +922,6 @@ export default {
           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 });
         }
@@ -980,7 +946,6 @@ export default {
 
         const res = await allHash(hash);
 
-        this.allPSPs = res.allPSPs || [];
         this.allPSAs = res.allPSAs || [];
         this.rke2Versions = res.rke2Versions.data || [];
         this.k3sVersions = res.k3sVersions.data || [];
@@ -1069,16 +1034,6 @@ export default {
         this.value.removeDefaultHostnameLengthLimit();
       }
     },
-    /**
-     * Define PSP deprecation and restrict use of PSP based on min k8s version and current/edited mode
-     */
-    getNeedsPSP(value = this.value) {
-      const release = value?.spec?.kubernetesVersion || '';
-      const version = release.match(/\d+/g);
-      const isRequiredVersion = version?.length ? +version[0] === 1 && +version[1] < 25 : false;
-
-      return isRequiredVersion;
-    },
 
     /**
      * Get machine pools from the cluster configuration
@@ -1359,23 +1314,6 @@ export default {
       });
     },
 
-    /**
-     * Inform user to remove PSP for current cluster due deprecation
-     */
-    showPspConfirmation() {
-      return new Promise((resolve, reject) => {
-        this.$store.dispatch('cluster/promptModal', {
-          component:      'GenericPrompt',
-          componentProps: {
-            title:     this.t('cluster.rke2.modal.pspChange.title'),
-            body:      this.t('cluster.rke2.modal.pspChange.body'),
-            applyMode: 'continue',
-            confirm:   resolve
-          },
-        });
-      });
-    },
-
     // Set busy before save and clear after save
     async saveOverride(btnCb) {
       this.$set(this, 'busy', true);
@@ -1413,13 +1351,6 @@ export default {
       }
 
       const isEditVersion = this.isEdit && this.liveValue?.spec?.kubernetesVersion !== this.value?.spec?.kubernetesVersion;
-      const hasPspManuallyAdded = !!this.value.spec.rkeConfig?.machineGlobalConfig?.['kube-apiserver-arg'];
-
-      if (isEditVersion && !this.needsPSP && hasPspManuallyAdded) {
-        if (!await this.showPspConfirmation()) {
-          return btnCb('cancelled');
-        }
-      }
 
       if (isEditVersion) {
         const shouldContinue = await this.showAddonConfirmation();
@@ -1969,28 +1900,6 @@ export default {
       }
     },
 
-    /**
-     * Get provisioned RKE2 cluster PSPs in edit mode
-     */
-    async getPsps() {
-      // As server returns 500 we exclude all the possible cases
-      if (
-        this.mode !== _CREATE &&
-        !this.isK3s &&
-        this.value.state !== 'reconciling' &&
-        this.getNeedsPSP(this.liveValue) // We consider editing only possible PSP cases
-      ) {
-        const clusterId = this.value.mgmtClusterId;
-        const url = `/k8s/clusters/${ clusterId }/v1/${ PSPS }`;
-
-        try {
-          return await this.$store.dispatch('cluster/request', { url });
-        } catch (error) {
-          // PSP may not exists for this cluster and an error is returned without need to handle
-        }
-      }
-    },
-
     /**
      * Reset PSA on several input changes for given conditions
      */
@@ -2000,11 +1909,9 @@ export default {
       const cisValue = this.agentConfig?.profile || this.serverConfig?.profile;
 
       if (!this.cisOverride) {
-        if (this.hasPsaTemplates && cisValue) {
+        if (cisValue) {
           set(this.value.spec, 'defaultPodSecurityAdmissionConfigurationTemplateName', hardcodedTemplate);
         }
-
-        this.cisPsaChangeBanner = this.hasPsaTemplates;
       }
     },
 
@@ -2027,28 +1934,11 @@ export default {
     },
 
     /**
-     * Handle k8s changes side effects, like PSP and PSA resets
+     * Handle k8s changes side effects, like PSA resets
      */
     handleKubernetesChange(value) {
       if (value) {
         this.togglePsaDefault();
-        const version = VERSION.parse(value);
-        const major = parseInt(version?.[0] || 0);
-        const minor = parseInt(version?.[1] || 0);
-
-        // Reset PSA if not RKE2
-        if (!value.includes('rke2')) {
-          set(this.value.spec, 'defaultPodSecurityPolicyTemplateName', '');
-        } else {
-          // Reset PSP if it's legacy due k8s version 1.25+
-          if (major === 1 && minor >= 25) {
-            set(this.value.spec, 'defaultPodSecurityPolicyTemplateName', '');
-          } else {
-            set(this.value.spec, 'defaultPodSecurityPolicyTemplateName', this.lastDefaultPodSecurityPolicyTemplateName);
-          }
-
-          this.previousKubernetesVersion = value;
-        }
 
         // If Harvester driver, reset cloud provider if not compatible
         if (this.isHarvesterDriver && this.mode === _CREATE && this.isHarvesterIncompatible) {
@@ -2069,13 +1959,6 @@ export default {
       }
     },
 
-    /**
-     * Keep last PSP value
-     */
-    handlePspChange(value) {
-      this.lastDefaultPodSecurityPolicyTemplateName = value;
-    },
-
     handleShowDeprecatedPatchVersionsChanged(value) {
       this.showDeprecatedPatchVersions = value;
     },
@@ -2110,9 +1993,7 @@ export default {
         }
       });
     },
-    handlePspChanged(neu) {
-      this.handlePspChange(neu);
-    },
+
     handleCisChanged() {
       this.handleCisChange();
     },
@@ -2317,23 +2198,18 @@ export default {
             :live-value="liveValue"
             :mode="mode"
             :provider="provider"
-            :psps="psps"
             :user-chart-values="userChartValues"
             :credential="credential"
             :cis-override="cisOverride"
-            :cis-psa-change-banner="cisPsaChangeBanner"
-            :all-psps="allPSPs"
             :all-psas="allPSAs"
             :addon-versions="addonVersions"
             :show-deprecated-patch-versions="showDeprecatedPatchVersions"
-            :needs-psp="needsPSP"
             :selected-version="selectedVersion"
             :is-harvester-driver="isHarvesterDriver"
             :is-harvester-incompatible="isHarvesterIncompatible"
             :version-options="versionOptions"
             :cluster-is-already-created="clusterIsAlreadyCreated"
             :is-elemental-cluster="isElementalCluster"
-            :has-psa-templates="hasPsaTemplates"
             :is-k3s="isK3s"
             :have-arg-info="haveArgInfo"
             :show-cni="showCni"
@@ -2343,7 +2219,6 @@ export default {
             @cilium-ipv6-changed="handleCiliumIpv6Changed"
             @enabled-system-services-changed="handleEnabledSystemServicesChanged"
             @kubernetes-changed="handleKubernetesChange"
-            @psp-changed="handlePspChanged"
             @cis-changed="handleCisChanged"
             @psa-default-changed="handlePsaDefaultChanged"
             @show-deprecated-patch-versions-changed="handleShowDeprecatedPatchVersionsChanged"

package/middleware/authenticated.js

@@ -8,7 +8,7 @@ import { MANAGEMENT, NORMAN, DEFAULT_WORKSPACE } from '@shell/config/types';
 import { _ALL_IF_AUTHED } from '@shell/plugins/dashboard-store/actions';
 import { applyProducts } from '@shell/store/type-map';
 import { findBy } from '@shell/utils/array';
-import { ClusterNotFoundError } from '@shell/utils/error';
+import { ClusterNotFoundError, RedirectToError } from '@shell/utils/error';
 import { get } from '@shell/utils/object';
 import { setFavIcon, haveSetFavIcon } from '@shell/utils/favicon';
 import dynamicPluginLoader from '@shell/pkg/dynamic-plugin-loader';
@@ -502,8 +502,10 @@ export default async function({
       }
     }
   } catch (e) {
-    if ( e instanceof ClusterNotFoundError ) {
+    if ( e.name === ClusterNotFoundError.name ) {
       return redirect(302, '/home');
+    } if ( e.name === RedirectToError.name ) {
+      return redirect(302, e.url);
     } else {
       // Sets error 500 if lost connection to API
       store.commit('setError', { error: e, locationError: new Error(store.getters['i18n/t']('nav.failWhale.authMiddleware')) });

package/models/__tests__/management.cattle.io.cluster.test.ts

@@ -0,0 +1,19 @@
+import MgmtCluster from '@shell/models/management.cattle.io.cluster';
+
+describe('class MgmtCluster', () => {
+  describe('provisioner', () => {
+    const testCases = [
+      [{ provider: 'rke', driver: 'imported' }, 'rke'],
+      [{ provider: 'k3s', driver: 'K3S' }, 'k3s'],
+      [{ provider: 'aks', driver: 'AKS' }, 'aks'],
+      [{}, 'imported'],
+    ];
+
+    it.each(testCases)('should return provisioner value properly based on the props data', (clusterData: Object, expected: String) => {
+      const cluster = new MgmtCluster({ status: clusterData });
+
+      expect(cluster.provisioner).toBe(expected);
+    }
+    );
+  });
+});

package/models/__tests__/provisioning.cattle.io.cluster.test.ts

@@ -0,0 +1,90 @@
+import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
+
+describe('class ProvCluster', () => {
+  const importedClusterInfo = {
+    clusterName: 'test', provisioner: 'imported', mgmt: { spec: { gkeConfig: {} } }, spec: {}
+  };
+  const importedGkeClusterInfo = {
+    clusterName: 'test', provisioner: 'rke2', mgmt: { spec: { gkeConfig: { imported: true } } }
+  };
+  const importedAksClusterInfo = {
+    clusterName: 'test', provisioner: 'rke2', mgmt: { spec: { aksConfig: { imported: true } } }
+  };
+  const importedEksClusterInfo = {
+    clusterName: 'test', provisioner: 'rke2', mgmt: { spec: { eksConfig: { imported: true } } }
+  };
+  const notImportedGkeClusterInfo = {
+    clusterName: 'test', provisioner: 'rke2', mgmt: { spec: { gkeConfig: { imported: false } }, rkeConfig: {} }
+  };
+  const importedClusterInfoWithProviderForEmberParam = {
+    clusterName: 'test', provisioner: 'rke2', mgmt: { providerForEmberParam: 'import' }
+  };
+  const localClusterInfo = {
+    clusterName: 'test', provisioner: 'imported', mgmt: { isLocal: true, spec: { gkeConfig: {} } }, spec: {}
+  };
+  const doRke2Info = {
+    clusterName: 'test', provisioner: 'rke2', mgmt: { isLocal: false, providerForEmberParam: 'import' }, spec: { rkeConfig: {} }
+  };
+
+  describe('isImported', () => {
+    const testCases = [
+      [importedClusterInfo, true],
+      [importedGkeClusterInfo, true],
+      [importedAksClusterInfo, true],
+      [importedEksClusterInfo, true],
+      [notImportedGkeClusterInfo, false],
+      [importedClusterInfoWithProviderForEmberParam, true],
+      [localClusterInfo, false],
+      [doRke2Info, false],
+      [{}, false],
+    ];
+    const resetMocks = () => {
+      // Clear all mock function calls:
+      jest.clearAllMocks();
+    };
+
+    it.each(testCases)('should return the isImported value properly based on the props data', (clusterData: Object, expected: Boolean) => {
+      const cluster = new ProvCluster({ spec: clusterData.spec });
+
+      jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(
+        clusterData.mgmt
+      );
+      jest.spyOn(cluster, 'provisioner', 'get').mockReturnValue(
+        clusterData.provisioner
+      );
+
+      expect(cluster.isImported).toBe(expected);
+      resetMocks();
+    }
+    );
+  });
+
+  describe('mgmt', () => {
+    const testCases = [
+      [importedClusterInfo, importedClusterInfo.mgmt],
+      [importedGkeClusterInfo, importedGkeClusterInfo.mgmt],
+      [importedAksClusterInfo, importedAksClusterInfo.mgmt],
+      [importedEksClusterInfo, importedEksClusterInfo.mgmt],
+      [notImportedGkeClusterInfo, notImportedGkeClusterInfo.mgmt],
+      [importedClusterInfoWithProviderForEmberParam, importedClusterInfoWithProviderForEmberParam.mgmt],
+      [localClusterInfo, localClusterInfo.mgmt],
+      [doRke2Info, doRke2Info.mgmt],
+      [{}, null],
+    ];
+
+    const resetMocks = () => {
+      // Clear all mock function calls:
+      jest.clearAllMocks();
+    };
+
+    it.each(testCases)('should return the isImported value properly based on the props data', (clusterData: Object, expected: Object) => {
+      const clusterMock = jest.fn(() => clusterData.mgmt);
+      const ctx = { rootGetters: { 'management/byId': clusterMock } };
+      const cluster = new ProvCluster({ status: { clusterName: clusterData.clusterName } }, ctx);
+
+      expect(cluster.mgmt).toBe(expected);
+      resetMocks();
+    }
+    );
+  });
+});

package/models/cluster.x-k8s.io.machine.js

@@ -231,7 +231,7 @@ export default class CapiMachine extends SteveModel {
       return false;
     }
 
-    return notOnlyOfRole(this, this.cluster.machines);
+    return notOnlyOfRole(this, this.cluster?.machines);
   }
 
   get roles() {

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

@@ -88,6 +88,10 @@ export default class MgmtCluster extends HybridModel {
   }
 
   get provisioner() {
+    if (this.status?.provider ) {
+      return this.status.provider;
+    }
+
     // For imported K3s clusters, this.status.driver is 'k3s.'
     return this.status?.driver ? this.status.driver : 'imported';
   }