@rancher/shell 0.1.21 → 0.2.1

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/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/provisioning.cattle.io.cluster.vue

@@ -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/ACE.vue

@@ -4,6 +4,7 @@ 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';
+import { _CREATE } from '@shell/config/query-params';
 
 export default {
   components: {
@@ -23,7 +24,7 @@ export default {
   },
 
   data() {
-    if ( isEmpty(this.value?.spec?.localClusterAuthEndpoint) ) {
+    if ( isEmpty(this.value?.spec?.localClusterAuthEndpoint) && this.mode === _CREATE ) {
       set(this.value, 'spec.localClusterAuthEndpoint', {
         enabled: false,
         caCerts: '',

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/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/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,12 @@ export default class MgmtCluster extends HybridModel {
   get nodes() {
     return this.$getters['all'](MANAGEMENT.NODE).filter(node => node.id.startsWith(this.id));
   }
+
+  get provClusterId() {
+    const verb = this.isLocal ? 'to' : 'from';
+    const from = `${ verb }Type`;
+    const id = `${ verb }Id`;
+
+    return this.metadata.relationships.find(r => r[from] === CAPI.RANCHER_CLUSTER)?.[id];
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "0.1.21",
+  "version": "0.2.1",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/c/_cluster/apps/charts/install.vue

@@ -5,13 +5,13 @@ import isEqual from 'lodash/isEqual';
 import { mapPref, DIFF } from '@shell/store/prefs';
 import { mapFeature, MULTI_CLUSTER, LEGACY } from '@shell/store/features';
 import { mapGetters } from 'vuex';
-
 import { Banner } from '@components/Banner';
 import ButtonGroup from '@shell/components/ButtonGroup';
 import ChartReadme from '@shell/components/ChartReadme';
 import { Checkbox } from '@components/Form/Checkbox';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { LabeledInput } from '@components/Form/LabeledInput';
+import { LabeledTooltip } from '@components/LabeledTooltip';
 import LazyImage from '@shell/components/LazyImage';
 import Loading from '@shell/components/Loading';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
@@ -24,7 +24,7 @@ import Wizard from '@shell/components/Wizard';
 import TypeDescription from '@shell/components/TypeDescription';
 import ChartMixin from '@shell/mixins/chart';
 import ChildHook, { BEFORE_SAVE_HOOKS, AFTER_SAVE_HOOKS } from '@shell/mixins/child-hook';
-import { CATALOG, MANAGEMENT, DEFAULT_WORKSPACE } from '@shell/config/types';
+import { CATALOG, MANAGEMENT, DEFAULT_WORKSPACE, CAPI } from '@shell/config/types';
 import {
   CHART, FROM_CLUSTER, FROM_TOOLS, HIDE_SIDE_NAV, NAMESPACE, REPO, REPO_TYPE, VERSION, _FLAGGED
 } from '@shell/config/query-params';
@@ -61,6 +61,7 @@ export default {
     Checkbox,
     LabeledInput,
     LabeledSelect,
+    LabeledTooltip,
     LazyImage,
     Loading,
     NameNsDescription,
@@ -93,10 +94,12 @@ export default {
 
     this.errors = [];
 
-    this.defaultRegistrySetting = await this.$store.dispatch('management/find', {
-      type: MANAGEMENT.SETTING,
-      id:   'system-default-registry'
-    });
+    // If the chart doesn't contain system `systemDefaultRegistry` properties there's no point applying them
+    if (this.showCustomRegistry) {
+      this.clusterRegistry = await this.getClusterRegistry();
+      this.globalRegistry = await this.getGlobalRegistry();
+      this.defaultRegistrySetting = this.clusterRegistry || this.globalRegistry;
+    }
 
     this.serverUrlSetting = await this.$store.dispatch('management/find', {
       type: MANAGEMENT.SETTING,
@@ -281,6 +284,16 @@ export default {
       */
       this.chartValues = merge(merge({}, this.versionInfo?.values || {}), userValues);
 
+      if (this.showCustomRegistry) {
+        const existingRegistry = this.chartValues?.global?.systemDefaultRegistry || this.chartValues?.global?.cattle?.systemDefaultRegistry;
+
+        delete this.chartValues?.global?.systemDefaultRegistry;
+        delete this.chartValues?.global?.cattle?.systemDefaultRegistry;
+
+        this.customRegistrySetting = existingRegistry || this.defaultRegistrySetting;
+        this.showCustomRegistryInput = !!this.customRegistrySetting;
+      }
+
       /* Serializes an object as a YAML document */
       this.valuesYaml = saferDump(this.chartValues);
 
@@ -292,6 +305,7 @@ export default {
       this.loadedVersionValues = this.versionInfo?.values || {};
       this.loadedVersion = this.version?.key;
     }
+
     /* Check if chart exists and if required values exist */
     this.updateStepOneReady();
 
@@ -317,13 +331,16 @@ export default {
     };
 
     return {
-      defaultRegistrySetting: null,
+      defaultRegistrySetting: '',
+      customRegistrySetting:  '',
       serverUrlSetting:       null,
       chartValues:            null,
+      clusterRegistry:        '',
       originalYamlValues:     null,
       previousYamlValues:     null,
       errors:                 null,
       existing:               null,
+      globalRegistry:         '',
       forceNamespace:         null,
       loadedVersion:          null,
       loadedVersionValues:    null,
@@ -335,22 +352,22 @@ export default {
       valuesYaml:             '',
       project:                null,
       migratedApp:            false,
-
       defaultCmdOpts,
-      customCmdOpts: { ...defaultCmdOpts },
+      customCmdOpts:          { ...defaultCmdOpts },
 
       nameDisabled: false,
 
-      preFormYamlOption:   VALUES_STATE.YAML,
-      formYamlOption:      VALUES_STATE.YAML,
-      showDiff:            false,
-      showValuesComponent: true,
-      showQuestions:       true,
-      showSlideIn:         false,
-      shownReadmeWindows:  [],
-      componentHasTabs:    false,
-      showCommandStep:     false,
-      isNamespaceNew:      false,
+      preFormYamlOption:       VALUES_STATE.YAML,
+      formYamlOption:          VALUES_STATE.YAML,
+      showDiff:                false,
+      showValuesComponent:     true,
+      showQuestions:           true,
+      showSlideIn:             false,
+      shownReadmeWindows:      [],
+      componentHasTabs:        false,
+      showCommandStep:         false,
+      showCustomRegistryInput: false,
+      isNamespaceNew:          false,
 
       stepBasic: {
         name:           'basics',
@@ -645,6 +662,23 @@ export default {
       }
 
       return null;
+    },
+
+    /**
+     * Check if the chart contains `systemDefaultRegistry` properties. If not we shouldn't apply the setting (or show the UI for them)
+     */
+    showCustomRegistry() {
+      const global = this.versionInfo?.values?.global || {};
+
+      return global.systemDefaultRegistry !== undefined || global.cattle?.systemDefaultRegistry !== undefined;
+    },
+
+    /**
+     * True if we should apply/save the custom registry value. This should be false if matching the global registry
+     * (we shouldn't save the global registry to avoid issues on upgrade where we might confused it with a custom one)
+     */
+    applyCustomRegistry() {
+      return this.customRegistrySetting !== this.globalRegistry;
     }
   },
 
@@ -744,6 +778,42 @@ export default {
   },
 
   methods: {
+    async getClusterRegistry() {
+      const hasPermissionToSeeProvCluster = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
+
+      if (hasPermissionToSeeProvCluster) {
+        const mgmCluster = this.$store.getters['currentCluster'];
+        const provCluster = await this.$store.dispatch('management/find', {
+          type: CAPI.RANCHER_CLUSTER,
+          id:   mgmCluster.provClusterId
+        });
+
+        if (provCluster.isRke2) { // isRke2 returns true for both RKE2 and K3s clusters.
+          const agentConfig = provCluster.spec.rkeConfig.machineSelectorConfig.find(x => !x.machineLabelSelector).config;
+
+          // If a cluster scoped registry exists,
+          // it should be used by default.
+          const clusterRegistry = agentConfig?.['system-default-registry'] || '';
+
+          if (clusterRegistry) {
+            return clusterRegistry;
+          }
+        }
+      }
+    },
+
+    async getGlobalRegistry() {
+      // Use the global registry as a fallback.
+      // If it is an empty string, the container
+      // runtime will pull images from docker.io.
+      const globalRegistry = await this.$store.dispatch('management/find', {
+        type: MANAGEMENT.SETTING,
+        id:   'system-default-registry'
+      });
+
+      return globalRegistry.value;
+    },
+
     updateValue(value) {
       if (this.$refs.yaml) {
         this.$refs.yaml.updateValue(value);
@@ -905,7 +975,7 @@ export default {
       const cluster = this.currentCluster;
       const projects = this.$store.getters['management/all'](MANAGEMENT.PROJECT);
       const systemProjectId = projects.find(p => p.spec?.displayName === 'System')?.id?.split('/')?.[1] || '';
-      const defaultRegistry = this.defaultRegistrySetting?.value || '';
+
       const serverUrl = this.serverUrlSetting?.value || '';
       const isWindows = (cluster.workerOSs || []).includes(WINDOWS);
       const pathPrefix = cluster?.spec?.rancherKubernetesEngineConfig?.prefixPath || '';
@@ -913,8 +983,15 @@ export default {
 
       setIfNotSet(cattle, 'clusterId', cluster?.id);
       setIfNotSet(cattle, 'clusterName', cluster?.nameDisplay);
-      setIfNotSet(cattle, 'systemDefaultRegistry', defaultRegistry);
-      setIfNotSet(global, 'systemDefaultRegistry', defaultRegistry);
+      if (this.showCustomRegistry) {
+        // If this is the current global registry leave it blank. This avoids the scenario on upgrade where a previous global registry that's
+        // been updated is confused with a custom user registry
+        const registry = this.applyCustomRegistry ? this.customRegistrySetting : '';
+
+        set(cattle, 'systemDefaultRegistry', registry);
+        set(global, 'systemDefaultRegistry', registry);
+      }
+
       setIfNotSet(global, 'cattle.systemProjectId', systemProjectId);
       setIfNotSet(cattle, 'url', serverUrl);
       setIfNotSet(cattle, 'rkePathPrefix', pathPrefix);
@@ -939,7 +1016,6 @@ export default {
       }
 
       const cluster = this.$store.getters['currentCluster'];
-      const defaultRegistry = this.defaultRegistrySetting?.value || '';
       const serverUrl = this.serverUrlSetting?.value || '';
       const isWindows = (cluster.workerOSs || []).includes(WINDOWS);
       const pathPrefix = cluster?.spec?.rancherKubernetesEngineConfig?.prefixPath || '';
@@ -948,7 +1024,6 @@ export default {
       if ( values.global?.cattle ) {
         deleteIfEqual(values.global.cattle, 'clusterId', cluster?.id);
         deleteIfEqual(values.global.cattle, 'clusterName', cluster?.nameDisplay);
-        deleteIfEqual(values.global.cattle, 'systemDefaultRegistry', defaultRegistry);
         deleteIfEqual(values.global.cattle, 'url', serverUrl);
         deleteIfEqual(values.global.cattle, 'rkePathPrefix', pathPrefix);
         deleteIfEqual(values.global.cattle, 'rkeWindowsPathPrefix', windowsPathPrefix);
@@ -966,10 +1041,6 @@ export default {
         delete values.global.cattle;
       }
 
-      if ( values.global ) {
-        deleteIfEqual(values.global, 'systemDefaultRegistry', defaultRegistry);
-      }
-
       if ( !Object.keys(values.global || {}).length ) {
         delete values.global;
       }
@@ -1289,7 +1360,6 @@ export default {
             </div>
           </div>
           <NameNsDescription
-            v-if="chart"
             v-model="value"
             :description-hidden="true"
             :mode="mode"
@@ -1316,13 +1386,31 @@ export default {
               />
             </template>
           </NameNsDescription>
+          <Checkbox v-model="showCommandStep" class="mb-20" :label="t('catalog.install.steps.helmCli.checkbox', { action, existing: !!existing })" />
+
+          <Checkbox
+            v-if="showCustomRegistry"
+            v-model="showCustomRegistryInput"
+            class="mb-20"
+            :label="t('catalog.chart.registry.custom.checkBoxLabel')"
+            :tooltip="t('catalog.chart.registry.tooltip')"
+          />
+          <div v-if="showCustomRegistry" class="row">
+            <div class="col span-6">
+              <LabeledInput
+                v-if="showCustomRegistryInput"
+                v-model="customRegistrySetting"
+                label-key="catalog.chart.registry.custom.inputLabel"
+                placeholder-key="catalog.chart.registry.custom.placeholder"
+                :min-height="30"
+              />
+            </div>
+          </div>
           <div class="step__values__controls--spacer" style="flex:1">
 &nbsp;
           </div>
           <Banner v-if="isNamespaceNew" color="info" v-html="t('catalog.install.steps.basics.createNamespace', {namespace: value.metadata.namespace}, true) ">
           </Banner>
-
-          <Checkbox v-model="showCommandStep" class="mb-20" :label="t('catalog.install.steps.helmCli.checkbox', { action, existing: !!existing })" />
         </div>
       </template>
       <template #clusterTplVersion>

package/pages/c/_cluster/uiplugins/InstallDialog.vue

@@ -208,7 +208,7 @@ export default {
   >
     <div v-if="plugin" class="plugin-install-dialog">
       <h4 class="mt-10">
-        {{ t(`plugins.${ mode }.title`, { name: plugin.name }) }}
+        {{ t(`plugins.${ mode }.title`, { name: plugin.label }) }}
       </h4>
       <div class="custom mt-10">
         <div class="dialog-panel">

package/pages/c/_cluster/uiplugins/PluginInfoPanel.vue

@@ -117,8 +117,11 @@ export default {
         </div>
         <div>
           <Banner v-if="info.error" color="error" :label="info.error" class="mt-10" />
-          <Banner v-if="!info.certified" color="warning" :label="t('plugins.descriptions.third-party')" class="mt-10" />
-          <Banner v-if="info.experimental" color="warning" :label="t('plugins.descriptions.experimental')" class="mt-10" />
+          <Banner v-if="info.builtin" color="warning" :label="t('plugins.descriptions.built-in')" class="mt-10" />
+          <template v-else>
+            <Banner v-if="!info.certified" color="warning" :label="t('plugins.descriptions.third-party')" class="mt-10" />
+            <Banner v-if="info.experimental" color="warning" :label="t('plugins.descriptions.experimental')" class="mt-10" />
+          </template>
         </div>
 
         <h3 v-if="info.versions.length">

package/pages/c/_cluster/uiplugins/UninstallDialog.vue

@@ -69,7 +69,7 @@ export default {
   >
     <div v-if="plugin" class="plugin-install-dialog">
       <h4 class="mt-10">
-        {{ t('plugins.uninstall.title', { name: plugin.name }) }}
+        {{ t('plugins.uninstall.title', { name: plugin.label }) }}
       </h4>
       <div class="mt-10 dialog-panel">
         <div class="dialog-info">