@rancher/shell 3.0.8-rc.2 → 3.0.8-rc.3

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

@@ -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';
@@ -219,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: {} }];
     }
@@ -268,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,
@@ -843,6 +848,10 @@ export default {
       }
     },
 
+    hasSomeIpv6Pools() {
+      return !!(this.machinePools || []).find((p) => p.hasIpv6);
+    },
+
     validationPassed() {
       const validRequiredPools = this.hasMachinePools ? this.hasRequiredNodes() : true;
 
@@ -853,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 };
@@ -862,6 +872,7 @@ export default {
         return this.$store.getters['customisation/getPreviewCluster'];
       }
     },
+
     localValue: {
       get() {
         return this.value;
@@ -870,6 +881,7 @@ export default {
         this.$emit('update:value', newValue);
       }
     },
+
     hideFooter() {
       return this.needCredential && !this.credentialId;
     },
@@ -879,6 +891,7 @@ export default {
             this.fvFormIsValid &&
             this.etcdConfigValid;
     },
+
   },
 
   watch: {
@@ -975,6 +988,17 @@ export default {
         this.agentConfig['cloud-provider-name'] = undefined;
       }
     },
+
+    hasSomeIpv6Pools(neu) {
+      const stackPreference = this.localValue.spec.rkeConfig.networking.stackPreference;
+
+      if (neu && (stackPreference === STACK_PREFS.IPV4 || !stackPreference)) { // localValue.spec.rkeConfig.networking is initialized in the beforeCreate hook
+        this.localValue.spec.rkeConfig.networking.stackPreference = STACK_PREFS.DUAL;
+      } else if (stackPreference === STACK_PREFS.DUAL) {
+        this.localValue.spec.rkeConfig.networking.stackPreference = STACK_PREFS.IPV4;
+      }
+    },
+
   },
 
   created() {
@@ -1303,13 +1327,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,
@@ -2445,6 +2470,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"
@@ -2492,12 +2518,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"
@@ -2508,6 +2537,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>
 

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"

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

@@ -5,15 +5,22 @@ import { Checkbox } from '@components/Form/Checkbox';
 import { _EDIT, _VIEW } from '@shell/config/query-params';
 import ArrayList from '@shell/components/form/ArrayList';
 import ACE from '@shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
 
 const NETBIOS_TRUNCATION_LENGTH = 15;
 
+export const STACK_PREFS = {
+  IPV4: 'ipv4',
+  IPV6: 'ipv6',
+  DUAL: 'dual'
+};
+
 export default {
   emits: [
     'update:value', 'cluster-cidr-changed', 'local-cluster-auth-endpoint-changed',
     'service-cidr-changed', 'cluster-domain-changed', 'cluster-dns-changed',
     'truncate-hostname-changed', 'ca-certs-changed', 'service-node-port-range-changed',
-    'fqdn-changed', 'tls-san-changed'
+    'fqdn-changed', 'tls-san-changed', 'stack-preference-changed', 'validationChanged'
   ],
 
   components: {
@@ -21,7 +28,8 @@ export default {
     Banner,
     Checkbox,
     ArrayList,
-    ACE
+    ACE,
+    LabeledSelect
   },
 
   props: {
@@ -34,17 +42,28 @@ export default {
       type:     Object,
       required: true,
     },
+
     selectedVersion: {
       type:     Object,
       required: true,
     },
+
     truncateLimit: {
       type:     Number,
       required: false,
       default:  0
+    },
+
+    hasSomeIpv6Pools: {
+      type:    Boolean,
+      default: false
     }
   },
 
+  data() {
+    return { STACK_PREFS };
+  },
+
   computed: {
     truncateHostnames() {
       return this.truncateLimit === NETBIOS_TRUNCATION_LENGTH;
@@ -55,7 +74,20 @@ export default {
     serverArgs() {
       return this.selectedVersion?.serverArgs || {};
     },
-
+    stackPreferenceOptions() {
+      return [{
+        label: this.t('cluster.rke2.stackPreference.options.ipv4'),
+        value: STACK_PREFS.IPV4
+      },
+      {
+        label: this.t('cluster.rke2.stackPreference.options.ipv6'),
+        value: STACK_PREFS.IPV6
+      }, {
+        label: this.t('cluster.rke2.stackPreference.options.dual'),
+        value: STACK_PREFS.DUAL
+      },
+      ];
+    },
     showIpv6Warning() {
       const clusterCIDR = this.serverConfig['cluster-cidr'] || '';
       const serviceCIDR = this.serverConfig['service-cidr'] || '';
@@ -79,6 +111,35 @@ export default {
         this.$emit('update:value', newValue);
       }
     },
+
+    stackPreference: {
+      get() {
+        return this.localValue.spec?.networking?.stackPreference || STACK_PREFS.IPV4;
+      },
+      set(neu) {
+        if (!this.localValue.spec.networking) {
+          this.localValue.spec.networking = {};
+        }
+        this.localValue.spec.networking.stackPreference = neu;
+      }
+    },
+  },
+
+  methods: {
+    // if ipv6 pools are detected, we enforce dual-stack or ipv6 stack prefs.
+    // If ipv6 pools are not detected we don't know for sure they aren't there so we don't validate the input
+    stackPreferenceValidator(val) {
+      const value = val?.value || val;
+      let isValid;
+
+      if (this.hasSomeIpv6Pools) {
+        isValid = value !== STACK_PREFS.IPV4;
+
+        return isValid ? null : this.t('cluster.rke2.stackPreference.errorNeedsIpv6');
+      } else {
+        return null;
+      }
+    }
   }
 };
 </script>
@@ -95,6 +156,7 @@ export default {
     <Banner
       v-if="showIpv6Warning"
       color="warning"
+      data-testid="network-tab-ipv6StackPreferenceWarning"
     >
       {{ t('cluster.rke2.address.ipv6.warning') }}
     </Banner>
@@ -210,5 +272,30 @@ export default {
       @caCerts-changed="$emit('ca-certs-changed', $event)"
       @local-cluster-auth-endpoint-changed="$emit('local-cluster-auth-endpoint-changed', $event)"
     />
+
+    <h3
+      v-t="'cluster.rke2.stackPreference.label'"
+      class="mt-20"
+    />
+    <t
+      k="cluster.rke2.stackPreference.description"
+      raw
+      class="text-muted"
+    />
+    <div class="ro mt-10 mb-20">
+      <div class="col span-3">
+        <LabeledSelect
+          :key="hasSomeIpv6Pools"
+          :value="localValue?.spec?.rkeConfig?.networking?.stackPreference || STACK_PREFS.IPV4"
+          :mode="mode"
+          :options="stackPreferenceOptions"
+          :rules="[stackPreferenceValidator]"
+          data-testid="network-tab-stackpreferences"
+          :require-dirty="false"
+          @selecting="e=>$emit('stack-preference-changed', e)"
+          @update:validation="e=>$emit('validationChanged', e)"
+        />
+      </div>
+    </div>
   </div>
 </template>

package/initialize/install-plugins.js

@@ -30,6 +30,8 @@ import internalApiPlugin from '@shell/plugins/internal-api';
 import 'floating-vue/dist/style.css';
 import { floatingVueOptions } from '@shell/plugins/floating-vue';
 
+import dynamicContent from '@shell/plugins/dynamic-content';
+
 export async function installPlugins(vueApp) {
   vueApp.use(globalFormatters);
   vueApp.use(PortalVue);
@@ -46,7 +48,7 @@ export async function installPlugins(vueApp) {
 }
 
 export async function installInjectedPlugins(app, vueApp) {
-  const pluginDefinitions = [config, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, plugin, steveCreateWorker, emberCookie, internalApiPlugin];
+  const pluginDefinitions = [config, axios, plugins, pluginsLoader, axiosShell, intNumber, codeMirror, nuxtClientInit, replaceAll, plugin, steveCreateWorker, emberCookie, internalApiPlugin, dynamicContent];
 
   const installations = pluginDefinitions.map(async(pluginDefinition) => {
     if (typeof pluginDefinition === 'function') {

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

@@ -10,6 +10,8 @@ import { mapFeature, HARVESTER as HARVESTER_FEATURE } from '@shell/store/feature
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { BadgeState } from '@components/BadgeState';
+import { isAutoscalerFeatureFlagEnabled } from '@shell/utils/autoscaler-utils';
+import { AUTOSCALER_ENABLED } from '@shell/config/table-headers';
 
 export default {
   components: {
@@ -153,6 +155,16 @@ export default {
       return this.filteredRows.some((c) => c.metadata.namespace !== 'fleet-local' && c.metadata.namespace !== 'fleet-default');
     },
 
+    headers() {
+      const headers = this.$store.getters['type-map/headersFor'](this.schema);
+
+      if (isAutoscalerFeatureFlagEnabled(this.$store)) {
+        headers.splice(-3, 0, AUTOSCALER_ENABLED);
+      }
+
+      return headers;
+    }
+
   },
 
   $loadingResources() {
@@ -201,7 +213,8 @@ export default {
     </Masthead>
 
     <ResourceTable
-      :schema="schema"
+      :headers="headers"
+      :table-actions="true"
       :rows="filteredRows"
       :namespaced="nonStandardNamespaces"
       :loading="loading"
@@ -237,7 +250,7 @@ export default {
       </template>
       <template #cell:explorer="{row}">
         <router-link
-          v-if="row.mgmt && row.mgmt.isReady && !row.hasError"
+          v-if="row.canExplore"
           data-testid="cluster-manager-list-explore-management"
           class="btn btn-sm role-secondary"
           :to="{name: 'c-cluster', params: {cluster: row.mgmt.id}}"