@rancher/shell 0.5.3 → 1.2.0

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

@@ -2,7 +2,6 @@
 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';
@@ -12,7 +11,6 @@ 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: {
@@ -20,8 +18,7 @@ export default {
     LabeledInput,
     LabeledSelect,
     RadioGroup,
-    TextAreaAutoGrow,
-    Banner
+    TextAreaAutoGrow
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -66,14 +63,6 @@ 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;
     }
   },
 
@@ -109,11 +98,6 @@ export default {
       if (ev && ev.srcElement) {
         ev.srcElement.blur();
       }
-
-      if (isServerUrl(this.value.id) && !this.value.default) {
-        return;
-      }
-
       this.value.value = this.value.default;
     }
   }
@@ -129,7 +113,7 @@ export default {
     :resource="value"
     :subtypes="[]"
     :can-yaml="false"
-    :validation-passed="validationPassed"
+    :validation-passed="fvFormIsValid"
     @error="e=>errors = e"
     @finish="saveSettings"
     @cancel="done"
@@ -145,7 +129,6 @@ export default {
     <div class="edit-change mt-20">
       <h5 v-t="'advancedSettings.edit.changeSetting'" />
       <button
-        data-testid="advanced_settings_use_default"
         :disabled="!canReset"
         type="button"
         class="btn role-primary"
@@ -155,19 +138,6 @@ 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/monitoring.coreos.com.alertmanagerconfig/types/opsgenie.vue

@@ -190,7 +190,7 @@ export default {
     <div class="row mb-20">
       <div class="col span-12">
         <LabeledInput
-          v-model="value.httpConfig.proxyURL"
+          v-model="value.httpConfig.proxyUrl"
           :mode="mode"
           label="Proxy URL"
           placeholder="e.g. http://my-proxy/"

package/edit/monitoring.coreos.com.alertmanagerconfig/types/pagerduty.vue

@@ -123,6 +123,7 @@ export default {
       }
     }
   }
+
 };
 </script>
 
@@ -184,7 +185,7 @@ export default {
     <div class="row mb-20">
       <div class="col span-12">
         <LabeledInput
-          v-model="value.httpConfig.proxyURL"
+          v-model="value.httpConfig.proxyUrl"
           :mode="mode"
           label="Proxy URL"
           placeholder="e.g. http://my-proxy/"

package/edit/monitoring.coreos.com.alertmanagerconfig/types/slack.vue

@@ -126,7 +126,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledInput
-          v-model="value.httpConfig.proxyURL"
+          v-model="value.httpConfig.proxyUrl"
           :mode="mode"
           label="Proxy URL"
           placeholder="e.g. http://my-proxy/"

package/edit/monitoring.coreos.com.prometheusrule/AlertingRule.vue

@@ -47,18 +47,9 @@ export default {
       selectedSeverityLabel: null,
       ignoredAnnotations:    IGNORED_ANNOTATIONS,
       severityOptions:       [
-        {
-          label: this.t('prometheusRule.alertingRules.labels.severity.choices.critical'),
-          value: 'critical'
-        },
-        {
-          label: this.t('prometheusRule.alertingRules.labels.severity.choices.warning'),
-          value: 'warning'
-        },
-        {
-          label: this.t('prometheusRule.alertingRules.labels.severity.choices.none'),
-          value: 'none'
-        },
+        this.t('prometheusRule.alertingRules.labels.severity.choices.critical'),
+        this.t('prometheusRule.alertingRules.labels.severity.choices.warning'),
+        this.t('prometheusRule.alertingRules.labels.severity.choices.none'),
       ],
     };
   },

package/edit/monitoring.coreos.com.prometheusrule/GroupRules.vue

@@ -6,7 +6,6 @@ import { _VIEW } from '@shell/config/query-params';
 import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
 import AlertingRule from './AlertingRule';
 import RecordingRule from './RecordingRule';
