@rancher/shell 2.0.1 → 2.0.2-rc.1

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

@@ -22,6 +22,7 @@ const defaultStubs = {
   BadgeState:               true,
   Checkbox:                 true,
   ClusterMembershipEditor:  true,
+  ClusterAppearance:        true,
   DrainOptions:             true,
   LabeledInput:             true,
   Labels:                   true,
@@ -53,11 +54,23 @@ const defaultStubs = {
 const mockAgentArgs = { 'cloud-provider-name': { options: [], profile: { options: [{ anything: 'yes' }] } } };
 
 const defaultComputed = {
+  appsOSWarning() {
+    return false;
+  },
   showForm() {
     return true;
   },
   versionOptions() {
     return [
+      {
+        id: 'v1.31.0+rke2r1', value: 'v1.31.0+rke2r1', serverArgs: {}, agentArgs: mockAgentArgs, charts: {}
+      },
+      {
+        id: 'v1.30.0+rke2r1', value: 'v1.30.0+rke2r1', serverArgs: {}, agentArgs: mockAgentArgs, charts: {}
+      },
+      {
+        id: 'v1.29.1+rke2r1', value: 'v1.29.1+rke2r1', serverArgs: {}, agentArgs: mockAgentArgs, charts: {}
+      },
       {
         id: 'v1.25.0+rke2r1', value: 'v1.25.0+rke2r1', serverArgs: {}, agentArgs: mockAgentArgs, charts: {}
       },
@@ -332,4 +345,200 @@ describe('component: rke2', () => {
       expect(agent.element).toBeDefined();
     });
   });
+
+  it.each([
+    ['v1.25.0+k3s1', [{ value: 'aws' }, { value: 'azure' }], 'azure', true],
+    ['v1.31.0+k3s1', [{ value: 'aws' }, { value: 'azure' }], 'harvester', true],
+    ['v1.29.0+k3s1', [{ value: 'aws' }, { value: 'azure' }], 'harvester', false],
+    ['v1.31.0+k3s1', [{ value: 'aws' }], 'azure', false],
+  ])('should set isAzureProviderUnsupported', (k8s, providerOptions, cloudProvider, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  _CREATE,
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': cloudProvider }
+        },
+        provider: 'custom'
+      },
+      data:     () => ({}),
+      computed: {
+        ...defaultComputed,
+        cloudProviderOptions: () => providerOptions
+      },
+      mocks: {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    expect((wrapper.vm as any).isAzureProviderUnsupported).toBe(value);
+  });
+
+  it.each([
+    ['edit', 'v1.31.0+k3s1', 'azure', false],
+    ['edit', 'v1.26.0+k3s1', 'azure', false],
+    ['edit', 'v1.28.0+k3s1', 'harvester', false],
+    ['edit', 'v1.28.0+k3s1', 'azure', true],
+    ['create', 'v1.28.0+k3s1', 'azure', false],
+    ['view', 'v1.28.0+k3s1', 'azure', false],
+  ])('should set canAzureMigrateOnEdit', (mode, k8s, liveCloudProvider, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode,
+        liveValue: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': liveCloudProvider }
+        },
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': liveCloudProvider }
+        },
+        provider: 'custom'
+      },
+      data:     () => ({}),
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    expect((wrapper.vm as any).canAzureMigrateOnEdit).toBe(value);
+  });
+
+  it.each([
+    ['', 'v1.32.0+rke2r1', 'amazon', 'v1.32.0+rke2r1'],
+    ['', 'v1.29.0+rke2r1', 'amazon', 'v1.29.0+rke2r1'],
+    ['', 'v1.29.0+rke2r1', 'azure', 'v1.29.0+rke2r1'],
+    ['not', 'v1.31.0+rke2r1', 'azure', undefined],
+  ])('should %p include version %p if Cloud Provider is %p', async(_, k8s, liveCloudProvider, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': liveCloudProvider }
+        },
+        provider: 'custom'
+      },
+      data:     () => ({}),
+      computed: {
+        appsOSWarning: () => false,
+        showForm:      () => false,
+      },
+      mocks: {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    wrapper.setData({
+      rke2Versions: [{
+        id:         k8s,
+        version:    k8s,
+        serverArgs: true
+      }]
+    });
+
+    expect((wrapper.vm as any).versionOptions[0]?.value).toBe(value);
+  });
+
+  it.each([
+    ['enable', 'v1.28.0+rke2r1', false],
+    ['disable', 'v1.32.0+rke2r1', true],
+  ])('should %p Azure provider option if version is %p', async(_, k8s, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'create',
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': 'azure' }
+        },
+        provider: 'custom'
+      },
+      data: () => ({
+        agentArgs: {
+          'cloud-provider-name': {
+            options: [
+              'azure',
+              'amazon'
+            ]
+          }
+        }
+      }),
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    const azureOption = (wrapper.vm as any).cloudProviderOptions.find((o: any) => o.value === 'azure');
+
+    expect(azureOption.disabled).toBe(value);
+  });
+
+  it.each([
+    ['enable', 'azure', 'v1.28.0+rke2r1', false], // azure provider / current
+    ['enable', 'external', 'v1.28.0+rke2r1', false], // external provider
+    ['enable', 'azure', 'v1.26.0+rke2r1', false], // version mismatch
+    ['disable', 'amazon', 'v1.26.0+rke2r1', true],
+    ['enable', '', 'v1.28.0+rke2r1', true], // default provider
+  ])('should %p provider option %p in edit mode if live provider is Azure and 1.27 <= k8s < 1.30', async(_, cloudProvider, k8s, value) => {
+    const wrapper = mount(rke2, {
+      propsData: {
+        mode:  'edit',
+        value: {
+          spec: {
+            ...defaultSpec,
+            kubernetesVersion: k8s
+          },
+          agentConfig: { 'cloud-provider-name': 'azure' }
+        },
+        provider: 'custom'
+      },
+      data: () => ({
+        canAzureMigrateOnEdit: true,
+        agentArgs:             {
+          'cloud-provider-name': {
+            options: [
+              'azure',
+              'amazon',
+              'external'
+            ]
+          }
+        }
+      }),
+      computed: defaultComputed,
+      mocks:    {
+        ...defaultMocks,
+        $store: { dispatch: () => jest.fn(), getters: defaultGetters },
+      },
+      stubs: defaultStubs
+    });
+
+    const azureOption = (wrapper.vm as any).cloudProviderOptions.find((o: any) => o.value === cloudProvider);
+
+    expect(azureOption.disabled).toBe(value);
+  });
 });

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

