@rancher/shell 1.2.0 → 2.0.0

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

@@ -11,6 +11,7 @@ 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';
 
@@ -40,12 +41,6 @@ export default {
       required: true,
     },
 
-    psps: {
-      type:     Object,
-      default:  null,
-      required: false
-    },
-
     credential: {
       type:     Object,
       default:  null,
@@ -61,15 +56,6 @@ export default {
       required: true
     },
 
-    cisPsaChangeBanner: {
-      type:     Boolean,
-      required: true
-    },
-    allPsps: {
-      type:     Array,
-      required: false,
-      default:  null
-    },
     allPsas: {
       type:     Array,
       required: true
@@ -80,10 +66,7 @@ export default {
       required: false,
       default:  null
     },
-    needsPsp: {
-      type:     Boolean,
-      required: true
-    },
+
     selectedVersion: {
       type:     Object,
       required: true
@@ -104,22 +87,10 @@ 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
@@ -135,37 +106,39 @@ 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;
     },
 
-    agentConfig() {
-      return this.value.agentConfig;
+    showCniNoneBanner() {
+      return this.serverConfig?.cni === 'none';
     },
 
-    /**
-     * 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;
+    showCiliumIpv6Controls() {
+      return this.serverConfig?.cni === 'cilium' || this.serverConfig?.cni === 'multus,cilium';
+    },
 
-      return isRequiredVersion;
+    showNetworkPolicyWarningBanner() {
+      return this.serverConfig?.cni === 'cilium' && this.value?.spec?.enableNetworkPolicy;
+    },
+
+    agentConfig() {
+      return this.value.agentConfig;
     },
 
     profileOptions() {
@@ -185,35 +158,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;
     },
 
     /**
@@ -222,14 +169,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.value.isK3s ? 'default' : 'none';
 
       return this.$store.getters['i18n/t'](`cluster.rke2.defaultPodSecurityAdmissionConfigurationTemplateName.option.${ optionCase }`);
     },
@@ -238,9 +185,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: ''
@@ -267,7 +211,7 @@ export default {
      * Check if current CIS profile is required and listed in the options
      */
     isCisSupported() {
-      const cisProfile = this.serverConfig.profile || this.agentConfig.profile;
+      const cisProfile = this.serverConfig?.profile || this.agentConfig?.profile;
 
       return !cisProfile || this.profileOptions.map((option) => option.value).includes(cisProfile);
     },
@@ -275,7 +219,7 @@ export default {
     disableOptions() {
       return (this.serverArgs.disable.options || []).map((value) => {
         return {
-          label: this.$store.getters['i18n/withFallback'](`cluster.${ this.isK3s ? 'k3s' : 'rke2' }.systemService."${ value }"`, null, value.replace(/^(rke2|rancher)-/, '')),
+          label: this.$store.getters['i18n/withFallback'](`cluster.${ this.value.isK3s ? 'k3s' : 'rke2' }.systemService."${ value }"`, null, value.replace(/^(rke2|rancher)-/, '')),
           value,
         };
       });
@@ -321,7 +265,7 @@ export default {
         return false;
       }
 
-      const name = this.agentConfig['cloud-provider-name'];
+      const name = this.agentConfig?.['cloud-provider-name'];
 
       if ( !name ) {
         return false;
@@ -341,7 +285,7 @@ export default {
         return false;
       }
 
-      const name = this.agentConfig['cloud-provider-name'];
+      const name = this.agentConfig?.['cloud-provider-name'];
 
       return name === 'rancher-vsphere';
     },
@@ -362,15 +306,78 @@ 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
 
-        return this.userChartValues[this.chartVersionKey('rke2-cilium')]?.cilium?.ipv6?.enabled || false;
+        const chart = this.userChartValues[this.chartVersionKey('rke2-cilium')];
+
+        return chart?.cilium?.ipv6?.enabled || chart?.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);
+      }
+    },
+
+    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(val) {
-        this.$emit('cilium-ipv6-changed', val);
+      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.clusterIsAlreadyCreated;
+      const canNotEdit = this.isEdit;
 
       return canNotEdit;
     },
@@ -379,7 +386,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';
     }
   },
 
