@rancher/shell 3.0.7 → 3.0.8-rc.10

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

@@ -475,16 +475,17 @@ describe('component: rke2', () => {
         },
         provider: 'custom'
       },
-      data: () => ({
-        agentArgs: {
+      computed: {
+        ...rke2.computed,
+        agentArgs: () => ({
           'cloud-provider-name': {
             options: [
               'azure',
               'amazon'
             ]
           }
-        }
-      }),
+        })
+      },
       global: {
         mocks: {
           ...defaultMocks,
@@ -519,9 +520,10 @@ describe('component: rke2', () => {
         },
         provider: 'custom'
       },
-      data: () => ({
-        canAzureMigrateOnEdit: true,
-        agentArgs:             {
+      computed: {
+        ...rke2.computed,
+        canAzureMigrateOnEdit: () => true,
+        agentArgs:             () => ({
           'cloud-provider-name': {
             options: [
               'azure',
@@ -529,8 +531,8 @@ describe('component: rke2', () => {
               'external'
             ]
           }
-        }
-      }),
+        })
+      },
       global: {
         mocks: {
           ...defaultMocks,

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

@@ -163,9 +163,8 @@ export default {
     };
 
     this.extensions = this.$extension.getProviders(context);
-  },
 
-  data() {
+    // At this point, we know we definitely have the mgmt cluster, so we can access `isImported` and `isLocal`
     let subType = null;
 
     subType = this.$route.query[SUB_TYPE] || null;
@@ -176,6 +175,11 @@ export default {
     } else if (this.value.isLocal) {
       subType = LOCAL;
     }
+
+    this.subType = subType;
+  },
+
+  data() {
     const rkeType = this.$route.query[RKE_TYPE] || null;
     const chart = this.$route.query[CHART] || null;
     const isImport = this.realMode === _IMPORT;
@@ -184,7 +188,7 @@ export default {
       nodeDrivers:      [],
       kontainerDrivers: [],
       extensions:       [],
-      subType,
+      subType:          null,
       rkeType,
       chart,
       isImport,
@@ -216,7 +220,13 @@ export default {
       if (this.value) {
         // set subtype if editing EKS/GKE/AKS cluster -- this ensures that the component provided by extension is loaded instead of iframing old ember ui
         if (this.value.provisioner) {
-          const matchingSubtype = this.subTypes.find((st) => DRIVER_TO_IMPORT[st.id.toLowerCase()] === this.value.provisioner.toLowerCase());
+          const matchingSubtype = this.subTypes.find((st) => {
+            const typeLower = st.id.toLowerCase();
+            const provisionerLower = this.value.provisioner.toLowerCase();
+
+            // This allows extensions to provide type for edit without breaking edit for Ember kontainer providers
+            return (!!st.component && (typeLower === provisionerLower)) || (DRIVER_TO_IMPORT[typeLower] === provisionerLower);
+          });
 
           if (matchingSubtype) {
             this.selectType(matchingSubtype.id, false);
@@ -319,11 +329,12 @@ export default {
       const vueKontainerTypes = getters['plugins/clusterDrivers'];
       const machineTypes = this.nodeDrivers.filter((x) => x.spec.active && x.state === 'active');
 
+      // Keeping this for non Rancher-managed kontainer drivers
       this.kontainerDrivers.filter((x) => (isImport ? x.showImport : x.showCreate)).forEach((obj) => {
         if ( vueKontainerTypes.includes(obj.driverName) ) {
-          addType(this.$plugin, obj.driverName, 'kontainer', false);
+          addType(this.$plugin, obj.driverName, 'hosted', false);
         } else {
-          addType(this.$plugin, obj.driverName, 'kontainer', false, (isImport ? obj.emberImportPath : obj.emberCreatePath));
+          addType(this.$plugin, obj.driverName, 'hosted', false, (isImport ? obj.emberImportPath : obj.emberCreatePath));
         }
       });
       if (!isImport) {
@@ -382,17 +393,16 @@ export default {
         }
 
         const subtype = {
-          id:          ext.id,
-          label:       ext.label || getters['i18n/t'](`cluster.provider.${ ext.id }`),
-          description: ext.description,
+          id:        ext.id,
+          label:     ext.label || getters['i18n/t'](`cluster.provider.${ ext.id }`),
           icon,
           iconClass,
-          group:       ext.group || _RKE2,
-          disabled:    ext.disabled || false,
-          link:        ext.link,
-          tag:         ext.tag,
-          component:   ext.component,
-          hidden:      ext.hidden,
+          group:     ext.group || _RKE2,
+          disabled:  ext.disabled || false,
+          link:      ext.link,
+          tag:       ext.tag,
+          component: ext.component,
+          hidden:    ext.hidden,
         };
 
         out.push(subtype);

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

@@ -28,7 +28,7 @@ import {
 } from '@shell/utils/object';
 import { allHash } from '@shell/utils/promise';
 import {
-  getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon, initSchedulingCustomization
+  getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon, initSchedulingCustomization, addonConfigPreserve
 } from '@shell/utils/cluster';
 
 import { BadgeState } from '@components/BadgeState';
@@ -57,7 +57,7 @@ import { ExtensionPoint, TabLocation } from '@shell/core/types';
 import MemberRoles from '@shell/edit/provisioning.cattle.io.cluster/tabs/MemberRoles';
 import Basics from '@shell/edit/provisioning.cattle.io.cluster/tabs/Basics';
 import Etcd from '@shell/edit/provisioning.cattle.io.cluster/tabs/etcd';
-import Networking from '@shell/edit/provisioning.cattle.io.cluster/tabs/networking';
+import Networking, { STACK_PREFS } from '@shell/edit/provisioning.cattle.io.cluster/tabs/networking';
 import Upgrade from '@shell/edit/provisioning.cattle.io.cluster/tabs/upgrade';
 import Registries from '@shell/edit/provisioning.cattle.io.cluster/tabs/registries';
 import AddOnConfig from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig';
@@ -162,6 +162,10 @@ export default {
     this.schedulingCustomizationOriginallyEnabled = sc.schedulingCustomizationOriginallyEnabled;
     this.errors = this.errors.concat(sc.errors);
 
+    if (this.isEdit) {
+      this.originalKubeVersion = this.versionOptions.find((v) => v.value === this.liveValue.spec.kubernetesVersion);
+    }
+
     Object.entries(this.chartValues).forEach(([name, value]) => {
       const key = this.chartVersionKey(name);
 
@@ -215,6 +219,10 @@ export default {
       this.value.spec.rkeConfig.machineGlobalConfig = {};
     }
 
+    if (!this.value.spec.rkeConfig.networking) {
+      this.value.spec.rkeConfig.networking = {};
+    }
+
     if (!this.value.spec.rkeConfig.machineSelectorConfig?.length) {
       this.value.spec.rkeConfig.machineSelectorConfig = [{ config: {} }];
     }
@@ -264,6 +272,7 @@ export default {
       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)
+      stackPreferenceError:                     false, //  spec.networking.stackPreference is validated in conjunction with hasSomeIpv6Pools
       allNamespaces:                            [],
       extensionTabs:                            getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
       clusterAgentDeploymentCustomization:      null,
@@ -278,6 +287,9 @@ export default {
       REGISTRIES_TAB_NAME,
       labelForAddon,
       etcdConfigValid:                          true,
+      addonConfigDiffs:                         {},
+      originalKubeVersion:                      null,
+      isEmpty,
     };
   },
 
@@ -836,6 +848,10 @@ export default {
       }
     },
 
+    hasSomeIpv6Pools() {
+      return !!(this.machinePools || []).find((p) => p.hasIpv6);
+    },
+
     validationPassed() {
       const validRequiredPools = this.hasMachinePools ? this.hasRequiredNodes() : true;
 
@@ -846,8 +862,9 @@ export default {
 
       const hasAddonConfigErrors = Object.values(this.addonConfigValidation).filter((v) => v === false).length > 0;
 
-      return validRequiredPools && base && !hasAddonConfigErrors;
+      return validRequiredPools && base && !hasAddonConfigErrors && !this.stackPreferenceError;
     },
+
     currentCluster() {
       if (this.mode === _EDIT) {
         return { ...this.value };
@@ -855,6 +872,7 @@ export default {
         return this.$store.getters['customisation/getPreviewCluster'];
       }
     },
+
     localValue: {
       get() {
         return this.value;
@@ -863,6 +881,7 @@ export default {
         this.$emit('update:value', newValue);
       }
     },
+
     hideFooter() {
       return this.needCredential && !this.credentialId;
     },
@@ -872,6 +891,7 @@ export default {
             this.fvFormIsValid &&
             this.etcdConfigValid;
     },
+
   },
 
   watch: {
@@ -921,8 +941,22 @@ export default {
       }
     },
 
-    selectedVersion() {
-      this.versionInfo = {}; // Invalidate cache such that version info relevent to selected kube version is updated
+    async selectedVersion(neu) {
+      if (this.isEdit) {
+        const {
+          addonConfigDiffs, addonNames, userChartValues, $store
+        } = this;
+
+        await addonConfigPreserve(
+          {
+            addonConfigDiffs, addonNames, userChartValues, $store
+          },
+          this.originalKubeVersion?.charts,
+          neu?.charts
+        );
+      }
+
+      this.versionInfo = {}; // Invalidate cache such that version info relevant to selected kube version is updated
 
       // Allow time for addonNames to update... then fetch any missing addons
       this.$nextTick(() => this.initAddons());
@@ -954,6 +988,18 @@ export default {
         this.agentConfig['cloud-provider-name'] = undefined;
       }
     },
+
+    hasSomeIpv6Pools(neu) {
+      if (this.isCreate && this.localValue.spec.rkeConfig.networking.stackPreference !== STACK_PREFS.IPV6) { // if stack pref is ipv6, the user has manually configured that and we shouldn't change it
+        if (neu) {
+          this.localValue.spec.rkeConfig.networking.stackPreference = STACK_PREFS.DUAL;
+
+          return;
+        }
+
+        this.localValue.spec.rkeConfig.networking.stackPreference = STACK_PREFS.IPV4;
+      }
+    },
   },
 
   created() {
@@ -1282,13 +1328,14 @@ export default {
       const name = `pool${ ++this.lastIdx }`;
 
       const pool = {
-        id:     name,
+        id:      name,
         config,
-        remove: false,
-        create: true,
-        update: false,
-        uid:    name,
-        pool:   {
+        remove:  false,
+        create:  true,
+        update:  false,
+        uid:     name,
+        hasIpv6: false,
+        pool:    {
           name,
           etcdRole:             numCurrentPools === 0,
           controlPlaneRole:     numCurrentPools === 0,
@@ -1511,10 +1558,15 @@ export default {
       });
     },
 
-    showAddonConfirmation() {
-      return new Promise((resolve, reject) => {
+    showAddonConfirmation(addonNames, previousKubeVersion, newKubeVersion) {
+      return new Promise((resolve) => {
         this.$store.dispatch('cluster/promptModal', {
-          component: 'AddonConfigConfirmationDialog',
+          component:      'AddonConfigConfirmationDialog',
+          componentProps: {
+            addonNames,
+            previousKubeVersion,
+            newKubeVersion
+          },
           resources: [(value) => resolve(value)]
         });
       });
@@ -1555,10 +1607,28 @@ export default {
       const isEditVersion = this.isEdit && this.liveValue?.spec?.kubernetesVersion !== this.value?.spec?.kubernetesVersion;
 
       if (isEditVersion) {
-        const shouldContinue = await this.showAddonConfirmation();
+        const hasDiffs = Object.values(this.addonConfigDiffs).some((d) => !isEmpty(d));
 
-        if (!shouldContinue) {
-          return btnCb('cancelled');
+        if (hasDiffs) {
+          const addonNamesWithDiffs = [];
+
+          for (const name in this.addonConfigDiffs) {
+            const diff = this.addonConfigDiffs[name];
+
+            if (!isEmpty(diff)) {
+              addonNamesWithDiffs.push(name);
+            }
+          }
+
+          const shouldContinue = await this.showAddonConfirmation(
+            addonNamesWithDiffs,
+            this.liveValue.spec.kubernetesVersion,
+            this.value.spec.kubernetesVersion
+          );
+
+          if (!shouldContinue) {
+            return btnCb('cancelled');
+          }
         }
       }
 
@@ -2187,6 +2257,7 @@ export default {
     handleTabChange(data) {
       this.activeTab = data;
     },
+
   }
 };
 </script>
@@ -2369,6 +2440,7 @@ export default {
           :side-tabs="true"
           class="min-height"
           :use-hash="useTabbedHash"
+          :default-tab="defaultTab"
           @changed="handleTabChange"
         >
           <Tab
@@ -2401,6 +2473,7 @@ export default {
               :cloud-provider-options="cloudProviderOptions"
               :is-azure-provider-unsupported="isAzureProviderUnsupported"
               :can-azure-migrate-on-edit="canAzureMigrateOnEdit"
+              :has-some-ipv6-pools="hasSomeIpv6Pools"
               @update:value="$emit('input', $event)"
               @cilium-values-changed="handleCiliumValuesChanged"
               @enabled-system-services-changed="handleEnabledSystemServicesChanged"
@@ -2448,12 +2521,15 @@ export default {
             v-if="haveArgInfo"
             name="networking"
             label-key="cluster.tabs.networking"
+            :error="stackPreferenceError"
           >
             <Networking
               v-model:value="localValue"
               :mode="mode"
               :selected-version="selectedVersion"
               :truncate-limit="truncateLimit"
+              :machine-pools="machinePools"
+              :has-some-ipv6-pools="hasSomeIpv6Pools"
               @truncate-hostname-changed="truncateHostname"
               @cluster-cidr-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['cluster-cidr'] = val"
               @service-cidr-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['service-cidr'] = val"
@@ -2464,6 +2540,8 @@ export default {
               @local-cluster-auth-endpoint-changed="enableLocalClusterAuthEndpoint"
               @ca-certs-changed="(val)=>localValue.spec.localClusterAuthEndpoint.caCerts = val"
               @fqdn-changed="(val)=>localValue.spec.localClusterAuthEndpoint.fqdn = val"
+              @stack-preference-changed="(val)=>localValue.spec.rkeConfig.networking.stackPreference = val"
+              @validationChanged="(val)=>stackPreferenceError = !val"
             />
           </Tab>
 
@@ -2521,6 +2599,9 @@ export default {
               :addons-rev="addonsRev"
               :user-chart-values-temp="userChartValuesTemp"
               :init-yaml-editor="initYamlEditor"
+              :has-diff="!isEmpty(addonConfigDiffs[v.name])"
+              :previous-kube-version="liveValue?.spec?.kubernetesVersion"
+              :new-kube-version="value.spec.kubernetesVersion"
               @update:value="$emit('input', $event)"
               @update-questions="syncChartValues"
               @update-values="updateValues"

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

@@ -48,6 +48,27 @@ export default {
     initYamlEditor: {
       type:     Function,
       required: true,
+    },
+    /**
+     * Indicates if a configuration conflict was detected for this addon.
+     */
+    hasDiff: {
+      type:    Boolean,
+      default: false
+    },
+    /**
+     * The Kubernetes version the user is upgrading from.
+     */
+    previousKubeVersion: {
+      type:    String,
+      default: ''
+    },
+    /**
+     * The Kubernetes version the user is upgrading to.
+     */
+    newKubeVersion: {
+      type:    String,
+      default: ''
     }
 
   },
@@ -73,10 +94,15 @@ export default {
 <template>
   <div>
     <Banner
-      v-if="isEdit"
+      v-if="isEdit && hasDiff"
       color="warning"
     >
-      {{ t('cluster.addOns.dependencyBanner') }}
+      <span
+        v-clean-html="t('cluster.addOns.dependencyBanner', {
+          previousKubeVersion,
+          newKubeVersion
+        }, true)"
+      />
     </Banner>
     <div
       v-if="versionInfo && addonVersion"

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

@@ -10,6 +10,7 @@ import UnitInput from '@shell/components/form/UnitInput.vue';
 import { randomStr } from '@shell/utils/string';
 import FormValidation from '@shell/mixins/form-validation';
 import { MACHINE_POOL_VALIDATION } from '@shell/utils/validators/machine-pool';
+import { isAutoscalerFeatureFlagEnabled } from '@shell/utils/autoscaler-utils';
 
 export default {
 
@@ -99,6 +100,14 @@ export default {
       MACHINE_POOL_VALIDATION,
 
       fvFormRuleSets: MACHINE_POOL_VALIDATION.RULESETS,
+      fvExtraRules:   {
+        isAutoscalerMaxGreaterThanMin: () => {
+          const min = this.value?.pool?.autoscalingMinSize || 0;
+          const max = this.value?.pool?.autoscalingMaxSize || 0;
+
+          return max - min >= 0 ? undefined : this.t('cluster.machinePool.autoscaler.validation.isAutoscalerMaxGreaterThanMin');
+        }
+      }
     };
   },
 
@@ -113,6 +122,25 @@ export default {
 
     isWindows() {
       return this.value?.config?.os === 'windows';
+    },
+
+    isAutoscalerFeatureEnabled() {
+      return isAutoscalerFeatureFlagEnabled(this.$store);
+    },
+
+    isAutoscalerEnabled: {
+      get() {
+        return typeof this.value?.pool?.autoscalingMinSize !== 'undefined' || typeof this.value?.pool?.autoscalingMinSize !== 'undefined';
+      },
+      set(val) {
+        if (!val) {
+          delete this.value.pool.autoscalingMinSize;
+          delete this.value.pool.autoscalingMaxSize;
+        } else {
+          this.value.pool.autoscalingMinSize = 1;
+          this.value.pool.autoscalingMaxSize = 2;
+        }
+      }
     }
   },
 
@@ -139,7 +167,18 @@ export default {
         this.$emit('validationChanged', newValue);
       },
       deep: true
-    }
+    },
+
+    'value.pool.etcdRole'(neu) {
+      if (neu) {
+        this.isAutoscalerEnabled = false;
+      }
+    },
+    'value.pool.controlPlaneRole'(neu) {
+      if (neu) {
+        this.isAutoscalerEnabled = false;
+      }
+    },
   },
 
   /**
@@ -262,6 +301,7 @@ export default {
       </div>
       <div class="col span-4">
         <LabeledInput
+          v-if="!isAutoscalerFeatureEnabled || !isAutoscalerEnabled"
           v-model:value.number="value.pool.quantity"
           :mode="mode"
           :label="t('cluster.machinePool.quantity.label')"
@@ -272,6 +312,15 @@ export default {
           :rules="fvGetAndReportPathRules(MACHINE_POOL_VALIDATION.FIELDS.QUANTITY)"
           data-testid="machine-pool-quantity-input"
         />
+        <LabeledInput
+          v-else
+          :value="t('cluster.machinePool.autoscaler.machineCountValueOverride')"
+          :mode="mode"
+          :label="t('cluster.machinePool.quantity.label')"
+          :disabled="true"
+          :required="true"
+          data-testid="machine-pool-quantity-input"
+        />
       </div>
       <div class="col span-4 pt-5">
         <h3>
@@ -305,6 +354,7 @@ export default {
       :is="configComponent"
       v-if="value.config && configComponent"
       ref="configComponent"
+      v-model:has-ipv6="value.hasIpv6"
       :cluster="cluster"
       :uuid="uuid"
       :mode="mode"
@@ -344,15 +394,18 @@ export default {
       />
 
       <div class="spacer" />
+      <h3>
+        {{ t('cluster.machinePool.automation.label') }}
+      </h3>
       <div class="row">
         <div class="col span-4">
-          <h3>
+          <h4>
             {{ t('cluster.machinePool.autoReplace.label') }}
             <i
               v-clean-tooltip="t('cluster.machinePool.autoReplace.toolTip')"
               class="icon icon-info icon-lg"
             />
-          </h3>
+          </h4>
           <UnitInput
             v-model:value="unhealthyNodeTimeoutInteger"
             :hide-arrows="true"
@@ -365,9 +418,9 @@ export default {
           />
         </div>
         <div class="col span-4">
-          <h3>
+          <h4>
             {{ t('cluster.machinePool.drain.header') }}
-          </h3>
+          </h4>
           <Checkbox
             v-model:value="value.pool.drainBeforeDelete"
             :mode="mode"
@@ -376,6 +429,55 @@ export default {
           />
         </div>
       </div>
+      <div v-if="isAutoscalerFeatureEnabled">
+        <div class="row mt-10">
+          <div class="col span-12">
+            <h4>
+              {{ t('cluster.machinePool.autoscaler.heading') }}
+            </h4>
+            <Banner
+              v-if="value.pool.etcdRole || value.pool.controlPlaneRole"
+              color="warning"
+              label-key="cluster.machinePool.autoscaler.etcdControlPlaneWarning"
+            />
+            <Checkbox
+              v-model:value="isAutoscalerEnabled"
+              :mode="mode"
+              :label="t('cluster.machinePool.autoscaler.enable', undefined, true)"
+              :disabled="value.pool.etcdRole || value.pool.controlPlaneRole || busy"
+            />
+          </div>
+        </div>
+        <div
+          v-if="isAutoscalerEnabled"
+          class="row"
+        >
+          <div class="col span-4">
+            <UnitInput
+              v-model:value="value.pool.autoscalingMinSize"
+              :label="t('cluster.machinePool.autoscaler.min')"
+              :hide-arrows="true"
+              :placeholder="t('containerResourceLimit.cpuPlaceholder')"
+              :mode="mode"
+              :base-unit="t('cluster.machinePool.autoscaler.baseUnit')"
+              :rules="fvGetAndReportPathRules(MACHINE_POOL_VALIDATION.FIELDS.AUTOSCALER_MIN)"
+              :disabled="value.pool.etcdRole || value.pool.controlPlaneRole || busy"
+            />
+          </div>
+          <div class="col span-4">
+            <UnitInput
+              v-model:value="value.pool.autoscalingMaxSize"
+              :label="t('cluster.machinePool.autoscaler.max')"
+              :hide-arrows="true"
+              :placeholder="t('containerResourceLimit.cpuPlaceholder')"
+              :mode="mode"
+              :base-unit="t('cluster.machinePool.autoscaler.baseUnit')"
+              :rules="fvGetAndReportPathRules(MACHINE_POOL_VALIDATION.FIELDS.AUTOSCALER_MAX)"
+              :disabled="value.pool.etcdRole || value.pool.controlPlaneRole || busy"
+            />
+          </div>
+        </div>
+      </div>
       <div class="spacer" />
       <KeyValue
         v-model:value="value.pool.labels"