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

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

@@ -25,10 +25,7 @@ import {
   clone, diff, set, get, isEmpty, mergeWithReplaceArrays
 } from '@shell/utils/object';
 import { allHash } from '@shell/utils/promise';
-import { sortBy } from '@shell/utils/sort';
-
-import { compare, sortable } from '@shell/utils/version';
-import { isHarvesterSatisfiesVersion, labelForAddon } from '@shell/utils/cluster';
+import { getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon } from '@shell/utils/cluster';
 
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
@@ -321,15 +318,15 @@ export default {
       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);
+      let allValidRke2Versions = getAllOptionsAfterCurrentVersion(this.$store, this.rke2Versions, (existingRke2 ? cur : null), this.defaultRke2);
+      let allValidK3sVersions = getAllOptionsAfterCurrentVersion(this.$store, this.k3sVersions, (existingK3s ? cur : null), this.defaultK3s);
 
       if (!this.showDeprecatedPatchVersions) {
         // Normally, we only want to show the most recent patch version
         // for each Kubernetes minor version. However, if the user
         // opts in to showing deprecated versions, we don't filter them.
-        allValidRke2Versions = this.filterOutDeprecatedPatchVersions(allValidRke2Versions, cur);
-        allValidK3sVersions = this.filterOutDeprecatedPatchVersions(allValidK3sVersions, cur);
+        allValidRke2Versions = filterOutDeprecatedPatchVersions(allValidRke2Versions, cur);
+        allValidK3sVersions = filterOutDeprecatedPatchVersions(allValidK3sVersions, cur);
       }
 
       if (isAzure) {
@@ -711,7 +708,7 @@ export default {
       const first = all[0]?.value;
       const preferred = all.find((x) => x.value === this.defaultRke2)?.value;
 
-      const rke2 = this.getAllOptionsAfterCurrentVersion(this.rke2Versions, null);
+      const rke2 = getAllOptionsAfterCurrentVersion(this.$store, this.rke2Versions, null);
       const showRke2 = rke2.length;
       let out;
 
@@ -984,6 +981,10 @@ export default {
       if (this.value.spec.defaultPodSecurityAdmissionConfigurationTemplateName === undefined) {
         this.value.spec.defaultPodSecurityAdmissionConfigurationTemplateName = '';
       }
+
+      if ( isEmpty(this.value?.spec?.localClusterAuthEndpoint) ) {
+        set(this.value, 'spec.localClusterAuthEndpoint', { enabled: false });
+      }
     },
 
     /**
@@ -1111,6 +1112,17 @@ export default {
       }
     },
 
+    enableLocalClusterAuthEndpoint(neu) {
+      this.localValue.spec.localClusterAuthEndpoint.enabled = neu;
+      if (!neu) {
+        delete this.localValue.spec.localClusterAuthEndpoint.caCerts;
+        delete this.localValue.spec.localClusterAuthEndpoint.fqdn;
+      } else {
+        this.localValue.spec.localClusterAuthEndpoint.caCerts = '';
+        this.localValue.spec.localClusterAuthEndpoint.fqdn = '';
+      }
+    },
+
     /**
      * Get machine pools from the cluster configuration
      * this.value.spec.rkeConfig.machinePools
@@ -1792,110 +1804,6 @@ export default {
       this.value.spec.rkeConfig.registries.configs = configs;
     },
 
-    getAllOptionsAfterCurrentVersion(versions, currentVersion, defaultVersion) {
-      const out = (versions || []).filter((obj) => !!obj.serverArgs).map((obj) => {
-        let disabled = false;
-        let experimental = false;
-        let isCurrentVersion = false;
-        let label = obj.id;
-
-        if (currentVersion) {
-          disabled = compare(obj.id, currentVersion) < 0;
-          isCurrentVersion = compare(obj.id, currentVersion) === 0;
-        }
-
-        if (defaultVersion) {
-          experimental = compare(defaultVersion, obj.id) < 0;
-        }
-
-        if (isCurrentVersion) {
-          label = `${ label } ${ this.t('cluster.kubernetesVersion.current') }`;
-        }
-
-        if (experimental) {
-          label = `${ label } ${ this.t('cluster.kubernetesVersion.experimental') }`;
-        }
-
-        return {
-          label,
-          value:      obj.id,
-          sort:       sortable(obj.id),
-          serverArgs: obj.serverArgs,
-          agentArgs:  obj.agentArgs,
-          charts:     obj.charts,
-          disabled,
-        };
-      });
-
-      if (currentVersion && !out.find((obj) => obj.value === currentVersion)) {
-        out.push({
-          label: `${ currentVersion } ${ this.t('cluster.kubernetesVersion.current') }`,
-          value: currentVersion,
-          sort:  sortable(currentVersion),
-        });
-      }
-
-      const sorted = sortBy(out, 'sort:desc');
-
-      const mostRecentPatchVersions = this.getMostRecentPatchVersions(sorted);
-
-      const sortedWithDeprecatedLabel = sorted.map((optionData) => {
-        const majorMinor = `${ semver.major(optionData.value) }.${ semver.minor(optionData.value) }`;
-
-        if (mostRecentPatchVersions[majorMinor] === optionData.value) {
-          return optionData;
-        }
-
-        return {
-          ...optionData,
-          label: `${ optionData.label } ${ this.t('cluster.kubernetesVersion.deprecated') }`
-        };
-      });
-
-      return sortedWithDeprecatedLabel;
-    },
-
-    getMostRecentPatchVersions(sortedVersions) {
-      // Get the most recent patch version for each Kubernetes minor version.
-      const versionMap = {};
-
-      sortedVersions.forEach((version) => {
-        const majorMinor = `${ semver.major(version.value) }.${ semver.minor(version.value) }`;
-
-        if (!versionMap[majorMinor]) {
-          // Because we start with a sorted list of versions, we know the
-          // highest patch version is first in the list, so we only keep the
-          // first of each minor version in the list.
-          versionMap[majorMinor] = version.value;
-        }
-      });
-
-      return versionMap;
-    },
-
-    filterOutDeprecatedPatchVersions(allVersions, currentVersion) {
-      // Get the most recent patch version for each Kubernetes minor version.
-      const mostRecentPatchVersions = this.getMostRecentPatchVersions(allVersions);
-
-      const filteredVersions = allVersions.filter((version) => {
-        // Always show pre-releases
-        if (semver.prerelease(version.value)) {
-          return true;
-        }
-
-        const majorMinor = `${ semver.major(version.value) }.${ semver.minor(version.value) }`;
-
-        // Always show current version, else show if we haven't shown anything for this major.minor version yet
-        if (version.value === currentVersion || mostRecentPatchVersions[majorMinor] === version.value) {
-          return true;
-        }
-
-        return false;
-      });
-
-      return filteredVersions;
-    },
-
     generateYaml() {
       const resource = this.value;
       const inStore = this.$store.getters['currentStore'](resource);
@@ -2393,8 +2301,16 @@ export default {
             :mode="mode"
             :selected-version="selectedVersion"
             :truncate-limit="truncateLimit"
-            @update:value="$emit('input', $event)"
-            @truncate-hostname="truncateHostname"
+            @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"
+            @cluster-domain-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['cluster-domain'] = val"
+            @cluster-dns-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['cluster-dns'] = val"
+            @service-node-port-range-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['service-node-port-range'] = val"
+            @tls-san-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['tls-san'] = val"
+            @local-cluster-auth-endpoint-changed="enableLocalClusterAuthEndpoint"
+            @ca-certs-changed="(val)=>localValue.spec.localClusterAuthEndpoint.caCerts = val"
+            @fqdn-changed="(val)=>localValue.spec.localClusterAuthEndpoint.fqdn = val"
           />
         </Tab>
 

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

@@ -300,7 +300,7 @@ export default {
       return name === 'rancher-vsphere';
     },
 
-    showk8s21LegacyWarning() {
+    showk8sLegacyWarning() {
       const isLegacyEnabled = this.features(LEGACY);
 
       if (!isLegacyEnabled) {
@@ -437,7 +437,7 @@ export default {
       :label="t('cluster.banner.haveArgInfo')"
     />
     <Banner
-      v-if="showk8s21LegacyWarning"
+      v-if="showk8sLegacyWarning"
       color="warning"
       :label="t('cluster.legacyWarning')"
     />

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

@@ -2,14 +2,14 @@
 import { RadioGroup } from '@components/Form/Radio';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import FileSelector, { createOnSelected } from '@shell/components/form/FileSelector';
-import { set } from '@shell/utils/object';
-import isEmpty from 'lodash/isEmpty';
 
 export default {
   components: {
     RadioGroup, LabeledInput, FileSelector
   },
 
+  emits: ['fqdn-changed', 'ca-certs-changed', 'local-cluster-auth-endpoint-changed'],
+
   props: {
     mode: {
       type:     String,
@@ -22,57 +22,43 @@ export default {
     },
   },
 
-  data() {
-    if ( isEmpty(this.value?.spec?.localClusterAuthEndpoint) ) {
-      set(this.value, 'spec.localClusterAuthEndpoint', {
-        enabled: false,
-        caCerts: '',
-        fqdn:    '',
-      });
-    }
-
-    return {};
-  },
-
-  computed: {
-    config() {
-      return this.value.spec.localClusterAuthEndpoint;
-    },
-  },
-
-  methods: { onCertSelected: createOnSelected('config.caCerts') }
+  methods: { onCertSelected: createOnSelected('value.caCerts') }
 };
 </script>
 
 <template>
   <div>
-    <h3 v-t="'cluster.tabs.ace'" />
-
     <RadioGroup
-      v-model:value="config.enabled"
+      v-model:value="value.enabled"
       name="enabled"
+      data-testid="ace-enabled-radio-input"
       :options="[false, true]"
       :labels="[t('generic.disabled'), t('generic.enabled')]"
       :mode="mode"
+      @update:value="$emit('local-cluster-auth-endpoint-changed', $event)"
     />
 
-    <template v-if="config.enabled">
+    <template v-if="value.enabled">
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model:value="config.fqdn"
+            :value="value.fqdn"
             :mode="mode"
-            label="FQDN"
+            :label="t('cluster.rke2.address.fqdn.label')"
+            data-testid="ace-fqdn-input"
             :tooltip="t('cluster.rke2.address.fqdn.toolTip')"
+            @update:value="$emit('fqdn-changed', $event)"
           />
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model:value="config.caCerts"
+            :value="value.caCerts"
             :mode="mode"
             :label="t('cluster.rke2.address.caCerts.label')"
             type="multiline"
+            data-testid="ace-cacerts-input"
             :tooltip="t('cluster.rke2.address.caCerts.toolTip')"
+            @update:value="$emit('ca-certs-changed', $event)"
           />
           <FileSelector
             :mode="mode"

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

@@ -9,7 +9,12 @@ import ACE from '@shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE'
 const NETBIOS_TRUNCATION_LENGTH = 15;
 
 export default {
-  emits: ['update:value', 'truncate-hostname', 'input'],
+  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'
+  ],
 
   components: {
     LabeledInput,
@@ -74,7 +79,7 @@ export default {
         this.$emit('update:value', newValue);
       }
     },
-  },
+  }
 };
 </script>
 
@@ -99,10 +104,11 @@ export default {
         class="col span-6"
       >
         <LabeledInput
-          v-model:value="serverConfig['cluster-cidr']"
+          :value="serverConfig['cluster-cidr']"
           :mode="mode"
           :disabled="isEdit"
           :label="t('cluster.rke2.address.clusterCidr.label')"
+          @update:value="$emit('cluster-cidr-changed', $event)"
         />
       </div>
       <div
@@ -110,10 +116,11 @@ export default {
         class="col span-6"
       >
         <LabeledInput
-          v-model:value="serverConfig['service-cidr']"
+          :value="serverConfig['service-cidr']"
           :mode="mode"
           :disabled="isEdit"
           :label="t('cluster.rke2.address.serviceCidr.label')"
+          @update:value="$emit('service-cidr-changed', $event)"
         />
       </div>
     </div>
@@ -124,10 +131,11 @@ export default {
         class="col span-6"
       >
         <LabeledInput
-          v-model:value="serverConfig['cluster-dns']"
+          :value="serverConfig['cluster-dns']"
           :mode="mode"
           :disabled="isEdit"
           :label="t('cluster.rke2.address.dns.label')"
+          @update:value="$emit('cluster-dns-changed', $event)"
         />
       </div>
       <div
@@ -135,10 +143,11 @@ export default {
         class="col span-6"
       >
         <LabeledInput
-          v-model:value="serverConfig['cluster-domain']"
+          :value="serverConfig['cluster-domain']"
           :mode="mode"
           :disabled="isEdit"
           :label="t('cluster.rke2.address.domain.label')"
+          @update:value="$emit('cluster-domain-changed', $event)"
         />
       </div>
     </div>
@@ -149,9 +158,10 @@ export default {
     >
       <div class="col span-6">
         <LabeledInput
-          v-model:value="serverConfig['service-node-port-range']"
+          :value="serverConfig['service-node-port-range']"
           :mode="mode"
           :label="t('cluster.rke2.address.nodePortRange.label')"
+          @update:value="$emit('service-node-port-range-changed', $event)"
         />
       </div>
       <div
@@ -165,7 +175,7 @@ export default {
           :mode="mode"
           :label="t('cluster.rke2.truncateHostnames')"
           data-testid="network-tab-truncate-hostname"
-          @update:value="$emit('truncate-hostname', $event)"
+          @update:value="$emit('truncate-hostname-changed', $event)"
         />
         <Banner
           v-if="hostnameTruncationManuallySet"
@@ -184,18 +194,21 @@ export default {
     >
       <div class="col span-6">
         <ArrayList
-          v-model:value="serverConfig['tls-san']"
+          :value="serverConfig['tls-san']"
           :protip="false"
           :mode="mode"
           :title="t('cluster.rke2.address.tlsSan.label')"
+          @update:value="$emit('tls-san-changed', $event)"
         />
       </div>
     </div>
-
+    <h3 v-t="'cluster.tabs.ace'" />
     <ACE
-      v-model:value="localValue"
+      v-model:value="localValue.spec.localClusterAuthEndpoint"
       :mode="mode"
-      @update:value="$emit('input', $event)"
+      @fqdn-changed="$emit('fqdn-changed', $event)"
+      @caCerts-changed="$emit('ca-certs-changed', $event)"
+      @local-cluster-auth-endpoint-changed="$emit('local-cluster-auth-endpoint-changed', $event)"
     />
   </div>
 </template>

package/edit/service.vue

@@ -259,7 +259,6 @@ export default {
   methods: {
     updateMatchingPods: throttle(function() {
       const { value: { spec: { selector = { } } } } = this;
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, need to replace local selector somehow
       const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value?.metadata?.namespace);
 
       if (isEmpty(selector)) {
@@ -287,7 +286,7 @@ export default {
 
         const hash = {
           provClusters:     this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
-          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
+          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
           harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
         };
 

package/list/networking.k8s.io.ingress.vue

@@ -20,7 +20,7 @@ export default {
 
   methods: {
     /**
-     * opts: FetchSecondaryResourcesOpts
+     * of type PagTableFetchSecondaryResources
      */
     async fetchSecondaryResources(opts) {
       // pathExistsInSchema requires schema networking.k8s.io.ingress to have resources fields via schema definition but none were found. has the schema 'fetchResourceFields' been called?

package/list/node.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import Tag from '@shell/components/Tag.vue';
 import { Banner } from '@components/Banner';
 import { PODS } from '@shell/config/table-headers';
@@ -19,6 +19,7 @@ import { GROUP_RESOURCES, mapPref } from '@shell/store/prefs';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
 import { mapGetters } from 'vuex';
+import { PagTableFetchPageSecondaryResourcesOpts, PagTableFetchSecondaryResourcesOpts, PagTableFetchSecondaryResourcesReturns } from '@shell/types/components/paginatedResourceTable';
 
 export default defineComponent({
   name: 'ListNode',
@@ -185,19 +186,25 @@ export default defineComponent({
       row['displayLabels'] = !row.displayLabels;
     },
 
-    fetchSecondaryResources(): { [key: string]: Promise<any>} {
-      const hash: { [key: string]: Promise<any>} = {};
+    /**
+     * of type PagTableFetchSecondaryResources
+     */
+    async fetchSecondaryResources({ canPaginate }: PagTableFetchSecondaryResourcesOpts): PagTableFetchSecondaryResourcesReturns {
+      if (canPaginate) {
+        return;
+      }
+      const promises = [];
 
       if (this.canViewMgmtNodes) {
-        hash.mgmtNodes = this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.NODE });
+        promises.push(this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.NODE }));
       }
 
       if (this.canViewNormanNodes) {
-        hash.normanNodes = this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE });
+        promises.push(this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE }));
       }
 
       if (this.canViewMachines) {
-        hash.machines = this.$store.dispatch(`management/findAll`, { type: CAPI.MACHINE });
+        promises.push(this.$store.dispatch(`management/findAll`, { type: CAPI.MACHINE }));
       }
 
       if (this.canViewPods) {
@@ -205,7 +212,7 @@ export default defineComponent({
         this.$store.dispatch(`cluster/findAll`, { type: POD });
       }
 
-      return hash;
+      await Promise.all(promises);
     },
 
     /**
@@ -215,7 +222,7 @@ export default defineComponent({
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
-    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+    async fetchPageSecondaryResources({ canPaginate, force, page }: PagTableFetchPageSecondaryResourcesOpts) {
       if (!page?.length) {
         return;
       }

package/list/persistentvolume.vue

@@ -1,9 +1,10 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { PVC } from '@shell/config/types';
 import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 import { FilterArgs, PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { PagTableFetchPageSecondaryResourcesOpts, PagTableFetchSecondaryResourcesOpts, PagTableFetchSecondaryResourcesReturns } from '@shell/types/components/paginatedResourceTable';
 
 export default defineComponent({
   name: 'ListPersistentVolume',
@@ -38,8 +39,15 @@ export default defineComponent({
   },
 
   methods: {
-    fetchSecondaryResources(): { [key: string]: Promise<any>} {
-      return { pvc: this.$store.dispatch(`cluster/findAll`, { type: PVC }) };
+    /**
+     * of type PagTableFetchSecondaryResources
+     */
+    async fetchSecondaryResources({ canPaginate }: PagTableFetchSecondaryResourcesOpts): PagTableFetchSecondaryResourcesReturns {
+      if (canPaginate) {
+        return;
+      }
+
+      return this.$store.dispatch(`cluster/findAll`, { type: PVC });
     },
 
     /**
@@ -47,7 +55,7 @@ export default defineComponent({
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
-    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+    async fetchPageSecondaryResources({ canPaginate, force, page }: PagTableFetchPageSecondaryResourcesOpts) {
       if (!page?.length) {
         return;
       }

package/list/service.vue

@@ -24,7 +24,7 @@ export default {
 
   methods: {
     /**
-     * opts: FetchSecondaryResourcesOpts
+     * of type PagTableFetchSecondaryResources
      */
     async fetchSecondaryResources(opts) {
       const inStore = this.$store.getters['currentStore']();

package/list/workload.vue

@@ -159,6 +159,10 @@ export default {
     }
   },
 
+  typeDisplay() {
+    // Used by shell/components/ResourceList/index.vue to override list title (usually found via schema, which doesn't exist for this virtual type)
+    return this.$store.getters['type-map/labelFor'](this.schema || workloadSchema, 99);
+  },
 };
 </script>
 

package/mixins/chart.js

@@ -182,9 +182,12 @@ export default {
       }
 
       if (this.existing && this.existing.upgradeAvailable === false) {
+        const manager = this.existing?.spec?.chart?.metadata?.annotations?.[CATALOG_ANNOTATIONS.MANAGED] || 'Rancher';
+
         warnings.unshift(this.t('catalog.install.warning.managed', {
           name:    this.existing.name,
-          version: this.chart ? this.query.versionName : null
+          version: this.chart ? this.query.versionName : null,
+          manager: manager === 'true' ? 'Rancher' : manager
         }, true));
       }
 

package/models/catalog.cattle.io.app.js

@@ -41,7 +41,9 @@ export default class CatalogApp extends SteveModel {
 
   get warnDeletionMessage() {
     if (this.upgradeAvailable === false) {
-      return this.t('catalog.delete.warning.managed', { name: this.name });
+      const manager = this.spec?.chart?.metadata?.annotations?.[CATALOG_ANNOTATIONS.MANAGED] || 'Rancher';
+
+      return this.t('catalog.delete.warning.managed', { manager: manager === 'true' ? 'Rancher' : manager, name: this.name });
     }
 
     return null;