@rancher/shell 0.1.21 → 0.2.2

package/components/form/MatchExpressions.vue

@@ -5,9 +5,10 @@ import { mapGetters } from 'vuex';
 import { isArray, removeObject } from '@shell/utils/array';
 import { clone } from '@shell/utils/object';
 import { convert, simplify } from '@shell/utils/selector';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
 
 export default {
-  components: { Select },
+  components: { Select, LabeledSelect },
   props:      {
     // Array of actual match expressions
     // or k8s selector Object of {matchExpressions, matchLabels}
@@ -38,6 +39,12 @@ export default {
     showRemove: {
       type:    Boolean,
       default: true
+    },
+
+    // if options are passed for keys, then the key's input will become a select
+    keysSelectOptions: {
+      type:    Array,
+      default: () => []
     }
   },
 
@@ -108,6 +115,10 @@ export default {
       return POD;
     },
 
+    hasKeySelectOptions() {
+      return !!this.keysSelectOptions?.length;
+    },
+
     ...mapGetters({ t: 'i18n/t' })
   },
 
@@ -194,11 +205,12 @@ export default {
         <div v-if="isView">
           {{ row.key }}
         </div>
-        <input
+        <input v-else-if="!hasKeySelectOptions" v-model="row.key" :mode="mode" @input="update" />
+        <LabeledSelect
           v-else
           v-model="row.key"
           :mode="mode"
-          @input="update"
+          :options="keysSelectOptions"
         />
       </div>
       <div

package/components/form/WorkloadPorts.vue

@@ -366,7 +366,7 @@ export default {
             v-model="row._ipam"
             :mode="mode"
             :options="ipamOptions"
-            :label="t('harvester.service.ipam.label')"
+            :label="t('servicesPage.harvester.ipam.label')"
             :disabled="mode === 'edit'"
             @input="queueUpdate"
           />
@@ -376,7 +376,7 @@ export default {
             v-model="rows[ipamIndex]._ipam"
             :mode="mode"
             :options="ipamOptions"
-            :label="t('harvester.service.ipam.label')"
+            :label="t('servicesPage.harvester.ipam.label')"
             :disabled="true"
             @input="queueUpdate"
           />

package/components/nav/Header.vue

@@ -109,6 +109,19 @@ export default {
       return !this.featureRancherDesktop;
     },
 
+    showFilter() {
+      // Some products won't have a current cluster
+      const validClusterOrProduct = this.currentCluster ||
+                 (this.currentProduct && this.currentProduct.customNamespaceFilter) ||
+                 (this.currentProduct && this.currentProduct.showWorkspaceSwitcher);
+      // Don't show if the header is in 'simple' mode
+      const notSimple = !this.simple;
+      // One of these must be enabled, otherwise t here's no component to show
+      const validFilterSettings = this.currentProduct.showNamespaceFilter || this.currentProduct.showWorkspaceSwitcher;
+
+      return validClusterOrProduct && notSimple && validFilterSettings;
+    },
+
     featureRancherDesktop() {
       return this.$config.rancherEnv === 'desktop';
     },
@@ -332,7 +345,7 @@ export default {
       <component :is="navHeaderRight" />
 
       <div
-        v-if="(currentCluster || (currentProduct && currentProduct.customNamespaceFilter)) && !simple && (currentProduct.showNamespaceFilter || currentProduct.showWorkspaceSwitcher)"
+        v-if="showFilter"
         class="top"
       >
         <NamespaceFilter v-if="clusterReady && currentProduct && (currentProduct.showNamespaceFilter || isExplorer)" />

package/config/product/settings.js

@@ -26,6 +26,7 @@ export function init(store) {
     removable:           false,
     showClusterSwitcher: false,
     category:            'configuration',
+    weight:              100,
   });
 
   virtualType({

package/config/product/uiplugins.js

@@ -13,5 +13,6 @@ export function init(store) {
     removable:           false,
     showClusterSwitcher: false,
     category:            'configuration',
+    weight:              50,
   });
 }

package/config/uiplugins.js

@@ -34,6 +34,7 @@ export const UI_PLUGIN_CHART_ANNOTATIONS = {
   RANCHER_VERSION:    'catalog.cattle.io/rancher-version',
   EXTENSIONS_VERSION: 'catalog.cattle.io/ui-extenstions-version',
   EXTENSIONS_HOST:    'catalog.cattle.io/ui-extenstions-host',
+  DISPLAY_NAME:       'catalog.cattle.io/display-name',
 };
 
 // Plugin Metadata properties
@@ -41,6 +42,7 @@ export const UI_PLUGIN_METADATA = {
   RANCHER_VERSION:    'rancherVersion',
   EXTENSION_VERSION:  'extVersion',
   EXTENSIONS_HOST:    'host',
+  DISPLAY_NAME:       'displayName',
 };
 
 export function isUIPlugin(chart) {
@@ -55,6 +57,17 @@ export function uiPluginHasAnnotation(chart, name, value) {
   });
 }
 
+/**
+ * Get value of the annotation from teh latest version for a chart
+ */
+export function uiPluginAnnotation(chart, name) {
+  if (chart?.versions?.length > 0) {
+    return chart.versions[0].annotations?.[name];
+  }
+
+  return undefined;
+}
+
 // Should we load a plugin, based on the metadata returned by the backend?
 // Returns error key string or false
 export function shouldNotLoadPlugin(plugin, rancherVersion) {

package/creators/app/init

@@ -73,8 +73,8 @@ pkg.dependencies['@rancher/shell'] = `^${ creatorPkg.version }`;
 
 // Rest of dependencies are in the _pkgs property of package.json - copy then across
 if (creatorPkg._pkgs) {
-  Object.keys(creatorPkg._pkgs).forEach((pkg) => {
-    pkg.dependencies[pkg] = creatorPkg._pkgs[pkg];
+  Object.keys(creatorPkg._pkgs).forEach((pkgName) => {
+    pkg.dependencies[pkgName] = creatorPkg._pkgs[pkgName];
   });
 }
 

package/creators/app/package.json

@@ -7,7 +7,7 @@
   "private": false,
   "bin": "./init",
   "files": [
-    "*.*",
+    "**/*.*",
     "init"
   ],
   "engines": {

package/creators/pkg/package.json

@@ -7,7 +7,7 @@
   "private": false,
   "bin": "./init",
   "files": [
-    "*.*",
+    "**/*.*",
     "init"
   ],
   "engines": {

package/detail/cis.cattle.io.clusterscan.vue

@@ -290,8 +290,12 @@ export default {
         :headers="reportCheckHeaders"
         key-field="id"
       >
-        <template #sub-row="{row, fullColspan}">
-          <tr class="sub-row">
+        <template #sub-row="{row, fullColspan, onRowMouseEnter, onRowMouseLeave}">
+          <tr
+            class="sub-row"
+            @mouseenter="onRowMouseEnter"
+            @mouseleave="onRowMouseLeave"
+          >
             <td :colspan="fullColspan">
               <Banner v-if="(row.state==='fail' || row.state==='warn')&& row.remediation" class="sub-banner" :label="remediationDisplay(row)" color="warning" />
               <SortableTable

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

@@ -631,11 +631,11 @@ export default {
                 </div>
               </div>
               <div v-if="group.ref" class="right mr-45">
-                <template v-if="value.hasLink('update')">
+                <template v-if="value.hasLink('update') && group.ref.showScalePool">
                   <button v-tooltip="t('node.list.scaleDown')" :disabled="!group.ref.canScaleDownPool()" type="button" class="btn btn-sm role-secondary" @click="group.ref.scalePool(-1)">
                     <i class="icon icon-sm icon-minus" />
                   </button>
-                  <button v-tooltip="t('node.list.scaleUp')" type="button" class="btn btn-sm role-secondary ml-10" @click="group.ref.scalePool(1)">
+                  <button v-tooltip="t('node.list.scaleUp')" :disabled="!group.ref.canScaleUpPool()" type="button" class="btn btn-sm role-secondary ml-10" @click="group.ref.scalePool(1)">
                     <i class="icon icon-sm icon-plus" />
                   </button>
                 </template>
@@ -709,7 +709,7 @@ export default {
       </Tab>
 
       <Tab v-if="showRegistration" name="registration" :label="t('cluster.tabs.registration')" :weight="2">
-        <Banner color="warning" :label="t('cluster.import.warningBanner')" />
+        <Banner v-if="!value.isCustom" color="warning" :label="t('cluster.import.warningBanner')" />
         <CustomCommand v-if="value.isCustom" :cluster-token="clusterToken" :cluster="value" @copied-windows="hasWindowsMachine ? null : showWindowsWarning = true" />
         <template v-else>
           <h4 v-html="t('cluster.import.commandInstructions', null, true)" />

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

@@ -10,7 +10,6 @@ const DEFAULTS = {
   force:                           false, // Show; true = Delete standalone pods, false = fail if there are any
   gracePeriod:                     -1, // Show; Pod shut down time, negative value uses pod default
   ignoreDaemonSets:                true, // Hide; true = work, false = never work because there's always daemonSets
-  ignoreErrors:                    false, // Hide; profit?
   skipWaitForDeleteTimeoutSeconds: 0, // Hide; If the pod deletion time is older than this > 0, don't wait, for some reason
   timeout:                         120, // Show; Give up after this many seconds
 };

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

@@ -35,9 +35,10 @@ export default {
       default: () => ({})
     },
 
+    // no credentials are required for elemental machine pools
     credentialId: {
-      type:     String,
-      required: true,
+      type:    String,
+      default: null
     },
 
     mode: {
@@ -219,7 +220,8 @@ export default {
       :machine-pools="machinePools"
       @error="e=>errors = e"
     />
-    <Banner v-else color="info" label="You do not have access to see this machine pool's configuration." />
+    <Banner v-else-if="value.configMissing" color="error" label-key="cluster.machinePool.configNotFound" />
+    <Banner v-else color="info" label-key="cluster.machinePool.noAccessBanner" />
 
     <AdvancedSection :mode="mode" class="advanced">
       <portal-target :name="'advanced-' + uuid" multiple />

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

@@ -202,26 +202,6 @@ export default {
       set(this.value.spec, 'kubernetesVersion', this.defaultVersion);
     }
 
-    for ( const k in this.serverArgs ) {
-      if ( this.serverConfig[k] === undefined ) {
-        const def = this.serverArgs[k].default;
-
-        set(this.serverConfig, k, (def !== undefined ? def : undefined));
-      }
-    }
-
-    for ( const k in this.agentArgs ) {
-      if ( this.agentConfig[k] === undefined ) {
-        const def = this.agentArgs[k].default;
-
-        set(this.agentConfig, k, (def !== undefined ? def : undefined));
-      }
-    }
-
-    if ( !this.serverConfig.profile ) {
-      set(this.serverConfig, 'profile', null);
-    }
-
     if ( this.rkeConfig.etcd?.s3?.bucket ) {
       this.s3Backup = true;
     }
@@ -922,6 +902,9 @@ export default {
 
       // Allow time for addonNames to update... then fetch any missing addons
       this.$nextTick(() => this.initAddons());
+      if (this.mode === _CREATE) {
+        this.initServerAgentArgs();
+      }
     },
 
     showCni(neu) {
@@ -1113,10 +1096,6 @@ export default {
           entry.config = await entry.config.save();
         }
 
-        if ( !entry.pool.hostnamePrefix ) {
-          entry.pool.hostnamePrefix = `${ prefix }-`;
-        }
-
         finalPools.push(entry.pool);
       }
 
@@ -1387,6 +1366,28 @@ export default {
       return merge({}, defaultChartValue?.values || {}, this.userChartValues[key] || {});
     },
 
+    initServerAgentArgs() {
+      for ( const k in this.serverArgs ) {
+        if ( this.serverConfig[k] === undefined ) {
+          const def = this.serverArgs[k].default;
+
+          set(this.serverConfig, k, (def !== undefined ? def : undefined));
+        }
+      }
+
+      for ( const k in this.agentArgs ) {
+        if ( this.agentConfig[k] === undefined ) {
+          const def = this.agentArgs[k].default;
+
+          set(this.agentConfig, k, (def !== undefined ? def : undefined));
+        }
+      }
+
+      if ( !this.serverConfig.profile ) {
+        set(this.serverConfig, 'profile', null);
+      }
+    },
+
     chartVersionKey(name) {
       const addonVersion = this.addonVersions.find(av => av.name === name);
 

package/edit/service.vue

@@ -455,7 +455,7 @@ export default {
       <Tab
         v-if="showHarvesterAddOnConfig"
         name="add-on-config"
-        :label="t('harvester.service.title')"
+        :label="t('servicesPage.harvester.title')"
         :weight="-1"
       >
         <HarvesterServiceAddOnConfig

package/list/node.vue

@@ -153,8 +153,13 @@ export default {
       :loading="loading"
       v-on="$listeners"
     >
-      <template #sub-row="{fullColspan, row}">
-        <tr class="taints sub-row" :class="{'empty-taints': !row.spec.taints || !row.spec.taints.length}">
+      <template #sub-row="{fullColspan, row, onRowMouseEnter, onRowMouseLeave}">
+        <tr
+          class="taints sub-row"
+          :class="{'empty-taints': !row.spec.taints || !row.spec.taints.length}"
+          @mouseenter="onRowMouseEnter"
+          @mouseleave="onRowMouseLeave"
+        >
           <template v-if="row.spec.taints && row.spec.taints.length">
             <td>&nbsp;</td>
             <td>&nbsp;</td>

package/mixins/resource-manager.js

@@ -74,6 +74,11 @@ export default {
                 // - id param = this.$store.getters['cluster/keyFieldForType'](type)
                 // - id value = new dashboard-store getter, overwritten by steve store getter
                 requestData.forEach((item) => {
+                  // if there's already a prop type, don't overwrite it without storing it first...
+                  // only do this operation once in multiple apply's because the requestData is the same!
+                  if (item.type && !item._type) {
+                    item._type = item.type;
+                  }
                   item.type = type;
                   item.id = `${ item.metadata.namespace }/${ item.metadata.name }`;
                 });

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

@@ -159,6 +159,14 @@ export default class CapiMachineDeployment extends SteveModel {
     return notOnlyOfRole(this, this.cluster.machines);
   }
 
+  canScaleUpPool() {
+    return true;
+  }
+
+  get showScalePool() {
+    return this.canScaleDownPool() || this.canScaleUpPool();
+  }
+
   get stateParts() {
     const out = [
       {

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

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import { CATALOG, CLUSTER_BADGE } from '@shell/config/labels-annotations';
-import { NODE, FLEET, MANAGEMENT } from '@shell/config/types';
+import { NODE, FLEET, MANAGEMENT, CAPI } from '@shell/config/types';
 import { insertAt } from '@shell/utils/array';
 import { downloadFile } from '@shell/utils/download';
 import { parseSi } from '@shell/utils/units';
@@ -430,4 +430,17 @@ export default class MgmtCluster extends HybridModel {
   get nodes() {
     return this.$getters['all'](MANAGEMENT.NODE).filter(node => node.id.startsWith(this.id));
   }
+
+  get provClusterId() {
+    const isRKE1 = !!this.spec?.rancherKubernetesEngineConfig;
+    // Note: RKE1 provisioning cluster IDs are in a different format. For example,
+    // RKE2 cluster IDs include the name - fleet-default/cluster-name - whereas an RKE1
+    // cluster has the less human readable management cluster ID in it: fleet-default/c-khk48
+
+    const verb = this.isLocal || isRKE1 ? 'to' : 'from';
+    const from = `${ verb }Type`;
+    const id = `${ verb }Id`;
+
+    return this.metadata.relationships.find(r => r[from] === CAPI.RANCHER_CLUSTER)?.[id];
+  }
 }