@@ -422,6 +429,13 @@ export default {
     >
       <span v-clean-html="t('cluster.banner.cloudProviderAddConfig', {}, true)" />
     </Banner>
+    <Banner
+      v-if="showCniNoneBanner"
+      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
@@ -445,6 +459,7 @@ export default {
         class="col span-6"
       >
         <LabeledSelect
+          v-if="agentConfig"
           v-model="agentConfig['cloud-provider-name']"
           :mode="mode"
           :disabled="canNotEditCloudProvider"
@@ -461,21 +476,29 @@ export default {
       <div class="col span-6">
         <LabeledSelect
           v-model="serverConfig.cni"
+          data-testid="cluster-rke2-cni-select"
           :mode="mode"
-          :disabled="clusterIsAlreadyCreated"
+          :disabled="isEdit"
           :options="serverArgs.cni.options"
           :label="t('cluster.rke2.cni.label')"
         />
       </div>
       <div
-        v-if="serverConfig.cni === 'cilium' || serverConfig.cni === 'multus,cilium'"
+        v-if="showCiliumIpv6Controls"
         class="col"
       >
         <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">
@@ -492,6 +515,7 @@ 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'"
@@ -506,21 +530,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"
@@ -530,27 +539,12 @@ 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"
       >
         <LabeledSelect
-          v-if="serverArgs && serverArgs.profile"
+          v-if="serverArgs && serverArgs.profile && serverConfig"
           v-model="serverConfig.profile"
           :mode="mode"
           :options="profileOptions"
@@ -558,7 +552,7 @@ export default {
           @input="$emit('cis-changed')"
         />
         <LabeledSelect
-          v-else-if="agentArgs && agentArgs.profile"
+          v-else-if="agentArgs && agentArgs.profile && agentConfig"
           v-model="agentConfig.profile"
           data-testid="rke2-custom-edit-cis-agent"
           :mode="mode"
@@ -583,19 +577,19 @@ 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">
         <!-- PSA template selector -->
         <LabeledSelect
+          :key="defaultPsaOptionLabel"
           v-model="value.spec.defaultPodSecurityAdmissionConfigurationTemplateName"
           :mode="mode"
           data-testid="rke2-custom-edit-psa"
@@ -623,7 +617,7 @@ export default {
     </div>
 
     <div
-      v-if="serverConfig.cni === 'cilium' && value.spec.enableNetworkPolicy"
+      v-if="showNetworkPolicyWarningBanner"
       class="row"
     >
       <div class="col span-12">

package/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue

@@ -0,0 +1,132 @@
+
+<script>
+import { Checkbox } from '@components/Form/Checkbox';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { _CREATE } from '@shell/config/query-params';
+
+export default {
+  name:       'DirectoryConfig',
+  components: {
+    Checkbox,
+    LabeledInput,
+  },
+  props: {
+    mode: {
+      type:     String,
+      required: true,
+    },
+
+    value: {
+      type:     Object,
+      required: true,
+    },
+  },
+  data() {
+    let atLeastOneDirWithAnIdentifier = false;
+    let allDirsWithSameIdentifier = false;
+
+    if (this.value.systemAgent.length || this.value.provisioning.length || this.value.k8sDistro.length) {
+      atLeastOneDirWithAnIdentifier = true;
+      if (this.value.systemAgent === this.value.provisioning && this.value.provisioning === this.value.k8sDistro &&
+      this.value.systemAgent === this.value.k8sDistro) {
+        allDirsWithSameIdentifier = true;
+      }
+    }
+
+    return {
+      isSettingCommonConfig: !(atLeastOneDirWithAnIdentifier && !allDirsWithSameIdentifier),
+      commonConfig:          allDirsWithSameIdentifier ? this.value.systemAgent : '',
+    };
+  },
+  watch: {
+    commonConfig(neu) {
+      if (neu && neu.length && this.isSettingCommonConfig) {
+        this.value.systemAgent = neu;
+        this.value.provisioning = neu;
+        this.value.k8sDistro = neu;
+      }
+    }
+  },
+  computed: {
+    disableEditInput() {
+      return this.mode !== _CREATE;
+    }
+  },
+  methods: {
+    handleCommonConfig(val) {
+      this.isSettingCommonConfig = val;
+
+      if (val) {
+        this.value.systemAgent = '';
+        this.value.provisioning = '';
+        this.value.k8sDistro = '';
+      } else {
+        this.commonConfig = '';
+      }
+    }
+  },
+};
+</script>
+
+<template>
+  <div class="row">
+    <div class="col span-8">
+      <h3 class="mb-20">
+        {{ t('cluster.directoryConfig.title') }}
+      </h3>
+      <Checkbox
+        class="mb-10"
+        :value="isSettingCommonConfig"
+        :mode="mode"
+        :label="t('cluster.directoryConfig.checkboxText')"
+        :disabled="disableEditInput"
+        data-testid="rke2-directory-config-individual-config-checkbox"
+        @input="handleCommonConfig"
+      />
+      <LabeledInput
+        v-if="isSettingCommonConfig"
+        v-model="commonConfig"
+        class="mb-20"
+        :mode="mode"
+        :label="t('cluster.directoryConfig.common.label')"
+        :tooltip="t('cluster.directoryConfig.common.tooltip')"
+        :disabled="disableEditInput"
+        data-testid="rke2-directory-config-common-data-dir"
+      />
+      <div v-if="!isSettingCommonConfig">
+        <LabeledInput
+          v-model="value.systemAgent"
+          class="mb-20"
+          :mode="mode"
+          :label="t('cluster.directoryConfig.systemAgent.label')"
+          :tooltip="t('cluster.directoryConfig.systemAgent.tooltip')"
+          :disabled="disableEditInput"
+          data-testid="rke2-directory-config-systemAgent-data-dir"
+        />
+        <LabeledInput
+          v-model="value.provisioning"
+          class="mb-20"
+          :mode="mode"
+          :label="t('cluster.directoryConfig.provisioning.label')"
+          :tooltip="t('cluster.directoryConfig.provisioning.tooltip')"
+          :disabled="disableEditInput"
+          data-testid="rke2-directory-config-provisioning-data-dir"
+        />
+        <LabeledInput
+          v-model="value.k8sDistro"
+          class="mb-20"
+          :mode="mode"
+          :label="t('cluster.directoryConfig.k8sDistro.label')"
+          :tooltip="t('cluster.directoryConfig.k8sDistro.tooltip')"
+          :disabled="disableEditInput"
+          data-testid="rke2-directory-config-k8sDistro-data-dir"
+        />
+      </div>
+      <div class="mb-40" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -342,6 +342,7 @@ 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/{S3Config.vue → tabs/etcd/S3Config.vue}

@@ -84,6 +84,7 @@ export default {
       :allow-s3="true"
       :namespace="namespace"
       generate-name="etcd-backup-s3-"
+      :cache-secrets="true"
       @input="update"
     />