@@ -330,6 +330,14 @@ export default {
           });
         });
 
+        if (isElementalActive) {
+          // !this.subType means we are on the /create screen - we only want to show for rke2
+          // if a subType is selected, always add the ELEMENTAL_CLUSTER_PROVIDER type to cover edit scenarios
+          if ((!this.subType && !this.isRke1) || this.subType) {
+            addType(this.$plugin, ELEMENTAL_CLUSTER_PROVIDER, 'custom2', false);
+          }
+        }
+
         if (this.isRke1 ) {
           machineTypes.forEach((type) => {
             const id = type.spec.displayName || type.id;
@@ -346,10 +354,6 @@ export default {
           });
 
           addType(this.$plugin, 'custom', 'custom2', false);
-
-          if (isElementalActive) {
-            addType(this.$plugin, ELEMENTAL_CLUSTER_PROVIDER, 'custom2', false);
-          }
         }
 
         // Add from extensions

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

@@ -29,7 +29,7 @@ import { sortBy } from '@shell/utils/sort';
 import { vspherePoolConfigMerge } from '@shell/machine-config/vmwarevsphere-pool-config-merge';
 
 import { compare, sortable } from '@shell/utils/version';
-import { isHarvesterSatisfiesVersion } from '@shell/utils/cluster';
+import { isHarvesterSatisfiesVersion, labelForAddon } from '@shell/utils/cluster';
 
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
@@ -42,6 +42,7 @@ import Tabbed from '@shell/components/Tabbed';
 import { canViewClusterMembershipEditor } from '@shell/components/form/Members/ClusterMembershipEditor';
 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';
@@ -62,6 +63,7 @@ import Registries from '@shell/edit/provisioning.cattle.io.cluster/tabs/registri
 import AddOnConfig from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig';
 import Advanced from '@shell/edit/provisioning.cattle.io.cluster/tabs/Advanced';
 import ClusterAppearance from '@shell/components/form/ClusterAppearance';
+import AddOnAdditionalManifest from '@shell/edit/provisioning.cattle.io.cluster/tabs/AddOnAdditionalManifest';
 
 const HARVESTER = 'harvester';
 const HARVESTER_CLOUD_PROVIDER = 'harvester-cloud-provider';
@@ -89,6 +91,8 @@ const NODE_TOTAL = {
 const CLUSTER_AGENT_CUSTOMIZATION = 'clusterAgentDeploymentCustomization';
 const FLEET_AGENT_CUSTOMIZATION = 'fleetAgentDeploymentCustomization';
 
+const isAzureK8sUnsupported = (version) => semver.gte(version, '1.30.0');
+
 export default {
   components: {
     AgentEnv,
@@ -111,7 +115,8 @@ export default {
     Registries,
     AddOnConfig,
     Advanced,
-    ClusterAppearance
+    ClusterAppearance,
+    AddOnAdditionalManifest
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -171,6 +176,7 @@ export default {
       });
     }
 
+    // default for dataDirectories configuration obj
     if (!this.value.spec.rkeConfig.dataDirectories) {
       set(this.value.spec.rkeConfig, 'dataDirectories', {
         systemAgent:  '',
@@ -179,6 +185,19 @@ export default {
       });
     }
 
+    // default for dataDirectories configuration systemAgent config
+    if (!this.value.spec.rkeConfig.dataDirectories.systemAgent) {
+      set(this.value.spec.rkeConfig.dataDirectories, 'systemAgent', '');
+    }
+    // default for dataDirectories configuration provisioning config
+    if (!this.value.spec.rkeConfig.dataDirectories.provisioning) {
+      set(this.value.spec.rkeConfig.dataDirectories, 'provisioning', '');
+    }
+    // default for dataDirectories configuration k8sDistro config
+    if (!this.value.spec.rkeConfig.dataDirectories.k8sDistro) {
+      set(this.value.spec.rkeConfig.dataDirectories, 'k8sDistro', '');
+    }
+
     if (!this.value.spec.rkeConfig.machineGlobalConfig) {
       set(this.value.spec, 'rkeConfig.machineGlobalConfig', {});
     }
@@ -230,6 +249,7 @@ export default {
       machinePoolErrors:     {},
       allNamespaces:         [],
       extensionTabs:         getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
+      labelForAddon
     };
   },
 
@@ -297,6 +317,7 @@ export default {
       const cur = this.liveValue?.spec?.kubernetesVersion || '';
       const existingRke2 = this.mode === _EDIT && cur.includes('rke2');
       const existingK3s = this.mode === _EDIT && cur.includes('k3s');
+      const isAzure = this.agentConfig?.['cloud-provider-name'] === 'azure';
 
       let allValidRke2Versions = this.getAllOptionsAfterCurrentVersion(this.rke2Versions, (existingRke2 ? cur : null), this.defaultRke2);
       let allValidK3sVersions = this.getAllOptionsAfterCurrentVersion(this.k3sVersions, (existingK3s ? cur : null), this.defaultK3s);
@@ -309,6 +330,11 @@ export default {
         allValidK3sVersions = this.filterOutDeprecatedPatchVersions(allValidK3sVersions, cur);
       }
 
+      if (isAzure) {
+        allValidRke2Versions = allValidRke2Versions.filter((v) => !isAzureK8sUnsupported(v.value));
+        allValidK3sVersions = allValidK3sVersions.filter((v) => !isAzureK8sUnsupported(v.value));
+      }
+
       const showRke2 = allValidRke2Versions.length && !existingK3s;
       const showK3s = allValidK3sVersions.length && !existingRke2;
       const out = [];
@@ -356,7 +382,7 @@ export default {
       // https://github.com/rancher/dashboard/issues/10338
       // there's an update loop on refresh that might include 'none'
       // multiple times... Prevent that
-      if (out.serverArgs?.cni?.options && !out.serverArgs?.cni?.options.includes('none')) {
+      if (out?.serverArgs?.cni?.options && !out.serverArgs?.cni?.options.includes('none')) {
         out.serverArgs.cni.options.push('none');
       }
 
@@ -385,11 +411,22 @@ export default {
     },
 
     needCredential() {
-      if (this.provider === 'custom' || this.provider === 'import' || this.isElementalCluster || this.mode === _VIEW || (this.providerConfig?.spec?.builtin === false && this.providerConfig?.spec?.addCloudCredential === false)) {
+      // Check non-provider specific config
+      if (
+        this.provider === 'custom' ||
+        this.provider === 'import' ||
+        this.isElementalCluster || // Elemental cluster can make use of `cloud-credential`: false
+        this.mode === _VIEW
+      ) {
         return false;
       }
 
-      if (this.customCredentialComponentRequired === false) {
+      // Check provider specific config
+      if (this.cloudCredentialsOverride === true || this.cloudCredentialsOverride === false) {
+        return this.cloudCredentialsOverride;
+      }
+
+      if (this.providerConfig?.spec?.builtin === false && this.providerConfig?.spec?.addCloudCredential === false) {
         return false;
       }
 
@@ -397,10 +434,21 @@ export default {
     },
 
     /**
-     * Only for extensions - extension can register a 'false' cloud credential to indicate that a cloud credential is not needed
+     * Override the native way of determining if cloud credentials are required (builtin ++ node driver spec.addCloudCredentials)
+     *
+     * 1) Override via extensions
+     *    - `true` or actual component - return true
+     *    - `false` - return false
+     * 2) Override via hardcoded setting
      */
-    customCredentialComponentRequired() {
-      return this.$plugin.getDynamic('cloud-credential', this.provider);
+    cloudCredentialsOverride() {
+      const cloudCredential = this.$plugin.getDynamic('cloud-credential', this.provider);
+
+      if (cloudCredential === undefined) {
+        return CLOUD_CREDENTIAL_OVERRIDE[this.provider];
+      }
+
+      return !!cloudCredential;
     },
 
     hasMachinePools() {
@@ -580,8 +628,9 @@ export default {
 
     cloudProviderOptions() {
       const out = [{
-        label: this.$store.getters['i18n/t']('cluster.rke2.cloudProvider.defaultValue.label'),
-        value: '',
+        label:    this.$store.getters['i18n/t']('cluster.rke2.cloudProvider.defaultValue.label'),
+        value:    '',
+        disabled: this.canAzureMigrateOnEdit
       }];
 
       if (!!this.agentArgs['cloud-provider-name']?.options) {
@@ -593,12 +642,22 @@ export default {
           // If we have a preferred provider... only show default, preferred and external
           const isPreferred = opt === preferred;
           const isExternal = opt === 'external';
+          const isAzure = opt === 'azure';
+
           let disabled = false;
 
           if ((this.isHarvesterExternalCredential || this.isHarvesterIncompatible) && isPreferred) {
             disabled = true;
           }
 
+          if (isAzure && isAzureK8sUnsupported(this.value.spec.kubernetesVersion)) {
+            disabled = true;
+          }
+
+          if (!isAzure && !isExternal && this.canAzureMigrateOnEdit) {
+            disabled = true;
+          }
+
           if (showAllOptions || isPreferred || isExternal) {
             out.push({
               label: this.$store.getters['i18n/withFallback'](`cluster.cloudProvider."${ opt }".label`, null, opt),
@@ -618,6 +677,25 @@ export default {
       return out;
     },
 
+    isAzureProviderUnsupported() {
+      const isAzureAvailable = !!this.cloudProviderOptions.find((p) => p.value === 'azure');
+      const isAzureSelected = this.agentConfig['cloud-provider-name'] === 'azure';
+
+      return isAzureAvailable && (isAzureK8sUnsupported(this.value.spec.kubernetesVersion) || isAzureSelected);
+    },
+
+    canAzureMigrateOnEdit() {
+      if (!this.isEdit) {
+        return false;
+      }
+
+      const isAzureLiveProvider = this.liveValue.agentConfig['cloud-provider-name'] === 'azure';
+
+      return isAzureLiveProvider &&
+        semver.gte(this.liveValue?.spec?.kubernetesVersion, '1.27.0') &&
+        semver.lt(this.liveValue?.spec?.kubernetesVersion, '1.30.0');
+    },
+
     canManageMembers() {
       return canViewClusterMembershipEditor(this.$store);
     },
@@ -1508,7 +1586,9 @@ export default {
     refreshComponentWithYamls(key) {
       const component = this.$refs[key];
 
-      if (component) {
+      if (Array.isArray(component) && component.length > 0) {
+        this.refreshYamls(component[0].$refs);
+      } else if (component) {
         this.refreshYamls(component.$refs);
       }
     },
@@ -2225,6 +2305,8 @@ export default {
             :show-cni="showCni"
             :show-cloud-provider="showCloudProvider"
             :cloud-provider-options="cloudProviderOptions"
+            :is-azure-provider-unsupported="isAzureProviderUnsupported"
+            :can-azure-migrate-on-edit="canAzureMigrateOnEdit"
             @cilium-values-changed="handleCiliumValuesChanged"
             @enabled-system-services-changed="handleEnabledSystemServicesChanged"
             @kubernetes-changed="handleKubernetesChange"
@@ -2309,23 +2391,39 @@ export default {
           />
         </Tab>
 
-        <!-- Add-on Config -->
+        <!-- Add-on Configs -->
         <Tab
-          name="addons"
-          label-key="cluster.tabs.addons"
-          @active="showAddons('tab-addOnConfig')"
+          v-for="v in addonVersions"
+          :key="v.name"
+          :name="v.name"
+          :label="labelForAddon(v.name, false)"
+          :weight="9"
+          :showHeader="false"
+          @active="showAddons(v.name)"
         >
           <AddOnConfig
-            ref="tab-addOnConfig"
+            :ref="v.name"
             v-model="value"
             :mode="mode"
             :version-info="versionInfo"
-            :addon-versions="addonVersions"
+            :addon-version="v"
             :addons-rev="addonsRev"
             :user-chart-values-temp="userChartValuesTemp"
             :init-yaml-editor="initYamlEditor"
             @update-questions="syncChartValues"
             @update-values="updateValues"
+          />
+        </Tab>
+
+        <!-- Add-on Additional Manifest -->
+        <Tab
+          name="additionalmanifest"
+          label-key="cluster.tabs.addOnAdditionalManifest"
+          :showHeader="false"
+        >
+          <AddOnAdditionalManifest
+            :value="value"
+            :mode="mode"
             @additional-manifest-changed="updateAdditionalManifest"
           />
         </Tab>

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

@@ -0,0 +1,50 @@
+<script>
+import YamlEditor from '@shell/components/YamlEditor';
+
+export default {
+  components: { YamlEditor },
+
+  props: {
+    mode: {
+      type:     String,
+      required: true,
+    },
+
+    value: {
+      type:     Object,
+      required: true,
+    }
+
+  },
+
+  computed: {
+    additionalManifest: {
+      get() {
+        return this.value.spec.rkeConfig.additionalManifest;
+      },
+      set(neu) {
+        this.$emit('additional-manifest-changed', neu);
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <div>
+    <h3>
+      {{ t('cluster.addOns.additionalManifest.title') }}
+      <i
+        v-clean-tooltip="t('cluster.addOns.additionalManifest.tooltip')"
+        class="icon icon-info"
+      />
+    </h3>
+    <YamlEditor
+      ref="yaml-additional"
+      v-model="additionalManifest"
+      :editor-mode="mode === 'view' ? 'VIEW_CODE' : 'EDIT_CODE'"
+      initial-yaml-values="# Additional Manifest YAML"
+      class="yaml-editor"
+    />
+  </div>
+</template>