-import { clone } from '@shell/utils/object';
 
 export default {
   components: {
@@ -106,7 +105,7 @@ export default {
         });
         break;
       case 'alert':
-        value.push(clone(this.defaultAlert));
+        value.push(this.defaultAlert);
         break;
       default:
         break;

package/edit/networking.k8s.io.networkpolicy/__tests__/PolicyRuleTarget.spec.ts

@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils';
 import PolicyRuleTarget from '@shell/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget';
 import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
 import mock from '@shell/edit/networking.k8s.io.networkpolicy/__tests__/utils/mock.json';
-import { PolicyRuleTargetSelectors } from '@shell/edit/networking.k8s.io.networkpolicy/__tests__/utils/selectors.test.ts';
+import { PolicyRuleTargetSelectors } from '@shell/edit/networking.k8s.io.networkpolicy/__tests__/utils/selectors';
 
 describe.each([
   'view',

package/edit/provisioning.cattle.io.cluster/{tabs/Basics.vue → Basics.vue}

@@ -11,7 +11,6 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import YamlEditor from '@shell/components/YamlEditor';
 import { LEGACY } from '@shell/store/features';
 import semver from 'semver';
-import { _EDIT } from '@shell/config/query-params';
 
 const HARVESTER = 'harvester';
 
@@ -41,6 +40,12 @@ export default {
       required: true,
     },
 
+    psps: {
+      type:     Object,
+      default:  null,
+      required: false
+    },
+
     credential: {
       type:     Object,
       default:  null,
@@ -56,6 +61,15 @@ export default {
       required: true
     },
 
+    cisPsaChangeBanner: {
+      type:     Boolean,
+      required: true
+    },
+    allPsps: {
+      type:     Array,
+      required: false,
+      default:  null
+    },
     allPsas: {
       type:     Array,
       required: true
@@ -66,7 +80,10 @@ export default {
       required: false,
       default:  null
     },
-
+    needsPsp: {
+      type:     Boolean,
+      required: true
+    },
     selectedVersion: {
       type:     Object,
       required: true
@@ -87,10 +104,22 @@ export default {
       type:     Boolean,
       required: true
     },
+    clusterIsAlreadyCreated: {
+      type:     Boolean,
+      required: true
+    },
     isElementalCluster: {
       type:     Boolean,
       required: true
     },
+    hasPsaTemplates: {
+      type:     Boolean,
+      required: true
+    },
+    isK3s: {
+      type:     Boolean,
+      required: true
+    },
     haveArgInfo: {
       type:     Boolean,
       required: true
@@ -106,21 +135,20 @@ export default {
     cloudProviderOptions: {
       type:     Array,
       required: true
-    }
-  },
-
-  watch: {
-    selectedVersion(neu, old) {
-      if (neu?.value !== old?.value && this.ciliumIpv6) {
-        // Re-assign so that the setter updates the structure for the new k8s version if needed
-        this.ciliumIpv6 = !!this.ciliumIpv6;
-      }
-    }
+    },
   },
 
   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;
     },
@@ -129,6 +157,17 @@ 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 };
@@ -146,9 +185,35 @@ export default {
      * Allow to display override if PSA is needed and profile is set
      */
     hasCisOverride() {
-      return (this.serverConfig?.profile || this.agentConfig?.profile) &&
+      return (this.serverConfig?.profile || this.agentConfig?.profile) && this.needsPSA &&
         // Also check other cases on when to display the override
-        this.showCisProfile && this.isCisSupported;
+        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;
     },
 
     /**
@@ -157,14 +222,14 @@ export default {
     isPsaDisabled() {
       const cisValue = this.agentConfig?.profile || this.serverConfig?.profile;
 
-      return !(!cisValue || this.cisOverride) && this.isCisSupported;
+      return !(!cisValue || this.cisOverride) && this.hasPsaTemplates && this.isCisSupported;
     },
 
     /**
      * Get the default label for the PSA template option
      */
     defaultPsaOptionLabel() {
-      const optionCase = !this.value.isK3s ? 'default' : 'none';
+      const optionCase = !this.needsPsp && !this.isK3s ? 'default' : 'none';
 
       return this.$store.getters['i18n/t'](`cluster.rke2.defaultPodSecurityAdmissionConfigurationTemplateName.option.${ optionCase }`);
     },
@@ -173,6 +238,9 @@ export default {
      * Convert PSA templates into options, sorting and flagging if any selected
      */
     psaOptions() {
+      if ( !this.needsPSA ) {
+        return [];
+      }
       const out = [{
         label: this.defaultPsaOptionLabel,
         value: ''
@@ -207,7 +275,7 @@ export default {
     disableOptions() {
       return (this.serverArgs.disable.options || []).map((value) => {
         return {
-          label: this.$store.getters['i18n/withFallback'](`cluster.${ this.value.isK3s ? 'k3s' : 'rke2' }.systemService."${ value }"`, null, value.replace(/^(rke2|rancher)-/, '')),
+          label: this.$store.getters['i18n/withFallback'](`cluster.${ this.isK3s ? 'k3s' : 'rke2' }.systemService."${ value }"`, null, value.replace(/^(rke2|rancher)-/, '')),
           value,
         };
       });
@@ -253,7 +321,7 @@ export default {
         return false;
       }
 
-      const name = this.agentConfig?.['cloud-provider-name'];
+      const name = this.agentConfig['cloud-provider-name'];
 
       if ( !name ) {
         return false;
@@ -273,7 +341,7 @@ export default {
         return false;
       }
 
-      const name = this.agentConfig?.['cloud-provider-name'];
+      const name = this.agentConfig['cloud-provider-name'];
 
       return name === 'rancher-vsphere';
     },
@@ -294,78 +362,15 @@ export default {
         // eslint-disable-next-line no-unused-vars
         const cni = this.serverConfig.cni; // force this property to recalculate if cni was changed away from cilium and chartValues['rke-cilium'] deleted
 
-        const chart = this.userChartValues[this.chartVersionKey('rke2-cilium')];
-
-        return chart?.cilium?.ipv6?.enabled || chart?.ipv6?.enabled || false;
+        return this.userChartValues[this.chartVersionKey('rke2-cilium')]?.cilium?.ipv6?.enabled || false;
       },
-      set(neu) {
-        const name = this.chartVersionKey('rke2-cilium');
-        const values = this.userChartValues[name];
-
-        // RKE2 older than 1.23.5 uses different Helm chart values structure - need to take that into account
-        const version = this.selectedVersion.value;
-        let ciliumValues = {};
-
-        if (semver.gt(version, '1.23.5')) {
-          // New style
-          ciliumValues = {
-            ...values,
-            ipv6: {
-              ...values?.ipv6,
-              enabled: neu
-            }
-          };
-
-          delete ciliumValues.cilium;
-        } else {
-          // Old style
-          ciliumValues = {
-            ...values,
-            cilium: {
-              ...values?.cilium,
-              ipv6: {
-                ...values?.cilium?.ipv6,
-                enabled: neu
-              }
-            }
-          };
-
-          delete ciliumValues.ipv6;
-        }
-
-        this.$emit('cilium-values-changed', ciliumValues);
+      set(val) {
+        this.$emit('cilium-ipv6-changed', val);
       }
     },
 
-    ciliumBandwidthManager: {
-      get() {
-        // eslint-disable-next-line no-unused-vars
-        const cni = this.serverConfig.cni; // force this property to recalculate if cni was changed away from cilium and chartValues['rke-cilium'] deleted
-
-        return this.userChartValues[this.chartVersionKey('rke2-cilium')]?.bandwidthManager?.enabled || false;
-      },
-      set(neu) {
-        const name = this.chartVersionKey('rke2-cilium');
-        const values = this.userChartValues[name];
-
-        const ciliumValues = {
-          ...values,
-          bandwidthManager: {
-            ...values?.bandwidthManager,
-            enabled: neu
-          }
-        };
-
-        this.$emit('cilium-values-changed', ciliumValues);
-      }
-    },
-
-    isEdit() {
-      return this.mode === _EDIT;
-    },
-
     canNotEditCloudProvider() {
-      const canNotEdit = this.isEdit;
+      const canNotEdit = this.clusterIsAlreadyCreated;
 
       return canNotEdit;
     },
@@ -374,7 +379,7 @@ export default {
      * Display warning about additional configuration needed for cloud provider Amazon if kube >= 1.27
      */
     showCloudProviderAmazonAdditionalConfigWarning() {
-      return !!semver.gte(this.value.spec.kubernetesVersion, 'v1.27.0') && this.agentConfig?.['cloud-provider-name'] === 'aws';
+      return !!semver.gte(this.value.spec.kubernetesVersion, 'v1.27.0') && this.agentConfig['cloud-provider-name'] === 'aws';
     }
   },
 
@@ -417,13 +422,6 @@ export default {
     >
       <span v-clean-html="t('cluster.banner.cloudProviderAddConfig', {}, true)" />
     </Banner>
-    <Banner
-      v-if="serverConfig.cni === 'none'"
-      color="warning"
-      data-testid="clusterBasics__noneOptionSelectedForCni"
-    >
-      <span v-clean-html="t('cluster.rke2.cni.cniNoneBanner', {}, true)" />
-    </Banner>
     <div class="row mb-10">
       <div class="col span-6">
         <LabeledSelect
@@ -447,7 +445,6 @@ export default {
         class="col span-6"
       >
         <LabeledSelect
-          v-if="agentConfig"
           v-model="agentConfig['cloud-provider-name']"
           :mode="mode"
           :disabled="canNotEditCloudProvider"
@@ -464,9 +461,8 @@ export default {
       <div class="col span-6">
         <LabeledSelect
           v-model="serverConfig.cni"
-          data-testid="cluster-rke2-cni-select"
           :mode="mode"
-          :disabled="isEdit"
+          :disabled="clusterIsAlreadyCreated"
           :options="serverArgs.cni.options"
           :label="t('cluster.rke2.cni.label')"
         />
@@ -477,16 +473,9 @@ export default {
       >
         <Checkbox
           v-model="ciliumIpv6"
-          data-testid="cluster-rke2-cni-ipv6-checkbox"
           :mode="mode"
           :label="t('cluster.rke2.address.ipv6.enable')"
         />
-        <Checkbox
-          v-model="ciliumBandwidthManager"
-          data-testid="cluster-rke2-cni-cilium-bandwidth-manager-checkbox"
-          :mode="mode"
-          :label="t('cluster.rke2.cni.cilium.BandwidthManager.enable')"
-        />
       </div>
     </div>
     <template v-if="showVsphereNote">
@@ -503,7 +492,6 @@ export default {
           {{ t('cluster.rke2.cloudProvider.header') }}
         </h3>
         <YamlEditor
-          v-if="agentConfig"
           ref="yaml"
           v-model="agentConfig['cloud-provider-config']"
           :editor-mode="mode === 'view' ? 'VIEW_CODE' : 'EDIT_CODE'"
@@ -518,6 +506,21 @@ 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"
@@ -527,6 +530,21 @@ 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"
@@ -565,13 +583,14 @@ export default {
         :label="t('cluster.rke2.banner.cisOverride')"
       />
       <Banner
-        v-if="!cisOverride"
+        v-if="cisPsaChangeBanner && !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/{tabs/MachinePool.vue → MachinePool.vue}

@@ -69,6 +69,12 @@ export default {
     poolId: {
       type:     String,
       required: true,
+    },
+
+    // this is a useful info when in edit mode you add a new pool, example of use in vmwarevsphere.vue
+    poolCreateMode: {
+      type:     Boolean,
+      required: true,
     }
   },
 
@@ -269,6 +275,7 @@ export default {
       :credential-id="credentialId"
       :pool-index="idx"
       :pool-id="poolId"
+      :pool-create-mode="value.create"
       :machine-pools="machinePools"
       :busy="busy"
       @error="emitError"
@@ -335,7 +342,6 @@ export default {
         v-model="value.pool.labels"
         :add-label="t('labels.addLabel')"
         :disabled="busy"
-        :mode="mode"
         :title="t('cluster.machinePool.labels.label')"
         :read-allowed="false"
         :value-can-be-empty="true"

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

@@ -31,10 +31,9 @@ export default {
     },
 
     cancel: {
-      type:    Function,
-      default: null
+      type:     Function,
+      required: true,
     },
-
     showingForm: {
       type:     Boolean,
       required: true,
@@ -103,18 +102,13 @@ export default {
     },
 
     options() {
-      const duplicates = {};
-
-      this.filteredCredentials.forEach((cred) => {
-        duplicates[cred.nameDisplay] = duplicates[cred.nameDisplay] === null ? true : null;
+      const out = this.filteredCredentials.map((obj) => {
+        return {
+          label: obj.nameDisplay,
+          value: obj.id,
+        };
       });
 
-      const out = this.filteredCredentials.map((obj) => ({
-        // if credential name is duplicated we add the id to the label
-        label: duplicates[obj.nameDisplay] ? `${ obj.nameDisplay } (${ obj.id })` : obj.nameDisplay,
-        value: obj.id,
-      }));
-
       if ( this.originalId && !out.find((x) => x.value === this.originalId) ) {
         out.unshift({
           label: `${ this.originalId.replace(/^cattle-global-data:/, '') } (current)`,
@@ -271,10 +265,8 @@ export default {
         v-model="credentialId"
         :label="t('cluster.credential.label')"
         :options="options"
-        option-key="value"
         :mode="mode"
         :selectable="option => !option.disabled"
-        data-testid="cluster-prov-select-credential"
       />
     </div>