@rancher/shell 0.5.2 → 0.5.3

package/edit/monitoring.coreos.com.alertmanagerconfig/types/slack.vue

@@ -126,7 +126,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledInput
-          v-model="value.httpConfig.proxyUrl"
+          v-model="value.httpConfig.proxyURL"
           :mode="mode"
           label="Proxy URL"
           placeholder="e.g. http://my-proxy/"

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

@@ -305,7 +305,7 @@ export default {
 
       const templates = this.templateOptions;
       const vueKontainerTypes = getters['plugins/clusterDrivers'];
-      const machineTypes = this.nodeDrivers.filter((x) => x.spec.active && x.state === 'active').map((x) => x.spec.displayName || x.id);
+      const machineTypes = this.nodeDrivers.filter((x) => x.spec.active && x.state === 'active');
 
       this.kontainerDrivers.filter((x) => (isImport ? x.showImport : x.showCreate)).forEach((obj) => {
         if ( vueKontainerTypes.includes(obj.driverName) ) {
@@ -330,14 +330,18 @@ export default {
         });
 
         if (this.isRke1 ) {
-          machineTypes.forEach((id) => {
-            addType(id, _RKE1, false, `/g/clusters/add/launch/${ id }`, this.iconClasses[id]);
+          machineTypes.forEach((type) => {
+            const id = type.spec.displayName || type.id;
+
+            addType(id, _RKE1, false, `/g/clusters/add/launch/${ id }`, this.iconClasses[id], type);
           });
 
           addType('custom', 'custom1', false, '/g/clusters/add/launch/custom');
         } else {
-          machineTypes.forEach((id) => {
-            addType(id, _RKE2, false);
+          machineTypes.forEach((type) => {
+            const id = type.spec.displayName || type.id;
+
+            addType(id, _RKE2, false, null, undefined, type);
           });
 
           addType('custom', 'custom2', false);
@@ -392,7 +396,7 @@ export default {
         out.push(subtype);
       }
 
-      function addType(id, group, disabled = false, emberLink = null, iconClass = undefined) {
+      function addType(id, group, disabled = false, emberLink = null, iconClass = undefined, providerConfig = undefined) {
         const label = getters['i18n/withFallback'](`cluster.provider."${ id }"`, null, id);
         const description = getters['i18n/withFallback'](`cluster.providerDescription."${ id }"`, null, '');
         const tag = '';
@@ -418,7 +422,8 @@ export default {
           group,
           disabled,
           emberLink,
-          tag
+          tag,
+          providerConfig
         };
 
         out.push(subtype);
@@ -638,6 +643,7 @@ export default {
         :live-value="liveValue"
         :mode="mode"
         :provider="subType"
+        :provider-config="selectedSubType.providerConfig"
       />
       <Rke2Config
         v-else
@@ -646,6 +652,7 @@ export default {
         :live-value="liveValue"
         :mode="mode"
         :provider="subType"
+        :provider-config="selectedSubType.providerConfig"
       />
     </template>
 

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

@@ -126,6 +126,11 @@ export default {
       type:     String,
       required: true,
     },
+
+    providerConfig: {
+      type:    Object,
+      default: () => null
+    }
   },
 
   async fetch() {
@@ -211,7 +216,6 @@ export default {
       machinePoolValidation: {}, // map of validation states for each machine pool
       machinePoolErrors:     {},
       allNamespaces:         [],
-      initialCloudProvider:  this.value?.agentConfig?.['cloud-provider-name'] || '',
       extensionTabs:         getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
     };
   },
@@ -326,6 +330,14 @@ export default {
 
       const out = findBy(this.versionOptions, 'value', str);
 
+      // Adding the option 'none' to Container Network select (used in Basics component)
+      // 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')) {
+        out.serverArgs.cni.options.push('none');
+      }
+
       return out;
     },
 
@@ -351,7 +363,7 @@ export default {
     },
 
     needCredential() {
-      if ( this.provider === 'custom' || this.provider === 'import' || this.isElementalCluster || this.mode === _VIEW ) {
+      if ( this.provider === 'custom' || this.provider === 'import' || this.isElementalCluster || this.mode === _VIEW || (this.providerConfig?.spec?.builtin === false && this.providerConfig?.spec?.addCloudCredential === false) ) {
         return false;
       }
 
@@ -577,30 +589,8 @@ export default {
 
       const cur = this.agentConfig?.['cloud-provider-name'];
 
-      if (cur && !out.find((x) => x.value === cur)) {
-        // Localization missing
-        // Look up cur in the localization file
-        const label = this.$store.getters['i18n/withFallback'](`cluster.cloudProvider."${ cur }".label`, null, cur);
-
-        out.unshift({
-          label:       `${ label } (Current)`,
-          value:       cur,
-          unsupported: true,
-          disabled:    true
-        });
-      }
-
-      const initial = this.initialCloudProvider;
-
-      if (cur !== initial && initial && !out.find((x) => x.value === initial)) {
-        const label = this.$store.getters['i18n/withFallback'](`cluster.cloudProvider."${ initial }".label`, null, initial);
-
-        out.unshift({
-          label:       `${ label } (Current)`,
-          value:       initial,
-          unsupported: true,
-          disabled:    true
-        });
+      if ( cur && !out.find((x) => x.value === cur) ) {
+        out.unshift({ label: `${ cur } (Current)`, value: cur });
       }
 
       return out;
@@ -708,14 +698,6 @@ export default {
 
       return validRequiredPools && base;
     },
-    unsupportedCloudProvider() {
-      // The current cloud provider
-      const cur = this.initialCloudProvider;
-
-      const provider = cur && this.cloudProviderOptions.find((x) => x.value === cur);
-
-      return !!provider?.unsupported;
-    },
   },
 
   watch: {
@@ -1431,7 +1413,9 @@ export default {
       for ( const chartName of this.addonNames ) {
         const entry = this.chartVersions[chartName];
 
-        if ( this.versionInfo[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;
         }
 
@@ -1568,8 +1552,7 @@ export default {
         set(regs, 'mirrors', {});
       }
 
-      const hostname = Object.keys(regs.configs)[0];
-      const config = regs.configs[hostname];
+      const config = regs.configs[this.registryHost];
 
       if ( config ) {
         registrySecret = config.authConfigSecretName;
@@ -1866,18 +1849,6 @@ export default {
         if (this.isHarvesterDriver && this.mode === _CREATE && this.isHarvesterIncompatible) {
           this.setHarvesterDefaultCloudProvider();
         }
-
-        // Cloud Provider check
-        // If the cloud provider is unsupported, switch provider to 'external'
-        if (this.unsupportedCloudProvider) {
-          set(this.agentConfig, 'cloud-provider-name', 'external');
-        } else {
-          // Switch the cloud provider back to the initial value
-          // Use changed the Kubernetes version back to a version where the initial cloud provider is valid - so switch back to this one
-          // to undo the change to external that we may have made
-          // Note: Cloud Provider can only be changed on edit when the initial provider is no longer supported
-          set(this.agentConfig, 'cloud-provider-name', this.initialCloudProvider);
-        }
       }
     },
 
@@ -2048,11 +2019,13 @@ export default {
       :cancel="cancelCredential"
       :showing-form="showForm"
       :default-on-cancel="true"
+      data-testid="select-credential"
       class="mt-20"
     />
 
     <div
       v-if="showForm"
+      data-testid="form"
       class="mt-20"
     >
       <NameNsDescription
@@ -2182,7 +2155,6 @@ export default {
             :have-arg-info="haveArgInfo"
             :show-cni="showCni"
             :show-cloud-provider="showCloudProvider"
-            :unsupported-cloud-provider="unsupportedCloudProvider"
             :cloud-provider-options="cloudProviderOptions"
             @cilium-values-changed="handleCiliumValuesChanged"
             @enabled-system-services-changed="handleEnabledSystemServicesChanged"

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

@@ -103,10 +103,6 @@ export default {
       type:     Boolean,
       required: true
     },
-    unsupportedCloudProvider: {
-      type:     Boolean,
-      required: true
-    },
     cloudProviderOptions: {
       type:     Array,
       required: true
@@ -369,7 +365,7 @@ export default {
     },
 
     canNotEditCloudProvider() {
-      const canNotEdit = this.isEdit && !this.unsupportedCloudProvider;
+      const canNotEdit = this.isEdit;
 
       return canNotEdit;
     },
@@ -421,12 +417,20 @@ export default {
     >
       <span v-clean-html="t('cluster.banner.cloudProviderAddConfig', {}, true)" />
     </Banner>
+    <Banner
+      v-if="serverConfig.cni === 'none'"
+      color="warning"
+      data-testid="clusterBasics__noneOptionSelectedForCni"
+    >
+      <span v-clean-html="t('cluster.rke2.cni.cniNoneBanner', {}, true)" />
+    </Banner>
     <div class="row mb-10">
       <div class="col span-6">
         <LabeledSelect
           v-model="value.spec.kubernetesVersion"
           :mode="mode"
           :options="versionOptions"
+          data-testid="clusterBasics__kubernetesVersions"
           label-key="cluster.kubernetesVersion.label"
           @input="$emit('kubernetes-changed', $event)"
         />
@@ -495,12 +499,6 @@ export default {
       <div class="spacer" />
 
       <div class="col span-12">
-        <Banner
-          v-if="unsupportedCloudProvider"
-          class="error mt-5"
-        >
-          {{ t('cluster.rke2.cloudProvider.unsupported') }}
-        </Banner>
         <h3>
           {{ t('cluster.rke2.cloudProvider.header') }}
         </h3>

package/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue

@@ -138,13 +138,14 @@ export default {
       :mode="mode"
       @input="update"
     >
-      <template #default="{row}">
+      <template #default="{row, i}">
         <div class="row">
           <div class="col span-6">
             <LabeledInput
               v-model="row.value.hostname"
               label="Registry Hostname"
               :mode="mode"
+              :data-testid="`registry-auth-host-input-${i}`"
             />
 
             <SelectOrCreateAuthSecret
@@ -158,6 +159,7 @@ export default {
               :namespace="value.metadata.namespace"
               :mode="mode"
               generate-name="registryconfig-auth-"
+              :data-testid="`registry-auth-select-or-create-${i}`"
             />
           </div>
           <div class="col span-6">

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

@@ -79,6 +79,7 @@ export default {
         :value="showCustomRegistryInput"
         class="mb-20"
         :label="t('cluster.privateRegistry.label')"
+        data-testid="registries-enable-checkbox"
         @input="$emit('custom-registry-changed', $event)"
       />
     </div>
@@ -92,6 +93,7 @@ export default {
           label-key="catalog.chart.registry.custom.inputLabel"
           placeholder-key="catalog.chart.registry.custom.placeholder"
           :min-height="30"
+          data-testid="registry-host-input"
           @input="$emit('registry-host-changed', $event)"
         />
         <SelectOrCreateAuthSecret
@@ -118,6 +120,7 @@ export default {
           class="col span-12 advanced"
           :is-open-by-default="showCustomRegistryAdvancedInput"
           :mode="mode"
+          data-testid="registries-advanced-section"
         >
           <Banner
             :closable="false"

package/edit/token.vue

@@ -199,6 +199,7 @@ export default {
         <RadioGroup
           v-model="form.expiryType"
           :options="expiryOptions"
+          data-testid="expiry__options"
           class="mr-20"
           name="expiryGroup"
         />

package/list/catalog.cattle.io.app.vue

@@ -39,6 +39,7 @@ export default {
     :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
     :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+    data-testid="installed-app-catalog-list"
   >
     <template #cell:upgrade="{row}">
       <span

package/list/management.cattle.io.setting.vue

@@ -92,6 +92,7 @@ export default {
       v-for="setting in settings"
       :key="setting.id"
       class="advanced-setting mb-20"
+      :data-testid="`advanced-setting__option-${setting.id}`"
     >
       <div class="header">
         <div class="title">

package/machine-config/amazonec2.vue

@@ -475,6 +475,7 @@ export default {
               :disabled="disabled"
               :placeholder="t('cluster.machineConfig.amazonEc2.selectedNetwork.placeholder')"
               :label="t('cluster.machineConfig.amazonEc2.selectedNetwork.label')"
+              data-testid="amazonEc2__selectedNetwork"
               option-key="value"
               @input="updateNetwork($event)"
             >

package/models/__tests__/provisioning.cattle.io.cluster.test.ts

@@ -26,6 +26,56 @@ describe('class ProvCluster', () => {
     clusterName: 'test', provisioner: 'rke2', mgmt: { isLocal: false, providerForEmberParam: 'import' }, spec: { rkeConfig: {} }
   };
 
+  const gkeClusterWithPrivateEndpoint = {
+    clusterName: 'test',
+    provisioner: 'GKE',
+    spec:        { rkeConfig: {} },
+    mgmt:        { spec: { gkeConfig: { privateClusterConfig: { enablePrivateEndpoint: true } } } }
+  };
+
+  const eksClusterWithPrivateEndpoint = {
+    clusterName: 'test',
+    provisioner: 'EKS',
+    spec:        { rkeConfig: {} },
+    mgmt:        { spec: { eksConfig: { privateAccess: true } } }
+  };
+
+  const aksClusterWithPrivateEndpoint = {
+    clusterName: 'test',
+    provisioner: 'AKS',
+    spec:        { rkeConfig: {} },
+    mgmt:        { spec: { aksConfig: { privateCluster: true } } }
+  };
+
+  // Related to https://github.com/rancher/dashboard/issues/9402
+  describe('isHostedKubernetesProvider + isPrivateHostedProvider', () => {
+    const testCases = [
+      [gkeClusterWithPrivateEndpoint, true],
+      [eksClusterWithPrivateEndpoint, true],
+      [aksClusterWithPrivateEndpoint, true],
+    ];
+    const resetMocks = () => {
+      // Clear all mock function calls:
+      jest.clearAllMocks();
+    };
+
+    it.each(testCases)('should return the isHostedKubernetesProvider and isPrivateHostedProvider values properly based on the props data', (clusterData: Object, expected: Boolean) => {
+      const cluster = new ProvCluster({ spec: clusterData.spec });
+
+      jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(
+        clusterData.mgmt
+      );
+      jest.spyOn(cluster, 'provisioner', 'get').mockReturnValue(
+        clusterData.provisioner
+      );
+
+      expect(cluster.isRke2).toBe(expected);
+      expect(cluster.isHostedKubernetesProvider).toBe(expected);
+      expect(cluster.isPrivateHostedProvider).toBe(expected);
+      resetMocks();
+    });
+  });
+
   describe('isImported', () => {
     const testCases = [
       [importedClusterInfo, true],
@@ -84,6 +134,107 @@ describe('class ProvCluster', () => {
 
       expect(cluster.mgmt).toBe(expected);
       resetMocks();
+    });
+  });
+
+  describe('hasError', () => {
+    const conditionsWithoutError = [
+      {
+        error:          false,
+        lastUpdateTime: '2022-10-17T23:09:15Z',
+        status:         'True',
+        transitioning:  false,
+        type:           'Ready'
+      },
+    ];
+
+    const conditionsWithoutReady = [
+      {
+        error:          true,
+        lastUpdateTime: '2022-10-17T23:09:15Z',
+        status:         'False',
+        message:        'some-error-message',
+        transitioning:  false,
+        type:           'Pending'
+      },
+    ];
+
+    const noConditions:[] = [];
+
+    const conditionsWithReadyLatest = [
+      {
+        error:          true,
+        lastUpdateTime: '2022-10-17T23:09:15Z',
+        status:         'False',
+        message:        'some-error-message',
+        transitioning:  false,
+        type:           'Pending'
+      },
+      {
+        error:          false,
+        lastUpdateTime: '2023-10-17T23:09:15Z',
+        status:         'True',
+        transitioning:  false,
+        type:           'Ready'
+      }
+    ];
+
+    const conditionsWithErrorLatest = [
+      {
+        error:          false,
+        lastUpdateTime: '2022-10-17T23:09:15Z',
+        status:         'True',
+        transitioning:  false,
+        type:           'Ready'
+      },
+      {
+        error:          true,
+        lastUpdateTime: '2023-10-17T23:09:15Z',
+        status:         'False',
+        message:        'some-error-message',
+        transitioning:  false,
+        type:           'Pending'
+      }
+    ];
+
+    const conditionsWithProblemInLastUpdateTimeProp = [
+      {
+        error:          true,
+        lastUpdateTime: '',
+        status:         'False',
+        message:        'some-error-message',
+        transitioning:  false,
+        type:           'Pending'
+      },
+      {
+        error:          false,
+        lastUpdateTime: '2023-10-17T23:09:15Z',
+        status:         'True',
+        transitioning:  false,
+        type:           'Ready'
+      }
+    ];
+
+    const testCases = [
+      ['conditionsWithoutError', conditionsWithoutError, false],
+      ['conditionsWithoutReady', conditionsWithoutReady, true],
+      ['noConditions', noConditions, false],
+      ['conditionsWithReadyLatest', conditionsWithReadyLatest, false],
+      ['conditionsWithErrorLatest', conditionsWithErrorLatest, true],
+      ['conditionsWithProblemInLastUpdateTimeProp', conditionsWithProblemInLastUpdateTimeProp, false],
+    ];
+
+    const resetMocks = () => {
+      // Clear all mock function calls
+      jest.clearAllMocks();
+    };
+
+    it.each(testCases)('should return the hasError value properly based on the "status.conditions" props data for testcase %p', (testName: string, conditions: Array, expected: Boolean) => {
+      const ctx = { rootGetters: { 'management/byId': jest.fn() } };
+      const cluster = new ProvCluster({ status: { conditions } }, ctx);
+
+      expect(cluster.hasError).toBe(expected);
+      resetMocks();
     }
     );
   });

package/models/__tests__/secret.test.ts

@@ -0,0 +1,37 @@
+import Secret from '@shell/models/secret';
+
+describe('class Secret', () => {
+  it('should contains the type attribute if cleanForDownload', async() => {
+    const secret = new Secret({});
+    const yaml = `apiVersion: v1
+kind: Secret
+metadata:
+  name: my-secret
+type: Opaque
+`;
+    const cleanYaml = await secret.cleanForDownload(yaml);
+
+    expect(cleanYaml).toBe(yaml);
+  });
+
+  it('should remove id, links and actions keys if cleanForDownload', async() => {
+    const secret = new Secret({});
+    const expectedYamlStr = `apiVersion: v1
+kind: Secret
+metadata:
+  name: my-secret
+  namespace: default
+type: Opaque
+`;
+    const part = `id: test_id
+links:
+  view: https://example.com
+actions:
+  remove: https://example.com`;
+    const yaml = `${ expectedYamlStr }
+${ part }`;
+    const cleanYaml = await secret.cleanForDownload(yaml);
+
+    expect(cleanYaml).toBe(expectedYamlStr);
+  });
+});

package/models/__tests__/storage.k8s.io.storageclass.test.ts

@@ -0,0 +1,22 @@
+import StorageClass, { PROVISIONER_OPTIONS } from '@shell/models/storage.k8s.io.storageclass';
+
+describe('class StorageClass', () => {
+  describe('checking if provisionerDisplay', () => {
+    it.each([
+      ['kubernetes.io/azure-disk', true],
+      ['kubernetes.io/portworx-volume', true],
+      ['rancher.io/local-path', false],
+      ['some-random-string-as-provisioner', false],
+    ])('should NOT show a suffix IF they are built-in (on the PROVISIONER_OPTIONS list)', (provisioner, expectation) => {
+      const storageClass = new StorageClass({
+        metadata: {},
+        spec:     {},
+        provisioner
+      });
+
+      jest.spyOn(storageClass, '$rootGetters', 'get').mockReturnValue({ 'i18n/t': jest.fn() });
+
+      expect(!!PROVISIONER_OPTIONS.find((opt) => opt.value === provisioner)).toBe(expectation);
+    });
+  });
+});

package/models/provisioning.cattle.io.cluster.js

@@ -249,6 +249,21 @@ export default class ProvCluster extends SteveModel {
     return providers.includes(this.provisioner);
   }
 
+  get isPrivateHostedProvider() {
+    if (this.isHostedKubernetesProvider && this.mgmt && this.provisioner) {
+      switch (this.provisioner.toLowerCase()) {
+      case 'gke':
+        return this.mgmt.spec?.gkeConfig?.privateClusterConfig?.enablePrivateEndpoint;
+      case 'eks':
+        return this.mgmt.spec?.eksConfig?.privateAccess;
+      case 'aks':
+        return this.mgmt.spec?.aksConfig?.privateCluster;
+      }
+    }
+
+    return false;
+  }
+
   get isLocal() {
     return this.mgmt?.isLocal;
   }
@@ -891,7 +906,27 @@ export default class ProvCluster extends SteveModel {
   }
 
   get hasError() {
-    return this.status?.conditions?.some((condition) => condition.error === true);
+    // Before we were just checking for this.status?.conditions?.some((condition) => condition.error === true)
+    // but this is wrong as an error might exist but it might not be meaningful in the context of readiness of a cluster
+    // which is what this 'hasError' is used for.
+    // We now check if there's a ready condition after an error, which helps dictate the readiness of a cluster
+    // Based on the findings in https://github.com/rancher/dashboard/issues/10043
+    if (this.status?.conditions && this.status?.conditions.length) {
+      // if there are errors, we compare with how recent the "Ready" condition is compared to that error, otherwise we just move on
+      if (this.status?.conditions.some((c) => c.error === true)) {
+        // there's no ready condition and has an error, mark it
+        if (!this.status?.conditions.some((c) => c.type === 'Ready')) {
+          return true;
+        }
+
+        const filteredConditions = this.status?.conditions.filter((c) => c.error === true || c.type === 'Ready');
+        const mostRecentCondition = filteredConditions.reduce((a, b) => ((a.lastUpdateTime > b.lastUpdateTime) ? a : b));
+
+        return mostRecentCondition.error;
+      }
+    }
+
+    return false;
   }
 
   get namespaceLocation() {

package/models/secret.js

@@ -9,6 +9,7 @@ import SteveModel from '@shell/plugins/steve/steve-class';
 import { colorForState, stateDisplay, STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 import { diffFrom } from '@shell/utils/time';
 import day from 'dayjs';
+import { steveCleanForDownload } from '@shell/plugins/steve/resource-utils';
 
 export const TYPES = {
   OPAQUE:           'Opaque',
@@ -456,4 +457,12 @@ export default class Secret extends SteveModel {
 
     return val;
   }
+
+  async cleanForDownload(yaml) {
+    // secret resource contains the type attribute
+    // ref: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/secret-v1/
+    // ref: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
+
+    return steveCleanForDownload(yaml, { rootKeys: ['id', 'links', 'actions'] });
+  }
 }

package/models/storage.k8s.io.storageclass.js

@@ -84,7 +84,7 @@ export const PROVISIONER_OPTIONS = [
 export default class extends SteveModel {
   get provisionerDisplay() {
     const option = PROVISIONER_OPTIONS.find((o) => o.value === this.provisioner);
-    const fallback = `${ this.provisioner } ${ this.t('persistentVolume.csi.drivers.suffix') }`;
+    const fallback = `${ this.provisioner } ${ this.t('persistentVolume.csi.suffix') }`;
 
     return option ? this.t(option.labelKey) : this.$rootGetters['i18n/withFallback'](`persistentVolume.csi.drivers.${ this.provisioner.replaceAll('.', '-') }`, null, fallback);
   }