@rancher/shell 3.0.2-rc.5 → 3.0.2

package/edit/provisioning.cattle.io.cluster/__tests__/CustomCommand.test.ts

@@ -1,5 +1,7 @@
 import { mount } from '@vue/test-utils';
 import CustomCommand from '@shell/edit/provisioning.cattle.io.cluster/CustomCommand.vue';
+import { clone } from '@shell/utils/object';
+
 jest.mock('@shell/utils/clipboard', () => {
   return { copyTextToClipboard: jest.fn(() => Promise.resolve({})) };
 });
@@ -8,9 +10,9 @@ describe('component: CustomCommand', () => {
   const token = 'MY_TOKEN';
   const ip = 'MY_IP';
   const checkSum = 'MY_CHECKSUM';
-  const wrapper = mount(CustomCommand, {
+  const customCommandConfig = {
     props: {
-      cluster:      {},
+      cluster:      { },
       clusterToken: {
         insecureNodeCommand: ` curl --insecure -fL ${ ip }/system-agent-install.sh | sudo  sh -s - --server ${ ip } --label 'cattle.io/os=linux' --token ${ token } --ca-checksum ${ checkSum }`,
         nodeCommand:         ` curl -fL ${ ip }/system-agent-install.sh | sudo  sh -s - --server ${ ip } --label 'cattle.io/os=linux' --token ${ token } --ca-checksum ${ checkSum }`
@@ -40,28 +42,34 @@ describe('component: CustomCommand', () => {
         },
       },
     },
-  });
+  };
 
-  it('should return linux commands with the right flags based on cluster information', () => {
-    const value = `curl -fL ${ ip }/system-agent-install.sh | sudo  sh -s - --server ${ ip } --label 'cattle.io/os=linux' --token ${ token } --ca-checksum ${ checkSum } --etcd --controlplane --worker`;
-    const element = wrapper.find('#copiedLinux').element;
+  describe('should show basic messaging', () => {
+    const wrapper = mount(CustomCommand, customCommandConfig);
 
-    expect(element.textContent).toContain(value);
-  });
+    it('should return linux commands with the right flags based on cluster information', () => {
+      const value = `curl -fL ${ ip }/system-agent-install.sh | sudo  sh -s - --server ${ ip } --label 'cattle.io/os=linux' --token ${ token } --ca-checksum ${ checkSum } --etcd --controlplane --worker`;
+      const element = wrapper.find('#copiedLinux').element;
 
-  it('should not display warning message if all node roles are selected', async() => {
-    await wrapper.setData({
-      controlPlane: true,
-      etcd:         true,
-      worker:       true,
+      expect(element.textContent).toContain(value);
     });
 
-    const element = wrapper.find('[data-testid="node-role-warning"]');
+    it('should not display warning message if all node roles are selected', async() => {
+      await wrapper.setData({
+        controlPlane: true,
+        etcd:         true,
+        worker:       true,
+      });
+
+      const element = wrapper.find('[data-testid="node-role-warning"]');
 
-    expect(element.exists()).toBe(false);
+      expect(element.exists()).toBe(false);
+    });
   });
 
   describe('should display warning message if at least one of the node roles is unselected', () => {
+    const wrapper = mount(CustomCommand, customCommandConfig);
+
     it.each([
       [true, true, false],
       [true, false, true],
@@ -86,4 +94,36 @@ describe('component: CustomCommand', () => {
       expect(element).toBeDefined();
     });
   });
+
+  describe('should show windows messaging when appropriate', () => {
+    it('should show ready for windows banner if the cluster supports windows', () => {
+      const config = clone(customCommandConfig);
+
+      config.props.cluster = {
+        supportsWindows: true,
+        mgmt:            { isReady: true },
+        nodes:           [
+          { isWorker: true },
+          { isEtcd: true },
+          { isControlPlane: true }
+        ]
+      };
+      const wrapper = mount(CustomCommand, config);
+
+      const element = wrapper.find('[data-testid="ready-for-windows"]');
+
+      expect(element.exists()).toBe(true);
+    });
+
+    it('should NOT show ready for windows banner if the cluster supports windows', () => {
+      const config = clone(customCommandConfig);
+
+      config.props.cluster = { supportsWindows: true };
+      const wrapper = mount(CustomCommand, config);
+
+      const element = wrapper.find('[data-testid="windows-not-ready"]');
+
+      expect(element.exists()).toBe(true);
+    });
+  });
 });

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

@@ -1,6 +1,7 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
 import Loading from '@shell/components/Loading';
+import { Banner } from '@components/Banner';
 import CruResource from '@shell/components/CruResource';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
 import EmberPage from '@shell/components/EmberPage';
@@ -19,7 +20,6 @@ import { allHash } from '@shell/utils/promise';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { ELEMENTAL_PRODUCT_NAME, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
 import Rke2Config from './rke2';
-import Import from './import';
 import { DRIVER_TO_IMPORT } from '@shell/models/management.cattle.io.kontainerdriver';
 
 const SORT_GROUPS = {
@@ -46,11 +46,11 @@ export default {
   components: {
     CruResource,
     EmberPage,
-    Import,
     Loading,
     Rke2Config,
     SelectIconGrid,
-    ToggleSwitch
+    ToggleSwitch,
+    Banner
   },
 
   mixins: [CreateEditView],
@@ -345,10 +345,7 @@ export default {
           addType(this.$plugin, obj.driverName, 'kontainer', false, (isImport ? obj.emberImportPath : obj.emberCreatePath));
         }
       });
-
-      if ( isImport ) {
-        addType(this.$plugin, 'import', 'custom', false);
-      } else {
+      if (!isImport) {
         templates.forEach((chart) => {
           out.push({
             id:          `chart:${ chart.id }`,
@@ -385,23 +382,26 @@ export default {
 
           addType(this.$plugin, 'custom', 'custom2', false);
         }
-
-        // Add from extensions
-        this.extensions.forEach((ext) => {
+      }
+      // Add from extensions
+      this.extensions.forEach((ext) => {
         // if the rke toggle is set to rke1, don't add extensions that specify rke2 group
         // default group is rke2
-          if (!this.isRke2 && (ext.group === _RKE2 || !ext.group)) {
-            return;
-          }
-          // Do not show the extension provisioner on the import cluster page unless its explicitly set to do so
-          if (isImport && !ext.showImport) {
-            return;
-          }
-          // Allow extensions to overwrite provisioners with the same id
-          out = out.filter((type) => type.id !== ext.id);
-          addExtensionType(ext, getters);
-        });
-      }
+        if (!this.isRke2 && (ext.group === _RKE2 || !ext.group)) {
+          return;
+        }
+        // Do not show the extension provisioner on the import cluster page unless its explicitly set to do so
+        if (isImport && !ext.showImport) {
+          return;
+        }
+        // Do not show the extension provisioner on create if it is disabled
+        if (!isImport && !!ext.hideCreate) {
+          return;
+        }
+        // Allow extensions to overwrite provisioners with the same id
+        out = out.filter((type) => type.id !== ext.id);
+        addExtensionType(ext, getters);
+      });
 
       return out;
 
@@ -669,6 +669,11 @@ export default {
           </div>
           {{ obj.label }}
         </h4>
+        <Banner
+          v-if="provisioner === _RKE1 && i === 1"
+          color="warning"
+          label-key="cluster.banner.rke1DeprecationShortMessage"
+        />
         <SelectIconGrid
           :rows="obj.types"
           key-field="id"
@@ -681,14 +686,7 @@ export default {
       </div>
     </template>
 
-    <Import
-      v-if="isImport"
-      v-model:value="localValue"
-      :mode="mode"
-      :provider="subType"
-      @update:value="$emit('input', $event)"
-    />
-    <template v-else-if="subType">
+    <template v-if="subType">
       <!-- allow extensions to provide their own cluster provisioning form -->
       <component
         :is="selectedSubType.component"

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

@@ -47,7 +47,7 @@ import Labels from '@shell/edit/provisioning.cattle.io.cluster/Labels';
 import MachinePool from '@shell/edit/provisioning.cattle.io.cluster/tabs/MachinePool';
 import SelectCredential from './SelectCredential';
 import { ELEMENTAL_SCHEMA_IDS, KIND, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
-import AgentConfiguration from '@shell/edit/provisioning.cattle.io.cluster/tabs/AgentConfiguration';
+import AgentConfiguration from '@shell/edit/provisioning.cattle.io.cluster/tabs/AgentConfiguration.vue';
 import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
 import { ExtensionPoint, TabLocation } from '@shell/core/types';
 import MemberRoles from '@shell/edit/provisioning.cattle.io.cluster/tabs/MemberRoles';
@@ -62,7 +62,8 @@ import { DEFAULT_COMMON_BASE_PATH, DEFAULT_SUBDIRS } from '@shell/edit/provision
 import ClusterAppearance from '@shell/components/form/ClusterAppearance';
 import AddOnAdditionalManifest from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnAdditionalManifest';
 import VsphereUtils, { VMWARE_VSPHERE } from '@shell/utils/v-sphere';
-
+import { mapGetters } from 'vuex';
+import { SCHEDULING_CUSTOMIZATION } from '@shell/store/features';
 const HARVESTER = 'harvester';
 const HARVESTER_CLOUD_PROVIDER = 'harvester-cloud-provider';
 const NETBIOS_TRUNCATION_LENGTH = 15;
@@ -87,6 +88,8 @@ const NODE_TOTAL = {
 const CLUSTER_AGENT_CUSTOMIZATION = 'clusterAgentDeploymentCustomization';
 const FLEET_AGENT_CUSTOMIZATION = 'fleetAgentDeploymentCustomization';
 
+const REGISTRIES_TAB_NAME = 'registry';
+
 const isAzureK8sUnsupported = (version) => semver.gte(version, '1.30.0');
 
 export default {
@@ -146,6 +149,7 @@ export default {
     await this.initSpecs();
     await this.initAddons();
     await this.initRegistry();
+    await this.initSchedulingCustomization();
 
     Object.entries(this.chartValues).forEach(([name, value]) => {
       const key = this.chartVersionKey(name);
@@ -239,20 +243,31 @@ export default {
       fvFormRuleSets:                  [{
         path: 'metadata.name', rules: ['subDomain'], translationKey: 'nameNsDescription.name.label'
       }],
-      harvesterVersionRange: {},
-      cisOverride:           false,
+      harvesterVersionRange:                 {},
+      cisOverride:                           false,
       truncateLimit,
-      busy:                  false,
-      machinePoolValidation: {}, // map of validation states for each machine pool
-      machinePoolErrors:     {},
-      addonConfigValidation: {}, // validation state of each addon config (boolean of whether codemirror's yaml lint passed)
-      allNamespaces:         [],
-      extensionTabs:         getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
+      busy:                                  false,
+      machinePoolValidation:                 {}, // map of validation states for each machine pool
+      machinePoolErrors:                     {},
+      addonConfigValidation:                 {}, // validation state of each addon config (boolean of whether codemirror's yaml lint passed)
+      allNamespaces:                         [],
+      extensionTabs:                         getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
+      clusterAgentDeploymentCustomization:   null,
+      schedulingCustomizationFeatureEnabled: false,
+      clusterAgentDefaultPC:                 null,
+      clusterAgentDefaultPDB:                null,
+      activeTab:                             null,
+      REGISTRIES_TAB_NAME,
       labelForAddon
+
     };
   },
 
   computed: {
+    ...mapGetters({ features: 'features/get' }),
+    isActiveTabRegistries() {
+      return this.activeTab?.selectedName === REGISTRIES_TAB_NAME;
+    },
     clusterName() {
       return this.value.metadata?.name || '';
     },
@@ -1047,6 +1062,32 @@ export default {
       }
     },
 
+    async initSchedulingCustomization() {
+      this.schedulingCustomizationFeatureEnabled = this.features(SCHEDULING_CUSTOMIZATION);
+      try {
+        this.clusterAgentDefaultPC = JSON.parse((await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.CLUSTER_AGENT_DEFAULT_PRIORITY_CLASS })).value) || null;
+      } catch (e) {
+        this.errors.push(e);
+      }
+      try {
+        this.clusterAgentDefaultPDB = JSON.parse((await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.CLUSTER_AGENT_DEFAULT_POD_DISTRIBUTION_BUDGET })).value) || null;
+      } catch (e) {
+        this.errors.push(e);
+      }
+
+      if (this.schedulingCustomizationFeatureEnabled && this.mode === _CREATE && isEmpty(this.value?.spec?.clusterAgentDeploymentCustomization?.schedulingCustomization)) {
+        set(this.value, 'spec.clusterAgentDeploymentCustomization.schedulingCustomization', { priorityClass: this.clusterAgentDefaultPC, podDisruptionBudget: this.clusterAgentDefaultPDB });
+      }
+    },
+
+    setSchedulingCustomization(val) {
+      if (val) {
+        set(this.value, 'spec.clusterAgentDeploymentCustomization.schedulingCustomization', { priorityClass: this.clusterAgentDefaultPC, podDisruptionBudget: this.clusterAgentDefaultPDB });
+      } else {
+        delete this.value.spec.clusterAgentDeploymentCustomization.schedulingCustomization;
+      }
+    },
+
     cleanAgentConfiguration(model, key) {
       if (!model || !model[key]) {
         return;
@@ -1660,7 +1701,7 @@ export default {
       const defaultChartValue = this.versionInfo[name];
       const key = this.chartVersionKey(name);
 
-      return mergeWithReplaceArrays(defaultChartValue?.values, this.userChartValues[key]);
+      return merge({}, defaultChartValue?.values || {}, this.userChartValues[key] || {});
     },
 
     initServerAgentArgs() {
@@ -2051,6 +2092,10 @@ export default {
     addonConfigValidationChanged(configName, isValid) {
       this.addonConfigValidation[configName] = isValid;
     },
+
+    handleTabChange(data) {
+      this.activeTab = data;
+    }
   }
 };
 </script>
@@ -2218,6 +2263,7 @@ export default {
       <Tabbed
         :side-tabs="true"
         class="min-height"
+        @changed="handleTabChange"
       >
         <Tab
           name="basic"
@@ -2328,10 +2374,11 @@ export default {
 
         <!-- Registries -->
         <Tab
-          name="registry"
+          :name="REGISTRIES_TAB_NAME"
           label-key="cluster.tabs.registry"
         >
           <Registries
+            v-if="isActiveTabRegistries"
             v-model:value="localValue"
             :mode="mode"
             :register-before-hook="registerBeforeHook"
@@ -2391,15 +2438,19 @@ export default {
 
         <!-- Cluster Agent Configuration -->
         <Tab
+          v-if="value.spec.clusterAgentDeploymentCustomization"
           name="clusteragentconfig"
           label-key="cluster.agentConfig.tabs.cluster"
         >
           <AgentConfiguration
-            v-if="value.spec.clusterAgentDeploymentCustomization"
             v-model:value="value.spec.clusterAgentDeploymentCustomization"
             data-testid="rke2-cluster-agent-config"
             type="cluster"
             :mode="mode"
+            :scheduling-customization-feature-enabled="schedulingCustomizationFeatureEnabled"
+            :default-p-c="clusterAgentDefaultPC"
+            :default-p-d-b="clusterAgentDefaultPDB"
+            @scheduling-customization-changed="setSchedulingCustomization"
           />
         </Tab>
 

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

@@ -5,10 +5,11 @@ import PodAffinity from '@shell/components/form/PodAffinity';
 import NodeAffinity from '@shell/components/form/NodeAffinity';
 import ContainerResourceLimit from '@shell/components/ContainerResourceLimit';
 import Tolerations from '@shell/components/form/Tolerations';
+import SchedulingCustomization from '@shell/components/form/SchedulingCustomization';
 import { cleanUp } from '@shell/utils/object';
 import { fetchSetting } from '@shell/utils/settings';
 import { RadioGroup } from '@components/Form/Radio';
-
+import { _EDIT } from '@shell/config/query-params';
 // Affinity radio button choices
 const DEFAULT = 'default';
 const CUSTOM = 'custom';
@@ -16,7 +17,7 @@ const CUSTOM = 'custom';
 // This is the form for Agent Configuration
 // Used for both Cluster Agent and Fleet Agent configuration
 export default {
-  emits: ['input'],
+  emits: ['input', 'scheduling-customization-changed'],
 
   components: {
     Banner,
@@ -26,6 +27,7 @@ export default {
     NodeAffinity,
     RadioGroup,
     Tolerations,
+    SchedulingCustomization
   },
   props: {
     value: {
@@ -41,6 +43,18 @@ export default {
     type: {
       type:     String,
       required: true,
+    },
+    schedulingCustomizationFeatureEnabled: {
+      type:     Boolean,
+      required: false
+    },
+    defaultPC: {
+      type:    Object,
+      default: () => {},
+    },
+    defaultPDB: {
+      type:    Object,
+      default: () => {},
     }
   },
 
@@ -130,6 +144,13 @@ export default {
         this.value['overrideResourceRequirements'] = cleanUp(out);
       },
     },
+    isEdit() {
+      return this.mode === _EDIT;
+    },
+
+    schedulingCustomizationVisible() {
+      return this.schedulingCustomizationFeatureEnabled || (this.isEdit && this.value.schedulingCustomization );
+    },
 
     affinityOptions() {
       return [{
@@ -289,6 +310,20 @@ export default {
         @update:value="updateNodeAffinity"
       />
     </GroupPanel>
+    <GroupPanel
+      v-if="schedulingCustomizationVisible"
+      label-key="cluster.agentConfig.groups.schedulingCustomization"
+      class="mt-20"
+    >
+      <SchedulingCustomization
+        :value="value.schedulingCustomization"
+        :mode="mode"
+        :feature="schedulingCustomizationFeatureEnabled"
+        :default-p-c="defaultPC"
+        :default-p-d-b="defaultPDB"
+        @scheduling-customization-changed="$emit('scheduling-customization-changed', $event)"
+      />
+    </GroupPanel>
   </div>
 </template>
 

package/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue

@@ -91,6 +91,7 @@ export default {
           :mode="mode"
           :label="t('cluster.rke2.etcd.snapshotRetention.label')"
           :suffix="t('cluster.rke2.snapshots.suffix')"
+          :tooltip="t('cluster.rke2.etcd.snapshotRetention.tooltip')"
         />
       </div>
     </div>
@@ -102,8 +103,8 @@ export default {
         :value="s3Backup"
         name="etcd-s3"
         :options="[false, true]"
-        label="Backup Snapshots to S3"
-        :labels="['Disable','Enable']"
+        :label="t('cluster.rke2.etcd.s3backups.label')"
+        :labels="[t('generic.disable'),t('generic.enable')]"
         :mode="mode"
         @update:value="$emit('s3-backup-changed', $event)"
       />