@rancher/shell 3.0.0-rc.9 → 3.0.1-rc.1

package/components/nav/Header.vue

@@ -1,12 +1,13 @@
 <script>
 import { mapGetters } from 'vuex';
 import debounce from 'lodash/debounce';
-import { NORMAN, STEVE, MANAGEMENT } from '@shell/config/types';
+import { MANAGEMENT, NORMAN, STEVE } from '@shell/config/types';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { ucFirst } from '@shell/utils/string';
 import { isAlternate, isMac } from '@shell/utils/platform';
 import Import from '@shell/components/Import';
 import BrandImage from '@shell/components/BrandImage';
-import { getProduct } from '@shell/config/private-label';
+import { getProduct, getVendor } from '@shell/config/private-label';
 import ClusterProviderIcon from '@shell/components/ClusterProviderIcon';
 import ClusterBadge from '@shell/components/ClusterBadge';
 import AppModal from '@shell/components/AppModal';
@@ -14,13 +15,14 @@ import { LOGGED_OUT, IS_SSO } from '@shell/config/query-params';
 import NamespaceFilter from './NamespaceFilter';
 import WorkspaceSwitcher from './WorkspaceSwitcher';
 import TopLevelMenu from './TopLevelMenu';
+
 import Jump from './Jump';
 import { allHash } from '@shell/utils/promise';
 import { ActionLocation, ExtensionPoint } from '@shell/core/types';
 import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
 import IconOrSvg from '@shell/components/IconOrSvg';
 import { wait } from '@shell/utils/async';
