@rancher/shell 0.5.1 → 0.5.2

package/core/types-provisioning.ts

@@ -60,6 +60,7 @@ export interface IClusterProvisioner {
 
   /**
    * Unique ID of the Cluster Provisioner
+   * If this overlaps with the name of an existing provisioner (seen in the type query param while creating a cluster) this provisioner will overwrite the built-in ui
    */
   id: string;
 
@@ -115,6 +116,12 @@ export interface IClusterProvisioner {
    */
   tag?: string;
 
+  /**
+   * Also show the provider card in the cluster importing flow
+   * If not set, the card will only be shown in the cluster creation page
+   */
+  showImport?: boolean
+
   /* --------------------------------------------------------------------------------------
    * Custer Details View
    * --------------------------------------------------------------------------------------- */

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

@@ -301,7 +301,7 @@ export default {
       const getters = this.$store.getters;
       const isImport = this.isImport;
       const isElementalActive = !!this.activeProducts.find((item) => item.name === ELEMENTAL_PRODUCT_NAME);
-      const out = [];
+      let out = [];
 
       const templates = this.templateOptions;
       const vueKontainerTypes = getters['plugins/clusterDrivers'];
@@ -348,12 +348,18 @@ export default {
         }
 
         // Add from extensions
-        // if th rke toggle is set to rke1, don't add extensions that specify rke2 group
-        // default group is rke2
         this.extensions.forEach((ext) => {
+          // if the rke toggle is set to rke1, don't add extensions that specify rke2 group
+          // default group is rke2
           if (!this.isRke2 && (ext.group === _RKE2 || !ext.group)) {
             return;
           }
+          // Do not show the extension provisioner on the import cluster page unless its explicitly set to do so
+          if (isImport && !ext.showImport) {
+            return;
+          }
+          // Allow extensions to overwrite provisioners with the same id
+          out = out.filter((type) => type.id !== ext.id);
           addExtensionType(ext, getters);
         });
       }

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

@@ -1,6 +1,7 @@
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 
-const HIDDEN = ['rke', 'rancherkubernetesengine', 'azureaks'];
+const HIDDEN = ['rke', 'rancherkubernetesengine'];
+
 const V2 = ['amazoneks', 'googlegke', 'azureaks'];
 const IMPORTABLE = ['amazoneks', 'googlegke', 'azureaks'];
 

package/package.json

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

package/scripts/extension/parse-tag-name

@@ -4,8 +4,8 @@ GITHUB_RELEASE_TAG=$1
 GITHUB_RUN_ID=$2
 GITHUB_WORKFLOW_TYPE=$3
 
-# Check packages for released tag name
-if [[ "${GITHUB_WORKFLOW_TYPE}" == "charts" ]]; then
+# Ensure "catalog" workflow release tag name does not match a pkg/<pkg-name>
+if [[ "${GITHUB_WORKFLOW_TYPE}" == "catalog" ]]; then
   for d in pkg/*/ ; do
     pkg=$(basename $d)
 
@@ -19,7 +19,7 @@ if [[ "${GITHUB_WORKFLOW_TYPE}" == "charts" ]]; then
     fi
   done
 else
-  # Check base extension name for tag name
+  # Ensure "charts" workflow release tag name does not match the root <pkg-name>
   BASE_EXT=$(jq -r .name package.json)
   EXT_VERSION=$(jq -r .version package.json)
 

package/store/plugins.js

@@ -100,12 +100,13 @@ export const suffixFields = [
 
 // Machine driver to cloud provider mapping
 const driverToCloudProviderMap = {
-  amazonec2:     'aws',
-  azure:         'azure',
-  digitalocean:  '', // Show restricted options
-  harvester:     'harvester',
-  linode:        '', // Show restricted options
-  vmwarevsphere: 'rancher-vsphere',
+  amazonec2:           'aws',
+  azure:               'azure',
+  digitalocean:        '', // Show restricted options
+  harvester:           'harvester',
+  linode:              '', // Show restricted options
+  vmwarevsphere:       'rancher-vsphere',
+  ovhcloudpubliccloud: '',
 
   custom: undefined // Show all options
 };