@rancher/shell 0.3.27 → 0.3.29

package/config/types.js

@@ -53,8 +53,6 @@ export const NODE = 'node';
 export const NETWORK_POLICY = 'networking.k8s.io.networkpolicy';
 export const POD = 'pod';
 export const POD_DISRUPTION_BUDGET = 'policy.poddisruptionbudget';
-export const PSP = 'policy.podsecuritypolicy';
-export const PSPS = 'policy.podsecuritypolicies';
 export const PV = 'persistentvolume';
 export const PVC = 'persistentvolumeclaim';
 export const RESOURCE_QUOTA = 'resourcequota';
@@ -183,8 +181,6 @@ export const MANAGEMENT = {
   TOKEN:                         'management.cattle.io.token',
   GLOBAL_ROLE:                   'management.cattle.io.globalrole',
   GLOBAL_ROLE_BINDING:           'management.cattle.io.globalrolebinding',
-  POD_SECURITY_POLICY_TEMPLATE:  'management.cattle.io.podsecuritypolicytemplate',
-  PSP_TEMPLATE_BINDING:          'management.cattle.io.podsecuritypolicytemplateprojectbinding',
   PSA:                           'management.cattle.io.podsecurityadmissionconfigurationtemplate',
   MANAGED_CHART:                 'management.cattle.io.managedchart',
   USER_NOTIFICATION:             'management.cattle.io.rancherusernotification',

package/detail/provisioning.cattle.io.cluster.vue

@@ -782,10 +782,11 @@ export default {
                 </div>
               </div>
               <div
-                v-if="group.ref && poolSummaryInfo[group.ref]"
+                v-if="group.ref"
                 class="right group-header-buttons mr-20"
               >
                 <MachineSummaryGraph
+                  v-if="poolSummaryInfo[group.ref]"
                   :row="poolSummaryInfo[group.ref]"
                   :horizontal="true"
                   class="mr-20"

package/edit/management.cattle.io.project.vue

@@ -5,7 +5,6 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import FormValidation from '@shell/mixins/form-validation';
 import CruResource from '@shell/components/CruResource';
 import Labels from '@shell/components/form/Labels';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
 import ResourceQuota from '@shell/components/form/ResourceQuota/Project';
 import { HARVESTER_TYPES, RANCHER_TYPES } from '@shell/components/form/ResourceQuota/shared';
 import Tab from '@shell/components/Tabbed/Tab';
@@ -21,26 +20,15 @@ import { Banner } from '@components/Banner';
 
 export default {
   components: {
-    ContainerResourceLimit, CruResource, Labels, LabeledSelect, NameNsDescription, ProjectMembershipEditor, ResourceQuota, Tabbed, Tab, Banner
+    ContainerResourceLimit, CruResource, Labels, NameNsDescription, ProjectMembershipEditor, ResourceQuota, Tabbed, Tab, Banner
   },
 
   mixins: [CreateEditView, FormValidation],
-  async fetch() {
-    if ( this.$store.getters['management/canList'](MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE) ) {
-      this.allPSPs = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.POD_SECURITY_POLICY_TEMPLATE });
-    }
-
-    // User can only change the PSP if the user has permissions to see the binding schema for PSP Templates
-    const pspBindingSchema = this.$store.getters['management/schemaFor'](MANAGEMENT.PSP_TEMPLATE_BINDING);
-
-    this.canEditPSPBindings = !!pspBindingSchema;
-  },
   data() {
     this.$set(this.value, 'spec', this.value.spec || {});
     this.$set(this.value.spec, 'podSecurityPolicyTemplateId', this.value.status?.podSecurityPolicyTemplateId || '');
 
     return {
-      allPSPs:                          [],
       projectRoleTemplateBindingSchema: this.$store.getters[`management/schemaFor`](MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING),
       createLocation:                   {
         name:   'c-cluster-product-resource-create',
@@ -57,7 +45,6 @@ export default {
       HARVESTER_TYPES,
       RANCHER_TYPES,
       fvFormRuleSets:     [{ path: 'spec.displayName', rules: ['required'] }],
-      canEditPSPBindings: true,
     };
   },
   computed: {
@@ -91,31 +78,6 @@ export default {
       return (this.currentCluster?.spec?.kubernetesVersion || '').includes('k3s');
     },
 
-    pspOptions() {
-      if ( this.isK3s || !this.currentCluster.spec.defaultPodSecurityPolicyTemplateName ) {
-        return null;
-      }
-
-      const out = [{ label: this.t('project.psp.default'), value: '' }];
-
-      if ( this.allPSPs ) {
-        for ( const pspt of this.allPSPs ) {
-          out.push({
-            label: pspt.nameDisplay,
-            value: pspt.id,
-          });
-        }
-      }
-
-      const cur = this.value.status?.podSecurityPolicyTemplateId;
-
-      if ( cur && !out.find((x) => x.value === cur) ) {
-        out.unshift({ label: this.t('project.psp.current', { value: cur }), value: cur });
-      }
-
-      return out;
-    },
-
     isHarvester() {
       return this.$store.getters['currentProduct'].inStore === HARVESTER;
     },
@@ -223,19 +185,6 @@ export default {
       :normalize-name="false"
       :rules="{ name: fvGetAndReportPathRules('spec.displayName'), namespace: [], description: [] }"
     />
-    <div class="row mb-20">
-      <div class="col span-3">
-        <LabeledSelect
-          v-if="pspOptions"
-          v-model="value.spec.podSecurityPolicyTemplateId"
-          class="psp"
-          :mode="mode"
-          :options="pspOptions"
-          :disabled="!canEditPSPBindings"
-          :label="t('project.psp.label')"
-        />
-      </div>
-    </div>
     <Tabbed :side-tabs="true">
       <Tab
         v-if="canViewMembers"

package/edit/management.cattle.io.setting.vue

@@ -2,6 +2,7 @@
 import CruResource from '@shell/components/CruResource';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
+import { Banner } from '@components/Banner';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { TextAreaAutoGrow } from '@components/Form/TextArea';
 import formRulesGenerator from '@shell/utils/validators/formRules/index';
@@ -11,6 +12,7 @@ import { RadioGroup } from '@components/Form/Radio';
 import FormValidation from '@shell/mixins/form-validation';
 import { setBrand } from '@shell/config/private-label';
 import { keyBy, mapValues } from 'lodash';
+import { isLocalhost, isServerUrl } from '@shell/utils/validators/setting';
 
 export default {
   components: {
@@ -18,7 +20,8 @@ export default {
     LabeledInput,
     LabeledSelect,
     RadioGroup,
-    TextAreaAutoGrow
+    TextAreaAutoGrow,
+    Banner
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -63,6 +66,14 @@ export default {
 
           return factoryArg ? rule(factoryArg) : rule;
         }) : {};
+    },
+
+    showLocalhostWarning() {
+      return isServerUrl(this.value.id) && isLocalhost(this.value.value);
+    },
+
+    validationPassed() {
+      return this.fvFormIsValid && this.fvGetPathErrors(['value']).length === 0;
     }
   },
 
@@ -98,6 +109,11 @@ export default {
       if (ev && ev.srcElement) {
         ev.srcElement.blur();
       }
+
+      if (isServerUrl(this.value.id) && !this.value.default) {
+        return;
+      }
+
       this.value.value = this.value.default;
     }
   }
@@ -113,7 +129,7 @@ export default {
     :resource="value"
     :subtypes="[]"
     :can-yaml="false"
-    :validation-passed="fvFormIsValid"
+    :validation-passed="validationPassed"
     @error="e=>errors = e"
     @finish="saveSettings"
     @cancel="done"
@@ -138,6 +154,19 @@ export default {
       </button>
     </div>
 
+    <Banner
+      v-if="showLocalhostWarning"
+      color="warning"
+      :label="t('validation.setting.serverUrl.localhost')"
+    />
+
+    <Banner
+      v-for="(err, i) in fvGetPathErrors(['value'])"
+      :key="i"
+      color="error"
+      :label="err"
+    />
+
     <div class="mt-20">
       <div v-if="setting.kind === 'enum'">
         <LabeledSelect

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:     [{