-import { authProvidersInfo, parseAuthProvidersInfo } from '@shell/utils/auth';
+import { configType } from '@shell/models/management.cattle.io.authconfig';
 import HeaderPageActionMenu from './HeaderPageActionMenu.vue';
 
 export default {
@@ -48,7 +50,7 @@ export default {
 
   fetch() {
     // fetch needed data to check if any auth provider is enabled
-    authProvidersInfo(this.$store);
+    this.$store.dispatch('auth/getAuthProviders');
   },
 
   data() {
@@ -86,14 +88,14 @@ export default {
       'pageActions',
       'isSingleProduct',
       'isRancherInHarvester',
-      'showTopLevelMenu'
+      'showTopLevelMenu',
+      'isMultiCluster'
     ]),
 
-    authProviderEnabled() {
-      const authProviders = this.$store.getters['management/all'](MANAGEMENT.AUTH_CONFIG);
-      const authInfo = parseAuthProvidersInfo(authProviders);
+    samlAuthProviderEnabled() {
+      const publicAuthProviders = this.$store.getters['rancher/all']('authProvider');
 
-      return authInfo.enabled?.[0] || {};
+      return publicAuthProviders.find((authProvider) => configType[authProvider.id] === 'saml') || {};
     },
 
     shouldShowSloLogoutModal() {
@@ -102,17 +104,21 @@ export default {
         return false;
       }
 
-      const {
-        logoutAllSupported, logoutAllEnabled, logoutAllForced, configType
-      } = this.authProviderEnabled;
+      const { logoutAllSupported, logoutAllEnabled, logoutAllForced } = this.samlAuthProviderEnabled;
 
-      return configType === 'saml' && logoutAllSupported && logoutAllEnabled && !logoutAllForced;
+      return logoutAllSupported && logoutAllEnabled && !logoutAllForced;
     },
 
     appName() {
       return getProduct();
     },
 
+    vendor() {
+      this.$store.getters['management/all'](MANAGEMENT.SETTING)?.find((setting) => setting.id === 'ui-pl');
+
+      return getVendor();
+    },
+
     authEnabled() {
       return this.$store.getters['auth/enabled'];
     },
@@ -222,6 +228,9 @@ export default {
       };
     },
 
+    isHarvester() {
+      return this.$store.getters['currentProduct'].inStore === HARVESTER;
+    },
   },
 
   watch: {
@@ -260,7 +269,7 @@ export default {
     showSloModal() {
       this.$store.dispatch('management/promptModal', {
         component:      'SloDialog',
-        componentProps: { authProvider: this.authProviderEnabled },
+        componentProps: { authProvider: this.samlAuthProviderEnabled },
         modalWidth:     '500px'
       });
     },
@@ -382,7 +391,7 @@ export default {
     data-testid="header"
   >
     <div>
-      <TopLevelMenu v-if="showTopLevelMenu" />
+      <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
     </div>
     <div
       class="menu-spacer"
@@ -392,7 +401,14 @@ export default {
         v-if="isSingleProduct && !isRancherInHarvester"
         :to="singleProductLogoRoute"
       >
+        <BrandImage
+          v-if="isSingleProduct.supportCustomLogo && isHarvester"
+          class="side-menu-logo"
+          file-name="harvester.svg"
+          :support-custom-logo="true"
+        />
         <img
+          v-else
           class="side-menu-logo"
           :src="isSingleProduct.logo"
         >
@@ -412,7 +428,12 @@ export default {
           v-if="isSingleProduct && !isRancherInHarvester"
           class="product-name"
         >
-          {{ t(isSingleProduct.productNameKey) }}
+          <template v-if="isSingleProduct.supportCustomLogo">
+            {{ vendor }}
+          </template>
+          <template v-else>
+            {{ t(isSingleProduct.productNameKey) }}
+          </template>
         </div>
         <template v-else>
           <ClusterProviderIcon
@@ -1118,7 +1139,7 @@ export default {
       display: flex;
       justify-content: space-between;
       padding: 10px;
-      color: var(--link);
+      color: var(--popover-text);
     }
 
     div.menu-separator {

package/components/nav/NamespaceFilter.vue

@@ -140,9 +140,11 @@ export default {
     options() {
       const t = this.$store.getters['i18n/t'];
       let out = [];
+      const inStore = this.$store.getters['currentStore'](NAMESPACE);
 
       const params = { ...this.$route.params };
       const resource = params.resource;
+
       // Sometimes, different pages may have different namespaces to filter
       const notFilterNamespaces = this.$store.getters[`type-map/optionsFor`](resource).notFilterNamespace || [];
 
@@ -198,8 +200,6 @@ export default {
         divider(out);
       }
 
-      const inStore = this.$store.getters['currentStore'](NAMESPACE);
-
       if (!inStore) {
         return out;
       }
@@ -893,9 +893,6 @@ export default {
     width: 280px;
     display: inline-block;
 
-    $glass-z-index: 2;
-    $dropdown-z-index: 1000;
-
     .ns-glass {
       height: 100vh;
       left: 0;
@@ -903,7 +900,7 @@ export default {
       position: absolute;
       top: 0;
       width: 100vw;
-      z-index: $glass-z-index;
+      z-index: z-index('overContent');
     }
 
     .ns-controls {
@@ -955,7 +952,7 @@ export default {
       margin-top: -1px;
       padding-bottom: 10px;
       position: relative;
-      z-index: $dropdown-z-index;
+      z-index: z-index('dropdownOverlay');
 
       .ns-options {
         max-height: 50vh;
@@ -1067,7 +1064,7 @@ export default {
       height: 40px;
       padding: 0 10px;
       position: relative;
-      z-index: $dropdown-z-index;
+      z-index: z-index('dropdownOverlay');
 
       &.ns-open {
         border-bottom-left-radius: 0;

package/components/nav/TopLevelMenu.vue

@@ -10,7 +10,6 @@ import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
 import { KEY } from '@shell/utils/platform';
 import { getVersionInfo } from '@shell/utils/version';
-import { LEGACY } from '@shell/store/features';
 import { SETTING } from '@shell/config/settings';
 import { filterOnlyKubernetesClusters, filterHiddenLocalCluster } from '@shell/utils/cluster';
 import { getProductFromRoute } from '@shell/utils/router';
@@ -68,10 +67,6 @@ export default {
       };
     },
 
-    legacyEnabled() {
-      return this.features(LEGACY);
-    },
-
     showClusterSearch() {
       return this.clusters.length > this.maxClustersToShow;
     },
@@ -255,12 +250,6 @@ export default {
       });
     },
 
-    legacyApps() {
-      const options = this.options;
-
-      return options.filter((opt) => opt.inStore === 'management' && opt.category === 'legacy');
-    },
-
     configurationApps() {
       const options = this.options;
 
@@ -347,7 +336,6 @@ export default {
       const appBar = {
         hciApps:           this.hciApps,
         multiClusterApps:  this.multiClusterApps,
-        legacyApps:        this.legacyApps,
         configurationApps: this.configurationApps,
         pinFiltered:       this.pinFiltered,
         clustersFiltered:  this.clustersFiltered,
@@ -558,7 +546,7 @@ export default {
                 :to="{ name: 'home' }"
               >
                 <svg
-                  v-tooltip="getTooltipConfig(t('nav.home'))"
+                  v-clean-tooltip="getTooltipConfig(t('nav.home'))"
                   xmlns="http://www.w3.org/2000/svg"
                   height="24"
                   viewBox="0 0 24 24"
@@ -672,13 +660,13 @@ export default {
                     @shortkey="handleKeyComboClick"
                   >
                     <ClusterIconMenu
-                      v-tooltip="getTooltipConfig(c, true)"
+                      v-clean-tooltip="getTooltipConfig(c, true)"
                       :cluster="c"
                       :route-combo="routeCombo"
                       class="rancher-provider-icon"
                     />
                     <div
-                      v-tooltip="getTooltipConfig(c)"
+                      v-clean-tooltip="getTooltipConfig(c)"
                       class="cluster-name"
                     >
                       <p>{{ c.label }}</p>
@@ -699,12 +687,12 @@ export default {
                     :data-testid="`pinned-menu-cluster-disabled-${ c.id }`"
                   >
                     <ClusterIconMenu
-                      v-tooltip="getTooltipConfig(c, true)"
+                      v-clean-tooltip="getTooltipConfig(c, true)"
                       :cluster="c"
                       class="rancher-provider-icon"
                     />
                     <div
-                      v-tooltip="getTooltipConfig(c)"
+                      v-clean-tooltip="getTooltipConfig(c)"
                       class="cluster-name"
                     >
                       <p>{{ c.label }}</p>
@@ -747,13 +735,13 @@ export default {
                     @shortkey="handleKeyComboClick"
                   >
                     <ClusterIconMenu
-                      v-tooltip="getTooltipConfig(c, true)"
+                      v-clean-tooltip="getTooltipConfig(c, true)"
                       :cluster="c"
                       :route-combo="routeCombo"
                       class="rancher-provider-icon"
                     />
                     <div
-                      v-tooltip="getTooltipConfig(c)"
+                      v-clean-tooltip="getTooltipConfig(c)"
                       class="cluster-name"
                     >
                       <!-- HERE LOCAL CLUSTER! -->
@@ -776,12 +764,12 @@ export default {
                     :data-testid="`menu-cluster-disabled-${ c.id }`"
                   >
                     <ClusterIconMenu
-                      v-tooltip="getTooltipConfig(c, true)"
+                      v-clean-tooltip="getTooltipConfig(c, true)"
                       :cluster="c"
                       class="rancher-provider-icon"
                     />
                     <div
-                      v-tooltip="getTooltipConfig(c)"
+                      v-clean-tooltip="getTooltipConfig(c)"
                       class="cluster-name"
                     >
                       <p>{{ c.label }}</p>
@@ -848,7 +836,7 @@ export default {
                   :to="a.to"
                 >
                   <IconOrSvg
-                    v-tooltip="getTooltipConfig(a.label)"
+                    v-clean-tooltip="getTooltipConfig(a.label)"
                     :icon="a.icon"
                     :src="a.svg"
                   />
@@ -856,34 +844,6 @@ export default {
                 </router-link>
               </div>
             </template>
-            <template v-if="legacyEnabled">
-              <div
-                class="category-title"
-              >
-                <hr>
-                <span>
-                  {{ t('nav.categories.legacy') }}
-                </span>
-              </div>
-              <div
-                v-for="(a, i) in appBar.legacyApps"
-                :key="i"
-                @click="hide()"
-              >
-                <router-link
-                  class="option"
-                  :class="{'active-menu-link': a.isMenuActive }"
-                  :to="a.to"
-                >
-                  <IconOrSvg
-                    v-tooltip="getTooltipConfig(a.label)"
-                    :icon="a.icon"
-                    :src="a.svg"
-                  />
-                  <div>{{ a.label }}</div>
-                </router-link>
-              </div>
-            </template>
 
             <!-- App menu -->
             <template v-if="configurationApps.length">
@@ -906,7 +866,7 @@ export default {
                   :to="a.to"
                 >
                   <IconOrSvg
-                    v-tooltip="getTooltipConfig(a.label)"
+                    v-clean-tooltip="getTooltipConfig(a.label)"
                     :icon="a.icon"
                     :src="a.svg"
                   />

package/components/nav/WorkspaceSwitcher.vue

@@ -92,7 +92,6 @@ export default {
       ref="select"
       v-model:value="value"
       label="label"
-      :append-to-body="false"
       :options="options"
       :clearable="false"
       :reduce="(opt) => opt.value"

package/config/labels-annotations.js

@@ -113,6 +113,7 @@ export const FLEET = {
   CLUSTER_NAME:         'management.cattle.io/cluster-name',
   BUNDLE_ID:            'fleet.cattle.io/bundle-id',
   MANAGED:              'fleet.cattle.io/managed',
+  CLUSTER_NAMESPACE:    'fleet.cattle.io/cluster-namespace',
   CLUSTER:              'fleet.cattle.io/cluster'
 };
 
@@ -145,6 +146,7 @@ export const HCI = {
   NETWORK_ROUTE:       'network.harvesterhci.io/route',
   IMAGE_NAME:          'harvesterhci.io/image-name',
   NETWORK_TYPE:        'network.harvesterhci.io/type',
+  CLUSTER_NETWORK:     'network.harvesterhci.io/clusternetwork',
   PRIMARY_SERVICE:     'cloudprovider.harvesterhci.io/primary-service',
 };
 

package/config/private-label.js

@@ -1,9 +1,10 @@
 import { SETTING } from './settings';
+import { CURRENT_RANCHER_VERSION } from './version';
 
 export const ANY = 0;
 export const STANDARD = 1;
 export const CUSTOM = 2;
-export const DOCS_BASE = 'https://ranchermanager.docs.rancher.com/v2.9';
+export const DOCS_BASE = `https://ranchermanager.docs.rancher.com/v${ CURRENT_RANCHER_VERSION }`;
 
 const STANDARD_VENDOR = 'Rancher';
 const STANDARD_PRODUCT = 'Explorer';

package/config/router/routes.js

@@ -2,7 +2,6 @@ import { NAME as APPS } from '@shell/config/product/apps';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import { CAPI, MANAGEMENT, BACKUP_RESTORE, CIS } from '@shell/config/types';
-import { NAME as MCAPPS, NAME as LEGACY } from '@shell/config/product/multi-cluster-apps';
 import { NAME as AUTH } from '@shell/config/product/auth';
 
 // All these imports are related to the install-redirect.js navigation guard.
@@ -229,12 +228,10 @@ export default [
         path: '/c/:cluster/legacy',
         redirect(to) {
           return {
-            name:   'c-cluster-legacy-pages-page',
+            name:   'c-cluster-legacy-project',
             params: {
               ...(to?.params || {}),
-              cluster: 'local',
-              product: LEGACY,
-              page:    'alerts'
+              product: EXPLORER,
             }
           };
         },
@@ -262,19 +259,6 @@ export default [
           };
         },
         name: 'c-cluster-manager'
-      }, {
-        path: '/c/:cluster/mcapps',
-        redirect(to) {
-          return {
-            name:   'c-cluster-mcapps-pages-page',
-            params: {
-              ...(to?.params || {}),
-              product: MCAPPS,
-              page:    'catalogs'
-            }
-          };
-        },
-        name: 'c-cluster-mcapps'
       }, {
         path:      '/c/:cluster/monitoring',
         component: () => interopDefault(import('@shell/pages/c/_cluster/monitoring/index.vue')),
@@ -381,10 +365,6 @@ export default [
         path:      '/c/:cluster/auth/user.retention',
         component: () => interopDefault(import('@shell/pages/c/_cluster/auth/user.retention/index.vue')),
         name:      'c-cluster-auth-user.retention'
-      }, {
-        path:      '/c/:cluster/legacy/project/pipelines',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/legacy/project/pipelines.vue')),
-        name:      'c-cluster-legacy-project-pipelines'
       }, {
         path:      '/c/:cluster/manager/cloudCredential/create',
         component: () => interopDefault(import('@shell/pages/c/_cluster/manager/cloudCredential/create.vue')),
@@ -437,10 +417,6 @@ export default [
         path:      '/c/:cluster/manager/pages/:page?',
         component: () => interopDefault(import('@shell/pages/c/_cluster/manager/pages/_page.vue')),
         name:      'c-cluster-manager-pages-page'
-      }, {
-        path:      '/c/:cluster/mcapps/pages/:page?',
-        component: () => interopDefault(import('@shell/pages/c/_cluster/mcapps/pages/_page.vue')),
-        name:      'c-cluster-mcapps-pages-page'
       }, {
         path:      '/c/:cluster/monitoring/alertmanagerconfig/:alertmanagerconfigid',
         component: () => interopDefault(import('@shell/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/index.vue')),

package/config/settings.ts

@@ -108,6 +108,7 @@ export const SETTING = {
   USER_LAST_LOGIN_DEFAULT:              'user-last-login-default',
   DISABLE_INACTIVE_USER_AFTER:          'disable-inactive-user-after',
   DELETE_INACTIVE_USER_AFTER:           'delete-inactive-user-after',
+  K3S_UPGRADER_UNINSTALL_CONCURRENCY:   'k3s-based-upgrader-uninstall-concurrency'
 } as const;
 
 // These are the settings that are allowed to be edited via the UI
@@ -165,6 +166,10 @@ export const ALLOWED_SETTINGS: GlobalSetting = {
     options: ['strict', 'system-store'],
     warning: 'agent-tls-mode'
   },
+  [SETTING.K3S_UPGRADER_UNINSTALL_CONCURRENCY]: {
+    kind:    'integer',
+    ruleSet: [{ name: 'minValue', factoryArg: 1 }]
+  }
 };
 
 /**

package/config/table-headers.js

@@ -267,6 +267,21 @@ export const DESCRIPTION = {
   width:    300,
 };
 
+export const NS_SNAPSHOT_QUOTA = {
+  name:          'NamespaceSnapshotQuota',
+  labelKey:      'harvester.tableHeaders.totalSnapshotQuota',
+  value:         'snapshotSizeQuota',
+  sort:          'snapshotSizeQuota',
+  align:         'center',
+  formatter:     'Si',
+  formatterOpts: {
+    opts: {
+      increment: 1024, addSuffix: true, suffix: 'i',
+    },
+    needParseSi: false
+  },
+};
+
 export const DURATION = {
   name:      'duration',
   labelKey:  'tableHeaders.duration',

package/config/types.js

@@ -172,6 +172,8 @@ export const LONGHORN = {
 };
 
 export const LONGHORN_DRIVER = 'driver.longhorn.io';
+export const LONGHORN_VERSION_V1 = 'LonghornV1';
+export const LONGHORN_VERSION_V2 = 'LonghornV2';
 
 export const SNAPSHOT = 'rke.cattle.io.etcdsnapshot';
 
@@ -313,6 +315,7 @@ export const HCI = {
   IMAGE:            'harvesterhci.io.virtualmachineimage',
   VGPU_DEVICE:      'devices.harvesterhci.io.vgpudevice',
   SETTING:          'harvesterhci.io.setting',
+  RESOURCE_QUOTA:   'harvesterhci.io.resourcequota',
   HARVESTER_CONFIG: 'rke-machine-config.cattle.io.harvesterconfig',
 };
 

package/config/version.js

@@ -25,3 +25,5 @@ export function setKubeVersionData(v) {
   // Remove any properties on 'v' we don't want
   _kubeVersionData = JSON.parse(JSON.stringify(v));
 }
+
+export const CURRENT_RANCHER_VERSION = '2.10';

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

@@ -9,7 +9,8 @@ import RelatedResources from '@shell/components/RelatedResources';
 import jsyaml from 'js-yaml';
 import merge from 'lodash/merge';
 import { CATALOG } from '@shell/config/types';
-import { sortBy } from '~shell/utils/sort';
+import { sortBy } from '@shell/utils/sort';
+import { allHash } from '@shell/utils/promise';
 
 export default {
   name: 'DetailRelease',
@@ -30,9 +31,15 @@ export default {
   },
 
   async fetch() {
-    await this.$store.dispatch('catalog/load');
+    const promises = {
+      catalog:       this.$store.dispatch('catalog/load'),
+      allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }),
+      secrets:       this.value.fetchValues(true),
+    };
 
-    this.allOperations = await this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION });
+    const res = await allHash(promises);
+
+    this.allOperations = res.allOperations;
   },
 
   computed: {
@@ -45,7 +52,7 @@ export default {
     },
 
     valuesYaml() {
-      const combined = merge(merge({}, this.value?.spec?.chart?.values || {}), this.value?.spec?.values || {});
+      const combined = merge(merge({}, this.value?.chartValues || {}), this.value?.values || {});
 
       return jsyaml.dump(combined);
     },
@@ -95,6 +102,12 @@ export default {
       }
     },
   },
+
+  watch: {
+    'value.secretId'(neu, old) {
+      this.value.fetchValues(true);
+    }
+  },
 };
 </script>