@rancher/shell 3.0.9-rc.5 → 3.0.9-rc.6

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

@@ -28,8 +28,9 @@ import {
 } from '@shell/utils/object';
 import { allHash } from '@shell/utils/promise';
 import {
-  getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon, initSchedulingCustomization, addonConfigPreserve
+  getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon, initSchedulingCustomization, addonConfigPreserve,
 } from '@shell/utils/cluster';
+import { AGENT_CONFIGURATION_TYPES, SETTING } from '@shell/config/settings';
 
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
@@ -43,7 +44,6 @@ import { canViewClusterMembershipEditor } from '@shell/components/form/Members/C
 import semver from 'semver';
 
 import { CLOUD_CREDENTIAL_OVERRIDE } from '@shell/models/nodedriver';
-import { SETTING } from '@shell/config/settings';
 import { base64Encode } from '@shell/utils/crypto';
 import { CAPI as CAPI_ANNOTATIONS, CLUSTER_BADGE } from '@shell/config/labels-annotations';
 import AgentEnv from '@shell/edit/provisioning.cattle.io.cluster/AgentEnv';
@@ -66,9 +66,11 @@ 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 { RETENTION_DEFAULT, NGINX_SUPPORTED, INGRESS_CONTROLLER, INGRESS_NGINX } from '@shell/edit/provisioning.cattle.io.cluster/shared';
+import {
+  HARVESTER, RETENTION_DEFAULT, RKE2_INGRESS_NGINX, INGRESS_CONTROLLER, INGRESS_NGINX, TRAEFIK, INGRESS_NONE
+} from '@shell/edit/provisioning.cattle.io.cluster/shared';
 import { mapGetters } from 'vuex';
-const HARVESTER = 'harvester';
+
 const GOOGLE = 'google';
 const HARVESTER_CLOUD_PROVIDER = 'harvester-cloud-provider';
 const NETBIOS_TRUNCATION_LENGTH = 15;
