@rancher/shell 3.0.9 → 3.0.11

package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -13,6 +13,11 @@ import ButtonDropdown from '@shell/components/ButtonDropdown';
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import FormValidation from '@shell/mixins/form-validation';
 import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
+import slackLogo from '@shell/assets/images/vendor/slack.svg';
+import emailLogo from '@shell/assets/images/vendor/email.svg';
+import pagerdutyLogo from '@shell/assets/images/vendor/pagerduty.svg';
+import webhookLogo from '@shell/assets/images/vendor/webhook.svg';
+import customLogo from '@shell/assets/images/vendor/custom.svg';
 
 // i18n-uses monitoringReceiver.slack.*, monitoringReceiver.email.*, monitoringReceiver.pagerduty.*
 // i18n-uses monitoringReceiver.opsgenie.*, monitoringReceiver.webhook.*, monitoringReceiver.custom.*
@@ -23,14 +28,14 @@ export const RECEIVERS_TYPES = [
     title: 'monitoringReceiver.slack.title',
     info:  'monitoringReceiver.slack.info',
     key:   'slackConfigs',
-    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+    logo:  slackLogo
   },
   {
     name:  'email',
     label: 'monitoringReceiver.email.label',
     title: 'monitoringReceiver.email.title',
     key:   'emailConfigs',
-    logo:  require(`@shell/assets/images/vendor/email.svg`)
+    logo:  emailLogo
   },
   {
     name:  'pagerduty',
@@ -38,21 +43,21 @@ export const RECEIVERS_TYPES = [
     title: 'monitoringReceiver.pagerduty.title',
     info:  'monitoringReceiver.pagerduty.info',
     key:   'pagerdutyConfigs',
-    logo:  require(`@shell/assets/images/vendor/pagerduty.svg`)
+    logo:  pagerdutyLogo
   },
   {
     name:  'opsgenie',
     label: 'monitoringReceiver.opsgenie.label',
     title: 'monitoringReceiver.opsgenie.title',
     key:   'opsgenieConfigs',
-    logo:  require(`@shell/assets/images/vendor/email.svg`)
+    logo:  emailLogo
   },
   {
     name:  'webhook',
     label: 'monitoringReceiver.webhook.label',
     title: 'monitoringReceiver.webhook.title',
     key:   'webhookConfigs',
-    logo:  require(`@shell/assets/images/vendor/webhook.svg`),
+    logo:  webhookLogo,
   },
   {
     name:  'custom',
@@ -60,7 +65,7 @@ export const RECEIVERS_TYPES = [
     title: 'monitoringReceiver.custom.title',
     info:  'monitoringReceiver.custom.info',
     key:   'webhookConfigs',
-    logo:  require(`@shell/assets/images/vendor/custom.svg`)
+    logo:  customLogo
   },
 ];
 

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

@@ -20,6 +20,7 @@ import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { ELEMENTAL_PRODUCT_NAME, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
 import Rke2Config from './rke2';
 import { DRIVER_TO_IMPORT } from '@shell/models/management.cattle.io.kontainerdriver';
+import { requireAsset } from '@shell/utils/require-asset';
 
 const SORT_GROUPS = {
   template:  1,
@@ -343,7 +344,7 @@ export default {
             id:          `chart:${ chart.id }`,
             label:       chart.chartNameDisplay,
             description: chart.chartDescription,
-            icon:        chart.icon || require('~shell/assets/images/generic-catalog.svg'),
+            icon:        chart.icon || requireAsset('~shell/assets/images/generic-catalog.svg'),
             group:       'template',
             tag:         getters['i18n/t']('generic.techPreview')
           });
@@ -389,7 +390,7 @@ export default {
         if (icon) {
           iconClass = undefined;
         } else if (!iconClass) {
-          icon = require('~shell/assets/images/generic-driver.svg');
+          icon = requireAsset('~shell/assets/images/generic-driver.svg');
         }
 
         const subtype = {
@@ -420,14 +421,14 @@ export default {
 
         if (!icon) {
           try {
-            icon = require(`~shell/assets/images/providers/${ id }.svg`);
+            icon = requireAsset(`~shell/assets/images/providers/${ id }.svg`);
           } catch (e) {}
         }
 
         if (icon) {
           iconClass = undefined;
         } else if (!iconClass) {
-          icon = require('~shell/assets/images/generic-driver.svg');
+          icon = requireAsset('~shell/assets/images/generic-driver.svg');
         }
 
         const subtype = {

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

@@ -1,3 +1,5 @@
+import { requireAsset } from '@shell/utils/require-asset';
+
 export const RETENTION_DEFAULT = 5;
 export const RKE2_INGRESS_NGINX = 'rke2-ingress-nginx';
 export const RKE2_TRAEFIK = 'rke2-traefik';
@@ -10,7 +12,7 @@ export const INGRESS_NONE = 'none';
 export const INGRESS_OPTIONS = [
   {
     id:        TRAEFIK,
-    image:     { src: require('@shell/assets/images/providers/traefik.png'), alt: 'Traefik' },
+    image:     { src: requireAsset('@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' },
@@ -18,7 +20,7 @@ export const INGRESS_OPTIONS = [
   },
   {
     id:        INGRESS_NGINX,
-    image:     { src: require('@shell/assets/images/providers/kubernetes.svg'), alt: 'NGINX' },
+    image:     { src: requireAsset('@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' },

package/edit/secret/generic.vue

@@ -51,6 +51,7 @@ export default {
     v-model:value="value.data"
     :mode="mode"
     :initial-empty-row="true"
+    :value-can-be-empty="true"
     :handle-base64="true"
     :value-trim="false"
     :add-allowed="true"

package/edit/secret/index.vue

@@ -1,5 +1,6 @@
 <script>
 import { SECRET_TYPES as TYPES } from '@shell/config/secret';
+import { requireAsset } from '@shell/utils/require-asset';
 import {
   SECRET_SCOPE, SECRET_QUERY_PARAMS,
   CLOUD_CREDENTIAL, _CLONE, _CREATE, _EDIT, _FLAGGED
@@ -211,7 +212,7 @@ export default {
           let bannerImage, bannerAbbrv;
 
           try {
-            bannerImage = require(`~shell/assets/images/providers/${ id }.svg`);
+            bannerImage = requireAsset(`~shell/assets/images/providers/${ id }.svg`);
           } catch (e) {
             bannerImage = null;
             bannerAbbrv = this.initialDisplayFor(id);

package/edit/service.vue

@@ -18,7 +18,6 @@ import { ucFirst } from '@shell/utils/string';
 import CruResource from '@shell/components/CruResource';
 import { Banner } from '@components/Banner';
 import Labels from '@shell/components/form/Labels';
-import HarvesterServiceAddOnConfig from '@shell/components/HarvesterServiceAddOnConfig';
 import { clone } from '@shell/utils/object';
 import { POD, CAPI, HCI } from '@shell/config/types';
 import { matching } from '@shell/utils/selector-typed';
@@ -58,7 +57,6 @@ export default {
     Tab,
     Tabbed,
     UnitInput,
-    HarvesterServiceAddOnConfig,
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -350,8 +348,10 @@ export default {
 
     <Tabbed
       :side-tabs="true"
+      :resource="value"
       :use-hash="useTabbedHash"
       :default-tab="defaultTab"
+      :extension-params="{ showHarvesterAddOnConfig: String(showHarvesterAddOnConfig) }"
     >
       <Tab
         v-if="checkTypeIs('ExternalName')"
@@ -471,18 +471,6 @@ export default {
           </div>
         </div>
       </Tab>
-      <Tab
-        v-if="showHarvesterAddOnConfig"
-        name="add-on-config"
-        :label="t('servicesPage.harvester.title')"
-        :weight="-1"
-      >
-        <HarvesterServiceAddOnConfig
-          :mode="mode"
-          :value="value"
-          :register-before-hook="registerBeforeHook"
-        />
-      </Tab>
       <Tab
         v-if="!checkTypeIs('ExternalName') && !checkTypeIs('Headless')"
         name="session-affinity"

package/edit/token.vue

@@ -2,7 +2,7 @@
 import { mapGetters } from 'vuex';
 import day from 'dayjs';
 import sortBy from 'lodash/sortBy';
-import { MANAGEMENT, EXT } from '@shell/config/types';
+import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import { Banner } from '@components/Banner';
 import DetailText from '@shell/components/DetailText';
 import Footer from '@shell/components/form/Footer';
@@ -14,7 +14,6 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import { diffFrom } from '@shell/utils/time';
 import { filterHiddenLocalCluster, filterOnlyKubernetesClusters } from '@shell/utils/cluster';
 import { SETTING } from '@shell/config/settings';
-import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 
 export default {
   components: {
@@ -25,7 +24,6 @@ export default {
     LabeledSelect,
     RadioGroup,
     Select,
-    Checkbox,
   },
 
   mixins: [CreateEditView],
@@ -43,11 +41,7 @@ export default {
 
     return {
       errors: null,
-      user:   null,
       form:   {
-        enabled:           true,
-        description:       '',
-        clusterName:       '',
         expiryType:        'never',
         customExpiry:      0,
         customExpiryUnits: 'minute',
@@ -57,13 +51,11 @@ export default {
       accessKey:  '',
       secretKey:  '',
       maxTTL,
-      ttl:        ''
     };
   },
 
   computed: {
     ...mapGetters({ t: 'i18n/t' }),
-
     scopes() {
       const all = this.$store.getters['management/all'](MANAGEMENT.CLUSTER);
       const kubeClusters = filterHiddenLocalCluster(filterOnlyKubernetesClusters(all, this.$store), this.$store);
@@ -79,20 +71,16 @@ export default {
       const options = ['never', 'day', 'month', 'year', 'custom'];
       let opts = options.map((opt) => ({ value: opt, label: this.t(`accountAndKeys.apiKeys.add.expiry.options.${ opt }`) }));
 
-      // When the TTL is greater than 0, present only two options
+      // When the TTL is anything other than 0, present only two options
       // (1) The maximum allowed
       // (2) Custom
-      if (this.maxTTL > 0 ) {
+      if (this.maxTTL !== 0 ) {
         const now = day();
         const expiry = now.add(this.maxTTL, 'minute');
         const max = diffFrom(expiry, now, this.t);
 
         opts = opts.filter((opt) => opt.value === 'custom');
         opts.unshift({ value: 'max', label: this.t('accountAndKeys.apiKeys.add.expiry.options.maximum', { value: max.string }) });
-      } else {
-        // maxTTL <= 0 means there is no maximum, so we can show the 'never' option which results in an infinite TTL
-        // OR if we set a positive TTL, then it assumes that value
-        opts = opts.filter((opt) => opt.value === 'never' || opt.value === 'custom');
       }
 
       return opts;
@@ -103,9 +91,6 @@ export default {
 
       return filtered.map((opt) => ({ value: opt, label: this.t(`accountAndKeys.apiKeys.add.customExpiry.options.${ opt }`) }));
     },
-    hasNeverOption() {
-      return this.expiryOptions?.filter((opt) => opt.value === 'never')?.length === 1;
-    }
   },
 
   mounted() {
@@ -130,33 +115,31 @@ export default {
       });
     },
 
-    async actuallySave() {
-      // update expiration value before save
+    async actuallySave(url) {
       this.updateExpiry();
-
       if ( this.isCreate ) {
-        const steveToken = await this.$store.dispatch('management/create', {
-          type: EXT.TOKEN,
-          spec: {
-            description:   this.form.description,
-            kind:          '',
-            userPrincipal: null, // will be set by the backend to the current user
-            clusterName:   this.form.clusterName,
-            enabled:       this.form.enabled,
-            ttl:           this.ttl
-            // userID: not needed as it will be set by the backend to the current user
-          }
-        });
-
-        const steveTokenSaved = await steveToken.save();
-
-        this.created = steveTokenSaved;
-        this.ttlLimited = this.created?.spec?.ttl !== this.ttl;
-        const token = this.created?.status?.bearerToken?.split(':');
+        // Description is a bit weird, so need to clone and set this
+        // rather than use this.value - need to find a way to set this if we ever
+        // want to allow edit (which I don't think we do)
+        const res = await this.value.save();
+
+        this.created = res;
+        this.ttlLimited = res.ttl !== this.value.ttl;
+        const token = this.created.token.split(':');
 
         this.accessKey = token[0];
         this.secretKey = (token.length > 1) ? token[1] : '';
-        this.token = this.created?.status?.bearerToken;
+        this.token = this.created.token;
+
+        // Force a refresh of the token so we get the expiry date correctly
+        await this.$store.dispatch('rancher/find', {
+          type: NORMAN.TOKEN,
+          id:   res.id,
+          opt:  { force: true }
+        }, { root: true });
+      } else {
+        // Note: update of existing key not supported currently
+        await this.value.save();
       }
     },
 
@@ -176,9 +159,7 @@ export default {
       const units = (v === 'custom') ? this.form.customExpiryUnits : v;
       let ttl = 0;
 
-      if (v === 'never') {
-        ttl = -1;
-      } else if (units === 'max') {
+      if (units === 'max') {
         ttl = this.maxTTL * 60 * 1000;
       } else if ( units !== 'never' ) {
         const now = day();
@@ -186,8 +167,7 @@ export default {
 
         ttl = expiry.diff(now);
       }
-
-      this.ttl = ttl;
+      this.value.ttl = ttl;
     }
   }
 };
@@ -198,7 +178,7 @@ export default {
     <div class="pl-10 pr-10">
       <LabeledInput
         key="description"
-        v-model:value="form.description"
+        v-model:value="value.description"
         :placeholder="t('accountAndKeys.apiKeys.add.description.placeholder')"
         label-key="accountAndKeys.apiKeys.add.description.label"
         mode="edit"
@@ -206,30 +186,13 @@ export default {
       />
 
       <LabeledSelect
-        v-model:value="form.clusterName"
+        v-model:value="value.clusterId"
         class="mt-20 scope-select"
         label-key="accountAndKeys.apiKeys.add.scope"
         :options="scopes"
       />
 
-      <Checkbox
-        v-model:value="form.enabled"
-        class="mt-20 mb-20"
-        :mode="mode"
-        label-key="accountAndKeys.apiKeys.add.enabled"
-      />
-
-      <Banner
-        v-if="hasNeverOption"
-        color="warning"
-        class="mt-20"
-      >
-        <div>
-          {{ t('accountAndKeys.apiKeys.info.expiryOptionsWithNever') }}
-        </div>
-      </Banner>
-
-      <h5 class="mb-20">
+      <h5 class="pt-20">
         {{ t('accountAndKeys.apiKeys.add.expiry.label') }}
       </h5>
 
@@ -241,9 +204,7 @@ export default {
           class="mr-20"
           name="expiryGroup"
         />
-        <div
-          class="ml-20 mt-10 expiry"
-        >
+        <div class="ml-20 mt-10 expiry">
           <input
             v-model="form.customExpiry"
             :disabled="form.expiryType !== 'custom'"

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

@@ -3,6 +3,12 @@ import { mapGetters } from 'vuex';
 import ResourceTable from '@shell/components/ResourceTable';
 import { MANAGEMENT } from '@shell/config/types';
 import ResourceFetch from '@shell/mixins/resource-fetch';
+import { STEVE_CACHE } from '@shell/store/features';
+
+const hideFeatureFlags = [
+  'fleet', // Note - this is the id of the ff we want, not sure what FLEET in store/features is
+  STEVE_CACHE
+];
 
 export default {
   components: { ResourceTable },
@@ -32,7 +38,7 @@ export default {
     ...mapGetters({ t: 'i18n/t' }),
 
     filteredRows() {
-      return this.rows.filter((x) => x.name !== 'fleet');
+      return this.rows.filter((x) => hideFeatureFlags.indexOf(x.metadata.name) === -1);
     },
 
     enableRowActions() {

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

@@ -167,12 +167,6 @@ export default {
 
   },
 
-  methods: {
-    getCustomDetailLink(cluster) {
-      return cluster.isCapiHybrid ? null : cluster.detailLocation;
-    }
-  },
-
   $loadingResources() {
     // results are filtered so we wouldn't get the correct count on indicator...
     return { loadIndeterminate: true };
@@ -226,7 +220,6 @@ export default {
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       :data-testid="'cluster-list'"
       :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
-      :get-custom-detail-link="getCustomDetailLink"
       :sub-rows="true"
     >
       <!-- Why are state column and subrow overwritten here? -->
@@ -273,48 +266,6 @@ export default {
           {{ t('cluster.explore') }}
         </button>
       </template>
-      <template #additional-sub-row="{row, fullColspan, tableActions}">
-        <tr
-          class="capi-unsupported"
-          :class="{'has-description': !!row.stateDescription}"
-        >
-          <td
-            v-if="row.isCapiHybrid"
-            class="row-check"
-          />
-          <td
-            v-if="row.isCapiHybrid"
-            :data-testid="`capi-unsupported-warning-${row?.metadata?.name}`"
-            :colspan="fullColspan - (tableActions ? 1: 0)"
-          >
-            <div
-              class="text-warning"
-              :class="{'mt-5': !!row.stateDescription.trim()}"
-            >
-              <i class="icon icon-warning" />{{ t('cluster.capi.notSupported') }}
-            </div>
-          </td>
-        </tr>
-      </template>
     </ResourceTable>
   </div>
 </template>
-
-<style scoped lang="scss">
-  .capi-unsupported {
-    &.has-description {
-      border-bottom: none;
-      padding: 0px;
-      td {
-        padding-top: 0px;
-      }
-    }
-
-    & div {
-      & i {
-        margin-right: 0.1em;
-      }
-      display: flex;
-    }
-  }
-</style>

package/mixins/brand.js

@@ -3,6 +3,7 @@ import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { createCssVars } from '@shell/utils/color';
 import { setTitle } from '@shell/config/private-label';
+import { requireJson } from '@shell/utils/require-asset';
 import { setFavIcon, haveSetFavIcon } from '@shell/utils/favicon';
 import { allHash } from '@shell/utils/promise';
 import { fetchInitialSettings } from '@shell/utils/settings';
@@ -187,7 +188,7 @@ export default {
 
       if ( this.brand ) {
         try {
-          const brandMeta = require(`~shell/assets/brand/${ this.brand }/metadata.json`);
+          const brandMeta = requireJson(`~shell/assets/brand/${ this.brand }/metadata.json`);
 
           if (brandMeta?.hasStylesheet === 'true') {
             bodyClass = `${ cssClass } ${ this.brand } theme-${ this.theme }`;

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

@@ -3,6 +3,7 @@ import { CATALOG } from '@shell/config/labels-annotations';
 import { insertAt } from '@shell/utils/array';
 import { CLUSTER_REPO_APPCO_AUTH_GENERATE_NAME, CATALOG as CATALOG_TYPE } from '@shell/config/types';
 import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/resource-class';
+import { _CREATE } from '@shell/config/query-params';
 
 import SteveModel from '@shell/plugins/steve/steve-class';
 
@@ -173,6 +174,14 @@ export default class ClusterRepo extends SteveModel {
     return this.$rootGetters['i18n/withFallback'](key, null, name);
   }
 
+  detailPageHeaderActionOverride(realMode) {
+    if (realMode === _CREATE) {
+      return this.t('catalog.repo.add');
+    }
+
+    return null;
+  }
+
   get urlDisplay() {
     return this.status?.url || this.spec.gitRepo || this.spec.url;
   }

package/models/cluster.x-k8s.io.machinedeployment.js

@@ -111,12 +111,17 @@ export default class CapiMachineDeployment extends SteveModel {
     return `${ this.spec?.template?.metadata?.labels?.[MACHINE_ROLES.ETCD] }` === 'true';
   }
 
-  // use this pool's definition in the cluster's rkeConfig to scale, not this.spec.replicas
+  // use this pool's definition in the provisioning cluster spec to scale, not this.spec.replicas
   get inClusterSpec() {
-    const machineConfigName = this.template?.metadata?.annotations['rke.cattle.io/cloned-from-name'];
+    // infra from Rancher node driver: provisioning cluster has reference to Rancher-generated crd <provider name>Config from the rke-machine-config.cattle.io api group
+    const rkeMachineConfigName = this.template?.metadata?.annotations['rke.cattle.io/cloned-from-name'];
+    // infra from upstream CAPI provider: provisioning cluster has reference to an upstream provider-specific machine template crd in the infrastructure.cluster.x-k8s.io api group
+    const infrastructureRefName = this.spec?.template?.spec?.infrastructureRef?.name;
+    const machineTemplateName = rkeMachineConfigName || infrastructureRefName;
+
     const machinePools = this.cluster.spec.rkeConfig.machinePools;
 
-    return machinePools.find((pool) => pool.machineConfigRef.name === machineConfigName);
+    return machinePools.find((pool) => pool.machineConfigRef.name === machineTemplateName);
   }
 
   scalePool(delta, save = true, depth = 0) {

package/models/management.cattle.io.authconfig.js

@@ -1,5 +1,6 @@
 import { insertAt } from '@shell/utils/array';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { requireAsset } from '@shell/utils/require-asset';
 
 export const configType = {
   activedirectory: 'ldap',
@@ -56,7 +57,7 @@ export default class AuthConfig extends SteveModel {
 
   get icon() {
     try {
-      return require(`~shell/assets/images/vendor/${ imageOverrides[this.id] || this.id }.svg`);
+      return requireAsset(`~shell/assets/images/vendor/${ imageOverrides[this.id] || this.id }.svg`);
     } catch (e) {
       return '';
     }

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

@@ -13,6 +13,7 @@ import { isHarvesterCluster } from '@shell/utils/cluster';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { LINUX, WINDOWS } from '@shell/store/catalog';
 import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
+import { requireAsset } from '@shell/utils/require-asset';
 import { PINNED_CLUSTERS } from '@shell/store/prefs';
 import { copyTextToClipboard } from '@shell/utils/clipboard';
 import { isHostedProvider } from '@shell/utils/provider';
@@ -221,7 +222,7 @@ export default class MgmtCluster extends SteveModel {
   }
 
   get providerOsLogo() {
-    return require(`~shell/assets/images/vendor/${ this.providerOs }.svg`);
+    return requireAsset(`~shell/assets/images/vendor/${ this.providerOs }.svg`);
   }
 
   get workerOSs() {
@@ -282,11 +283,11 @@ export default class MgmtCluster extends SteveModel {
     let icon;
 
     try {
-      icon = require(`~shell/assets/images/providers/${ prv }.svg`);
+      icon = requireAsset(`~shell/assets/images/providers/${ prv }.svg`);
     } catch (e) {
       console.warn(`Can not find provider logo for provider ${ logo }`); // eslint-disable-line no-console
       // Use fallback generic Kubernetes icon
-      icon = require(`~shell/assets/images/providers/kubernetes.svg`);
+      icon = requireAsset(`~shell/assets/images/providers/kubernetes.svg`);
     }
 
     return icon;