@@ -159,6 +161,8 @@ export default {
 
     this.clusterAgentDefaultPC = sc.clusterAgentDefaultPC;
     this.clusterAgentDefaultPDB = sc.clusterAgentDefaultPDB;
+    this.fleetAgentDefaultPC = sc.fleetAgentDefaultPC;
+    this.fleetAgentDefaultPDB = sc.fleetAgentDefaultPDB;
     this.schedulingCustomizationFeatureEnabled = sc.schedulingCustomizationFeatureEnabled;
     this.schedulingCustomizationOriginallyEnabled = sc.schedulingCustomizationOriginallyEnabled;
     this.errors = this.errors.concat(sc.errors);
@@ -170,9 +174,8 @@ export default {
     Object.entries(this.chartValues).forEach(([name, value]) => {
       const key = this.chartVersionKey(name);
 
-      this.userChartValues[key] = value;
+      this.set(this.userChartValues, key, value);
     });
-
     this.setAgentConfiguration();
   },
 
@@ -273,7 +276,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
+      stackPreferenceError:                     false, //  spec.networking.stackPreference is validated in conjunction with hasOnlyIpv6Pools
       allNamespaces:                            [],
       extensionTabs:                            getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
       clusterAgentDeploymentCustomization:      null,
@@ -281,6 +284,8 @@ export default {
       schedulingCustomizationOriginallyEnabled: false,
       clusterAgentDefaultPC:                    null,
       clusterAgentDefaultPDB:                   null,
+      fleetAgentDefaultPC:                      null,
+      fleetAgentDefaultPDB:                     null,
       activeTab:                                null,
       isGoogle,
       isAuthenticated:                          !isGoogle || this.mode === _EDIT,
@@ -291,11 +296,16 @@ export default {
       addonConfigDiffs:                         {},
       originalKubeVersion:                      null,
       isEmpty,
+      AGENT_CONFIGURATION_TYPES,
+      basicsValid:                              true
     };
   },
 
   computed: {
     ...mapGetters({ features: 'features/get' }),
+    isK3s() {
+      return this.value?.isK3s;
+    },
 
     isActiveTabRegistries() {
       return this.activeTab?.selectedName === REGISTRIES_TAB_NAME;
@@ -849,8 +859,12 @@ export default {
       }
     },
 
-    hasSomeIpv6Pools() {
-      return !!(this.machinePools || []).find((p) => p.hasIpv6);
+    hasOnlyIpv6Pools() {
+      return !(this.machinePools || []).find((p) => !p.isIpv6 || p.isDualStack);
+    },
+
+    hasDualStackPools() {
+      return !!(this.machinePools || []).find((p) => p.isDualStack);
     },
 
     validationPassed() {
@@ -890,10 +904,11 @@ export default {
     overallFormValidationPassed() {
       return this.validationPassed &&
             this.fvFormIsValid &&
-            this.etcdConfigValid;
+            this.etcdConfigValid &&
+            this.basicsValid;
     },
     nginxSupported() {
-      if (this.serverArgs?.disable?.options.includes(NGINX_SUPPORTED)) {
+      if (this.serverArgs?.disable?.options.includes(RKE2_INGRESS_NGINX)) {
         return true;
       }
 
@@ -963,7 +978,7 @@ export default {
         );
       }
 
-      this.versionInfo = {}; // Invalidate cache such that version info relevant to selected kube version is updated
+      Object.keys(this.versionInfo).forEach((key) => delete this.versionInfo[key]); // 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());
@@ -995,22 +1010,11 @@ 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() {
-    this.registerBeforeHook(this.saveMachinePools, 'save-machine-pools', 1);
+    this.registerBeforeHook(this.showIpv6Warning, 'show-ipv6-warning', 1);
+    this.registerBeforeHook(this.saveMachinePools, 'save-machine-pools', 2);
     this.registerBeforeHook(this.setRegistryConfig, 'set-registry-config');
     this.registerBeforeHook(this.handleVsphereCpiSecret, 'sync-vsphere-cpi');
     this.registerBeforeHook(this.handleVsphereCsiSecret, 'sync-vsphere-csi');
@@ -1162,11 +1166,27 @@ export default {
       }
     },
 
-    setSchedulingCustomization(val) {
-      if (val) {
-        set(this.value, 'spec.clusterAgentDeploymentCustomization.schedulingCustomization', { priorityClass: this.clusterAgentDefaultPC, podDisruptionBudget: this.clusterAgentDefaultPDB });
+    setSchedulingCustomization({ event, agentType }) {
+      if (event) {
+        switch (agentType) {
+        case AGENT_CONFIGURATION_TYPES.CLUSTER:
+          set(this.value, 'spec.clusterAgentDeploymentCustomization.schedulingCustomization', { priorityClass: this.clusterAgentDefaultPC, podDisruptionBudget: this.clusterAgentDefaultPDB });
+          break;
+        case AGENT_CONFIGURATION_TYPES.FLEET:
+          set(this.value, 'spec.fleetAgentDeploymentCustomization.schedulingCustomization', { priorityClass: this.fleetAgentDefaultPC, podDisruptionBudget: this.fleetAgentDefaultPDB });
+          break;
+        default:
+        }
       } else {
-        delete this.value.spec.clusterAgentDeploymentCustomization.schedulingCustomization;
+        switch (agentType) {
+        case AGENT_CONFIGURATION_TYPES.CLUSTER:
+          delete this.value.spec.clusterAgentDeploymentCustomization.schedulingCustomization;
+          break;
+        case AGENT_CONFIGURATION_TYPES.FLEET:
+          delete this.value.spec.fleetAgentDeploymentCustomization.schedulingCustomization;
+          break;
+        default:
+        }
       }
     },
 
@@ -1335,14 +1355,15 @@ export default {
       const name = `pool${ ++this.lastIdx }`;
 
       const pool = {
-        id:      name,
+        id:          name,
         config,
-        remove:  false,
-        create:  true,
-        update:  false,
-        uid:     name,
-        hasIpv6: false,
-        pool:    {
+        remove:      false,
+        create:      true,
+        update:      false,
+        uid:         name,
+        isIpv6:      false,
+        isDualStack: false,
+        pool:        {
           name,
           etcdRole:             numCurrentPools === 0,
           controlPlaneRole:     numCurrentPools === 0,
@@ -1532,6 +1553,59 @@ export default {
       }
     },
 
+    async showIpv6Warning(hookContext) {
+      if (this.mode !== _CREATE || !this.machinePools?.length) {
+        return;
+      }
+      const stackPreference = this.value.spec.rkeConfig.networking.stackPreference;
+      const isK3s = (this.selectedVersion?.label || '').toLowerCase().includes('k3s');
+      const flannelMasqEnabled = this.serverConfig['flannel-ipv6-masq'];
+      const clusterCIDR = (this.serverConfig['cluster-cidr'] || '');
+      const serviceCIDR = (this.serverConfig['service-cidr'] || '');
+
+      const isDualStack = this.hasDualStackPools;
+      const isIpv6 = this.hasOnlyIpv6Pools;
+
+      const flannelMasqInvalid = isIpv6 && isK3s && !flannelMasqEnabled;
+      const stackPrefInvalid = (isIpv6 && stackPreference !== STACK_PREFS.IPV6) || (isDualStack && ![STACK_PREFS.IPV6, STACK_PREFS.DUAL].includes(stackPreference));
+
+      const clusterCIDRInvalid = (isIpv6 || isDualStack) && !clusterCIDR.includes(':');
+      const serviceCIDRInvalid = (isIpv6 || isDualStack) && !serviceCIDR.includes(':');
+
+      if (!stackPrefInvalid && !flannelMasqInvalid && !clusterCIDRInvalid && !serviceCIDRInvalid) {
+        return;
+      }
+
+      const warnings = [];
+
+      if (stackPrefInvalid) {
+        warnings.push('cluster.rke2.modal.ipv6Warning.stackPrefInvalid');
+      }
+      if (flannelMasqInvalid) {
+        warnings.push('cluster.rke2.modal.ipv6Warning.flannelMasqInvalid');
+      }
+      if (clusterCIDRInvalid || serviceCIDRInvalid) {
+        warnings.push(isK3s ? 'cluster.rke2.modal.ipv6Warning.cidrInvalidK3s' : 'cluster.rke2.modal.ipv6Warning.cidrInvalidRke2');
+      }
+
+      await new Promise((resolve, reject) => {
+        this.$store.dispatch('cluster/promptModal', {
+          component:      'Ipv6NetworkingDialog',
+          componentProps: {
+            warnings,
+            isK3s,
+            confirm: (confirmed) => {
+              if (confirmed) {
+                resolve();
+              } else {
+                reject(new Error('User Cancelled'));
+              }
+            }
+          },
+        });
+      });
+    },
+
     /**
      * Ensure that all the existing node roles pool are at least 1 each
      */
@@ -1778,25 +1852,10 @@ export default {
       });
     },
 
-    /**
-     * Ensure all chart information required to show addons is available
-     *
-     * This basically means
-     * 1) That the full chart relating to the addon is fetched (which includes core chart, readme and values)
-     * 2) We're ready to cache any values the user provides for each addon
-     */
-    async initAddons() {
-      this.addonConfigValidation = {};
-
-      for (const chartName of this.addonNames) {
-        const entry = this.chartVersions[chartName];
-
-        // prevent fetching of addon config for 'none' CNI option
-        // https://github.com/rancher/dashboard/issues/10338
-        if (this.versionInfo[chartName] || chartName.includes('none')) {
-          continue;
-        }
+    async getChartValue(chartName) {
+      const entry = this.chartVersions[chartName];
 
+      if (entry) {
         try {
           const res = await this.$store.dispatch('catalog/getVersionInfo', {
             repoType:    'cluster',
@@ -1805,11 +1864,11 @@ export default {
             versionName: entry.version,
           });
 
-          this.versionInfo[chartName] = res;
+          this.set(this.versionInfo, chartName, res);
           const key = this.chartVersionKey(chartName);
 
           if (!this.userChartValues[key]) {
-            this.userChartValues[key] = {};
+            this.set(this.userChartValues, key, {});
           }
         } catch (e) {
           console.error(`Failed to fetch or process chart info for ${ chartName }`); // eslint-disable-line no-console
@@ -1817,6 +1876,28 @@ export default {
       }
     },
 
+    /**
+     * Ensure all chart information required to show addons is available
+     *
+     * This basically means
+     * 1) That the full chart relating to the addon is fetched (which includes core chart, readme and values)
+     * 2) We're ready to cache any values the user provides for each addon
+     */
+    async initAddons() {
+      this.addonConfigValidation = {};
+      const ingressCharts = !this.isK3s ? ['rke2-ingress-nginx', 'rke2-traefik'] : [];
+
+      for (const chartName of [...this.addonNames, ...ingressCharts]) {
+        // prevent fetching of addon config for 'none' CNI option
+        // https://github.com/rancher/dashboard/issues/10338
+        if (this.versionInfo[chartName] || chartName.includes('none')) {
+          continue;
+        }
+
+        await this.getChartValue(chartName);
+      }
+    },
+
     showAddons(key) {
       this.addonsRev++;
       this.addonNames.forEach((name) => {
@@ -1859,7 +1940,7 @@ export default {
       const fromUser = this.userChartValuesTemp[name];
       const different = diff(fromChart, fromUser);
 
-      this.userChartValues[this.chartVersionKey(name)] = different;
+      this.set(this.userChartValues, this.chartVersionKey(name), different);
     }, 250, { leading: true }),
 
     initYamlEditor(name) {
@@ -2148,11 +2229,21 @@ export default {
       }
     },
 
-    updateNginxConfiguration(val) {
-      if (val.includes(NGINX_SUPPORTED) || !this.nginxSupported) {
-        this.serverConfig[INGRESS_CONTROLLER] = undefined;
-      } else if (this.serverConfig[INGRESS_CONTROLLER] !== INGRESS_NGINX) {
-        this.serverConfig[INGRESS_CONTROLLER] = INGRESS_NGINX;
+    updateNginxConfiguration(disabledServerConfig) {
+      // We only need to explicitly set INGRESS_CONTROLLER for RKE2, we continue to rely on disable list for K3s
+      if (!this.isK3s) {
+        // For new instances, we want Traefik to be default
+        if (this.isCreate) {
+          this.serverConfig[INGRESS_CONTROLLER] = TRAEFIK;
+        // Older existing instances might be relying on default setting, which is changing from nginx to traefik
+        // so we need to make sure to set it to nginx explicitly to avoid breaking existing clusters
+        } else if (!this.serverConfig[INGRESS_CONTROLLER]) {
+          if (!disabledServerConfig.includes(RKE2_INGRESS_NGINX) && this.nginxSupported) {
+            this.serverConfig[INGRESS_CONTROLLER] = INGRESS_NGINX;
+          } else {
+            this.serverConfig[INGRESS_CONTROLLER] = INGRESS_NONE;
+          }
+        }
       }
     },
 
@@ -2241,9 +2332,9 @@ export default {
 
     handleFlannelMasqChanged(neu) {
       if (neu || neu === false) {
-        this.serverConfig['enable-flannel-masq'] = neu;
+        this.serverConfig['flannel-ipv6-masq'] = neu;
       } else {
-        delete this.serverConfig['enable-flannel-masq'];
+        delete this.serverConfig['flannel-ipv6-masq'];
       }
     },
 
@@ -2286,7 +2377,6 @@ export default {
     handleTabChange(data) {
       this.activeTab = data;
     },
-
   }
 };
 </script>
@@ -2482,10 +2572,10 @@ export default {
             <Basics
               ref="tab-Basics"
               v-model:value="localValue"
-              :live-value="liveValue"
               :mode="mode"
               :provider="provider"
               :user-chart-values="userChartValues"
+              :version-info="versionInfo"
               :credential="credential"
               :compliance-override="complianceOverride"
               :all-psas="allPSAs"
@@ -2502,7 +2592,7 @@ export default {
               :cloud-provider-options="cloudProviderOptions"
               :is-azure-provider-unsupported="isAzureProviderUnsupported"
               :can-azure-migrate-on-edit="canAzureMigrateOnEdit"
-              :has-some-ipv6-pools="hasSomeIpv6Pools"
+              :has-some-ipv6-pools="hasOnlyIpv6Pools"
               @update:value="$emit('input', $event)"
               @cilium-values-changed="handleCiliumValuesChanged"
               @enabled-system-services-changed="handleEnabledSystemServicesChanged"
@@ -2510,6 +2600,10 @@ export default {
               @compliance-changed="handleComplianceChanged"
               @psa-default-changed="handlePsaDefaultChanged"
               @show-deprecated-patch-versions-changed="handleShowDeprecatedPatchVersionsChanged"
+              @update-values="updateValues"
+              @yaml-validation-changed="e => addonConfigValidationChanged(e.name, e.val)"
+              @config-validation-changed="(val)=>basicsValid = val"
+              @error="e=>errors.push(e)"
             />
           </Tab>
 
@@ -2558,8 +2652,8 @@ export default {
               :selected-version="selectedVersion"
               :truncate-limit="truncateLimit"
               :machine-pools="machinePools"
-              :has-some-ipv6-pools="hasSomeIpv6Pools"
-              :enable-flannel-masq="serverConfig['enable-flannel-masq']"
+              :has-some-ipv6-pools="hasOnlyIpv6Pools"
+              :flannel-ipv6-masq="serverConfig['flannel-ipv6-masq']"
               @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"
@@ -2572,7 +2666,7 @@ export default {
               @fqdn-changed="(val)=>localValue.spec.localClusterAuthEndpoint.fqdn = val"
               @stack-preference-changed="(val)=>localValue.spec.rkeConfig.networking.stackPreference = val"
               @validationChanged="(val)=>stackPreferenceError = !val"
-              @enable-flannel-masq-changed="handleFlannelMasqChanged"
+              @flannel-ipv6-masq-changed="handleFlannelMasqChanged"
             />
           </Tab>
 
@@ -2664,7 +2758,7 @@ export default {
             <AgentConfiguration
               v-model:value="value.spec.clusterAgentDeploymentCustomization"
               data-testid="rke2-cluster-agent-config"
-              type="cluster"
+              :type="AGENT_CONFIGURATION_TYPES.CLUSTER"
               :mode="mode"
               :scheduling-customization-feature-enabled="schedulingCustomizationFeatureEnabled"
               :default-p-c="clusterAgentDefaultPC"
@@ -2683,8 +2777,13 @@ export default {
               v-if="value.spec.fleetAgentDeploymentCustomization"
               v-model:value="value.spec.fleetAgentDeploymentCustomization"
               data-testid="rke2-fleet-agent-config"
-              type="fleet"
+              :type="AGENT_CONFIGURATION_TYPES.FLEET"
               :mode="mode"
+              :scheduling-customization-feature-enabled="schedulingCustomizationFeatureEnabled"
+              :default-p-c="fleetAgentDefaultPC"
+              :default-p-d-b="fleetAgentDefaultPDB"
+              :scheduling-customization-originally-enabled="schedulingCustomizationOriginallyEnabled"
+              @scheduling-customization-changed="setSchedulingCustomization"
             />
           </Tab>
 

package/edit/provisioning.cattle.io.cluster/shared.ts

@@ -1,4 +1,39 @@
 export const RETENTION_DEFAULT = 5;
-export const NGINX_SUPPORTED = 'rke2-ingress-nginx';
+export const RKE2_INGRESS_NGINX = 'rke2-ingress-nginx';
+export const RKE2_TRAEFIK = 'rke2-traefik';
 export const INGRESS_NGINX = 'ingress-nginx';
 export const INGRESS_CONTROLLER = 'ingress-controller';
+export const TRAEFIK = 'traefik';
+export const HARVESTER = 'harvester';
+export const INGRESS_DUAL = 'dual';
+export const INGRESS_NONE = 'none';
+export const INGRESS_OPTIONS = [
+  {
+    id:        TRAEFIK,
+    image:     { src: require('@shell/assets/images/providers/traefik.png'), alt: 'Traefik' },
+    header:    { title: { key: 'cluster.ingress.traefik.header' } },
+    subHeader: { label: { key: 'cluster.ingress.recommended' } },
+    content:   { key: 'cluster.ingress.traefik.content' },
+    doc:       { url: 'https://docs.rke2.io/networking/networking_services?_highlight=ingress#ingress-controller' }
+  },
+  {
+    id:        INGRESS_NGINX,
+    image:     { src: require('@shell/assets/images/providers/kubernetes.svg'), alt: 'NGINX' },
+    header:    { title: { key: 'cluster.ingress.nginx.header' } },
+    subHeader: { label: { key: 'cluster.ingress.legacy' } },
+    content:   { key: 'cluster.ingress.nginx.content' },
+    doc:       { url: 'https://www.kubernetes.dev/blog/2025/11/12/ingress-nginx-retirement/' }
+  },
+  {
+    id:        INGRESS_DUAL,
+    header:    { title: { key: 'cluster.ingress.dual.header' } },
+    subHeader: { label: { key: 'cluster.ingress.migration' } },
+    content:   { key: 'cluster.ingress.dual.content' }
+  }
+];
+
+export const INGRESS_MIGRATION_KB_LINK = 'https://support.scc.suse.com/s/kb/How-to-migrate-the-Rancher-Ingress-to-Traefik-in-an-RKE2-cluster';
+export const INGRESS_CLASS_DEFAULT = 'nginx';
+export const INGRESS_CONTROLLER_CLASS_DEFAULT = 'k8s.io/ingress-nginx';
+export const INGRESS_CLASS_MIGRATION = 'rke2-ingress-nginx-migration';
+export const INGRESS_CONTROLLER_CLASS_MIGRATION = 'rke2.cattle.io/ingress-nginx-migration';

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

@@ -41,7 +41,7 @@ export default {
     },
 
     type: {
-      type:     String,
+      type:     String, // AGENT_CONFIGURATION_TYPES
       required: true,
     },
     schedulingCustomizationFeatureEnabled: {
@@ -325,6 +325,7 @@ export default {
       <SchedulingCustomization
         :value="value.schedulingCustomization"
         :mode="mode"
+        :type="type"
         :feature="schedulingCustomizationFeatureEnabled"
         :default-p-c="defaultPC"
         :default-p-d-b="defaultPDB"

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

@@ -10,17 +10,20 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import YamlEditor from '@shell/components/YamlEditor';
 import { LEGACY } from '@shell/store/features';
 import semver from 'semver';
-
-const HARVESTER = 'harvester';
+import Ingress from '@shell/edit/provisioning.cattle.io.cluster/tabs/Ingress';
+import {
+  HARVESTER, RKE2_INGRESS_NGINX, RKE2_TRAEFIK, INGRESS_CONTROLLER, INGRESS_NGINX
+} from '@shell/edit/provisioning.cattle.io.cluster/shared';
 
 export default {
-  emits: ['enabled-system-services-changed', 'cilium-values-changed', 'kubernetes-changed', 'show-deprecated-patch-versions-changed', 'compliance-changed', 'psa-default-changed'],
+  emits: ['enabled-system-services-changed', 'cilium-values-changed', 'kubernetes-changed', 'show-deprecated-patch-versions-changed', 'compliance-changed', 'psa-default-changed', 'update-values', 'error', 'yaml-validation-changed', 'config-validation-changed'],
 
   components: {
     Banner,
     Checkbox,
     LabeledSelect,
     YamlEditor,
+    Ingress
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -46,11 +49,14 @@ export default {
       default:  null,
       required: false
     },
-
     userChartValues: {
       type:     Object,
       required: true
     },
+    versionInfo: {
+      type:     Object,
+      required: true
+    },
     complianceOverride: {
       type:     Boolean,
       required: true
@@ -165,6 +171,15 @@ export default {
 
       return out;
     },
+    ingressController: {
+      get() {
+        return this.serverConfig && this.serverConfig[INGRESS_CONTROLLER] ? this.serverConfig[INGRESS_CONTROLLER] : INGRESS_NGINX ;
+      },
+
+      set(neu) {
+        this.serverConfig[INGRESS_CONTROLLER] = neu;
+      },
+    },
 
     /**
      * Allow to display override if PSA is needed and profile is set
@@ -229,13 +244,21 @@ export default {
     },
 
     disableOptions() {
-      return (this.serverArgs.disable.options || []).map((value) => {
+      // For RKE2 clusters Ingress is configured separately, so we should not allow disabling it here
+      return (this.serverArgs.disable.options || []).filter((value) => value !== RKE2_INGRESS_NGINX && value !== RKE2_TRAEFIK).map((value) => {
         return {
           label: this.$store.getters['i18n/withFallback'](`cluster.${ this.value.isK3s ? 'k3s' : 'rke2' }.systemService."${ value }"`, null, value.replace(/^(rke2|rancher)-/, '')),
           value,
         };
       });
     },
+    nginxSupported() {
+      if (this.serverArgs?.disable?.options.includes(RKE2_INGRESS_NGINX)) {
+        return true;
+      }
+
+      return false;
+    },
 
     serverArgs() {
       return this.selectedVersion?.serverArgs || {};
@@ -336,6 +359,13 @@ export default {
       }
     },
 
+    nginxChart() {
+      return this.chartVersionKey(RKE2_INGRESS_NGINX);
+    },
+    traefikChart() {
+      return this.chartVersionKey(RKE2_TRAEFIK);
+    },
+
     canNotEditCloudProvider() {
       if (!this.isEdit) {
         return false;
@@ -363,6 +393,9 @@ export default {
      */
     showCloudProviderMigrateAzureWarning() {
       return this.showCloudProvider && this.isEdit && this.canAzureMigrateOnEdit;
+    },
+    showIngress() {
+      return !this.value?.isK3s;
     }
   },
 
@@ -382,7 +415,7 @@ export default {
 <template>
   <div>
     <Banner
-      v-if="!haveArgInfo"
+      v-if="!haveArgInfo || ((!nginxChart || !traefikChart) && showIngress)"
       color="warning"
       :label="t('cluster.banner.haveArgInfo')"
     />
@@ -623,7 +656,7 @@ export default {
 
     <div
       v-if="serverArgs.disable"
-      class="row"
+      class="row mb-30"
     >
       <div class="col span-12">
         <div>
@@ -641,6 +674,21 @@ export default {
         />
       </div>
     </div>
+    <!-- Ingress -->
+    <Ingress
+      v-if="showIngress"
+      v-model:value="ingressController"
+      :mode="mode"
+      :nginx-supported="nginxSupported"
+      :nginx-chart="nginxChart"
+      :traefik-chart="traefikChart"
+      :user-chart-values="userChartValues"
+      :version-info="versionInfo"
+      @update-values="(name, val) => $emit('update-values', name, val)"
+      @error="$emit('error', $event)"
+      @yaml-validation-changed="e => $emit('yaml-validation-changed', e)"
+      @config-validation-changed="e => $emit('config-validation-changed', e)"
+    />
   </div>
 </template>