@rancher/shell 0.4.0 → 0.5.1

package/edit/provisioning.cattle.io.cluster/__tests__/utils/cluster.ts

@@ -0,0 +1,386 @@
+export const PROV_CLUSTER = {
+  id:         'fleet-default/test-args',
+  type:       'provisioning.cattle.io.cluster',
+  apiVersion: 'provisioning.cattle.io/v1',
+  kind:       'Cluster',
+  metadata:   {
+    annotations:       { 'field.cattle.io/creatorId': 'user' },
+    creationTimestamp: '2024-01-14T10:03:39Z',
+    generation:        3,
+    name:              'test-args',
+    namespace:         'fleet-default',
+    state:             {
+      error:         false,
+      message:       'Resource is Ready',
+      name:          'active',
+      transitioning: false
+    },
+    uid:    'eab4ed52-c339-4d61-8dc2-804d09f36425',
+    labels: {}
+  },
+  spec: {
+    kubernetesVersion:        'v1.27.8+rke2r1',
+    localClusterAuthEndpoint: {
+      enabled: false,
+      caCerts: '',
+      fqdn:    ''
+    },
+    rkeConfig: {
+      chartValues: { 'rke2-calico': {} },
+      etcd:        {
+        snapshotRetention:    5,
+        snapshotScheduleCron: '0 */5 * * *',
+        disableSnapshots:     false
+      },
+      machineGlobalConfig: {
+        cni:                   'calico',
+        'disable-kube-proxy':  false,
+        'etcd-expose-metrics': false
+      },
+      machinePoolDefaults: {},
+      machinePools:        [
+        {
+          controlPlaneRole:  true,
+          drainBeforeDelete: true,
+          etcdRole:          true,
+          machineConfigRef:  {
+            kind: 'DigitaloceanConfig',
+            name: 'nc-test-args-pool1-dfvbh'
+          },
+          name:                 'pool1',
+          quantity:             1,
+          unhealthyNodeTimeout: '0s',
+          workerRole:           true
+        }
+      ],
+      machineSelectorConfig: [
+        { config: { 'protect-kernel-defaults': false } }
+      ],
+      registries: {
+        configs: {},
+        mirrors: {}
+      },
+    },
+    defaultPodSecurityAdmissionConfigurationTemplateName: '',
+  },
+  status: {
+    agentDeployed:      true,
+    clientSecretName:   'test-args-kubeconfig',
+    clusterName:        'c-m-qk7hvstl',
+    fleetWorkspaceName: 'fleet-default',
+    observedGeneration: 3,
+    ready:              true
+  }
+};
+
+export const VERSION_CLUSTER = {
+  label:      'v1.27.8+rke2r1',
+  value:      'v1.27.8+rke2r1',
+  sort:       '0000000001.0000000027.0000000008.rke0000000002r0000000001',
+  serverArgs: {
+    'audit-policy-file': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cluster-cidr': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cluster-dns': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cluster-domain': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    cni: {
+      type:    'array',
+      default: 'calico',
+      create:  false,
+      update:  false,
+      options: [
+        'canal',
+        'cilium',
+        'calico',
+        'multus,canal',
+        'multus,cilium',
+        'multus,calico'
+      ]
+    },
+    'container-runtime-endpoint': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    disable: {
+      type:    'array',
+      create:  false,
+      update:  false,
+      options: [
+        'rke2-coredns',
+        'rke2-ingress-nginx',
+        'rke2-metrics-server'
+      ]
+    },
+    'disable-cloud-controller': {
+      type:   'bool',
+      create: false,
+      update: false
+    },
+    'disable-kube-proxy': {
+      type:    'boolean',
+      default: false,
+      create:  false,
+      update:  false
+    },
+    'disable-scheduler': {
+      type:   'bool',
+      create: false,
+      update: false
+    },
+    'egress-selector-mode': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'etcd-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'etcd-expose-metrics': {
+      type:    'boolean',
+      default: false,
+      create:  false,
+      update:  false
+    },
+    'etcd-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kube-cloud-controller-manager-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kube-proxy-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kubelet-path': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'pause-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'runtime-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'service-cidr': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'service-node-port-range': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    snapshotter: {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'tls-san': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'tls-san-security': {
+      type:   'boolean',
+      create: false,
+      update: false
+    }
+  },
+  agentArgs: {
+    'audit-policy-file': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cloud-controller-manager-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'cloud-controller-manager-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'cloud-provider-config': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cloud-provider-name': {
+      type:     'enum',
+      nullable: true,
+      create:   false,
+      update:   false,
+      options:  [
+        'aws',
+        'azure',
+        'gcp',
+        'rancher-vsphere',
+        'harvester',
+        'external'
+      ]
+    },
+    'control-plane-resource-limits': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'control-plane-resource-requests': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'etcd-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'etcd-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-proxy-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-proxy-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-proxy-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kubelet-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    profile: {
+      type:     'enum',
+      nullable: true,
+      create:   false,
+      update:   false,
+      options:  [
+        'cis',
+        'cis-1.23'
+      ]
+    },
+    'protect-kernel-defaults': {
+      type:    'boolean',
+      default: false,
+      create:  false,
+      update:  false
+    },
+    'resolv-conf': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    selinux: {
+      type:   'bool',
+      create: false,
+      update: false
+    },
+    'system-default-registry': {
+      type:   'string',
+      create: false,
+      update: false
+    }
+  },
+  disabled: false
+};

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

@@ -14,8 +14,8 @@ import { NAME as HARVESTER_MANAGER } from '@shell/config/harvester-manager-types
 import { HARVESTER as HARVESTER_FEATURE, mapFeature } from '@shell/store/features';
 import { addObject } from '@shell/utils/array';
 import { HIDE_DESC, mapPref } from '@shell/store/prefs';
-import Labels from './Labels';
-import AgentEnv from './AgentEnv';
+import Labels from '@shell/edit/provisioning.cattle.io.cluster/Labels';
+import AgentEnv from '@shell/edit/provisioning.cattle.io.cluster/AgentEnv';
 
 const HARVESTER_HIDE_KEY = 'cm-harvester-import';
 

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

@@ -6,16 +6,16 @@ import SelectIconGrid from '@shell/components/SelectIconGrid';
 import EmberPage from '@shell/components/EmberPage';
 import { ToggleSwitch } from '@components/Form/ToggleSwitch';
 import {
-  CHART, FROM_CLUSTER, SUB_TYPE, _EDIT, _IMPORT, _CONFIG, _VIEW
+  CHART, FROM_CLUSTER, SUB_TYPE, RKE_TYPE, _EDIT, _IMPORT, _CONFIG, _VIEW
 } from '@shell/config/query-params';
 import { mapGetters } from 'vuex';
 import { sortBy } from '@shell/utils/sort';
 import { set } from '@shell/utils/object';
-import { mapPref, PROVISIONER, _RKE1, _RKE2 } from '@shell/store/prefs';
+import { PROVISIONER, _RKE1, _RKE2 } from '@shell/store/prefs';
 import { filterAndArrangeCharts } from '@shell/store/catalog';
 import { CATALOG } from '@shell/config/labels-annotations';
 import { CAPI, MANAGEMENT, DEFAULT_WORKSPACE } from '@shell/config/types';
-import { mapFeature, RKE2 as RKE2_FEATURE } from '@shell/store/features';
+import { mapFeature, RKE2 as RKE2_FEATURE, RKE1_UI } from '@shell/store/features';
 import { allHash } from '@shell/utils/promise';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { ELEMENTAL_PRODUCT_NAME, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
@@ -163,6 +163,7 @@ export default {
 
   data() {
     const subType = this.$route.query[SUB_TYPE] || null;
+    const rkeType = this.$route.query[RKE_TYPE] || null;
     const chart = this.$route.query[CHART] || null;
     const isImport = this.realMode === _IMPORT;
 
@@ -171,6 +172,7 @@ export default {
       kontainerDrivers: [],
       extensions:       [],
       subType,
+      rkeType,
       chart,
       isImport,
       providerCluster:  null,
@@ -181,12 +183,32 @@ export default {
   computed: {
     ...mapGetters({ allCharts: 'catalog/charts' }),
     ...mapGetters('type-map', ['activeProducts']),
-    preferredProvisioner: mapPref(PROVISIONER),
-    _RKE1:                () => _RKE1,
-    _RKE2:                () => _RKE2,
+    // needed to recreate logic on mapPref in order to incorporate the logic around the rkeType query param
+    // https://github.com/rancher/dashboard/issues/6299
+    preferredProvisioner: {
+      get() {
+        if (this.rkeType) {
+          return this.rkeType;
+        }
+
+        return this.$store.getters['prefs/get'](PROVISIONER);
+      },
+      set(value) {
+        this.$store.dispatch('prefs/set', { key: PROVISIONER, value });
+      }
+    },
+    _RKE1: () => _RKE1,
+    _RKE2: () => _RKE2,
 
     emberLink() {
       if (this.value) {
+        if (this.value.provisioner) {
+          const matchingSubtype = this.subTypes.find((st) => st.id.toLowerCase() === this.value.provisioner.toLowerCase());
+
+          if (matchingSubtype) {
+            this.selectType(matchingSubtype.id, false);
+          }
+        }
         // For custom RKE2 clusters, don't load an Ember page.
         // It should be the dashboard.
         if ( this.value.isRke2 && ((this.value.isCustom && this.mode === _EDIT) || (this.value.isCustom && this.as === _CONFIG && this.mode === _VIEW) || (this.subType || '').toLowerCase() === 'custom')) {
@@ -205,12 +227,14 @@ export default {
           return '';
         }
         if ( this.subType ) {
+          // if driver type has a custom form component, don't load an ember page
+          if (this.selectedSubType.component) {
+            return '';
+          }
           // For RKE1 and hosted Kubernetes Clusters, set the ember link
           // so that we load the page rather than using RKE2 create
-          const selected = this.subTypes.find((s) => s.id === this.subType);
-
-          if (selected?.link) {
-            return selected.link;
+          if (this.selectedSubType?.emberLink) {
+            return this.selectedSubType.emberLink;
           }
 
           this.selectType(this.subType, false);
@@ -227,7 +251,13 @@ export default {
       return '';
     },
 
-    rke2Enabled: mapFeature(RKE2_FEATURE),
+    rke2Enabled:   mapFeature(RKE2_FEATURE),
+    rke1UiEnabled: mapFeature(RKE1_UI),
+
+    // todo nb is this info stored anywhere else..?
+    selectedSubType() {
+      return this.subType ? this.subTypes.find((s) => s.id === this.subType) : null;
+    },
 
     provisioner: {
       get() {
@@ -237,6 +267,10 @@ export default {
           return _RKE1;
         }
 
+        if ( !this.rke1UiEnabled ) {
+          return _RKE2;
+        }
+
         return this.preferredProvisioner;
       },
 
@@ -250,7 +284,7 @@ export default {
     },
 
     isRke2() {
-      return this.value.isRke2;
+      return this.value.isRke2 || !this.isRke1;
     },
 
     templateOptions() {
@@ -267,7 +301,6 @@ export default {
       const getters = this.$store.getters;
       const isImport = this.isImport;
       const isElementalActive = !!this.activeProducts.find((item) => item.name === ELEMENTAL_PRODUCT_NAME);
-
       const out = [];
 
       const templates = this.templateOptions;
@@ -298,18 +331,13 @@ export default {
 
         if (this.isRke1 ) {
           machineTypes.forEach((id) => {
-            addType(id, 'rke1', false, `/g/clusters/add/launch/${ id }`, this.iconClasses[id]);
+            addType(id, _RKE1, false, `/g/clusters/add/launch/${ id }`, this.iconClasses[id]);
           });
 
           addType('custom', 'custom1', false, '/g/clusters/add/launch/custom');
         } else {
           machineTypes.forEach((id) => {
-            addType(id, 'rke2', false);
-          });
-
-          // Add from extensions
-          this.extensions.forEach((ext) => {
-            addExtensionType(ext, getters);
+            addType(id, _RKE2, false);
           });
 
           addType('custom', 'custom2', false);
@@ -318,6 +346,16 @@ export default {
             addType(ELEMENTAL_CLUSTER_PROVIDER, 'custom2', false);
           }
         }
+
+        // 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 (!this.isRke2 && (ext.group === _RKE2 || !ext.group)) {
+            return;
+          }
+          addExtensionType(ext, getters);
+        });
       }
 
       return out;
@@ -338,16 +376,17 @@ export default {
           description: ext.description,
           icon,
           iconClass,
-          group:       ext.group || 'rke2',
+          group:       ext.group || _RKE2,
           disabled:    ext.disabled || false,
           link:        ext.link,
-          tag:         ext.tag
+          tag:         ext.tag,
+          component:   ext.component
         };
 
         out.push(subtype);
       }
 
-      function addType(id, group, disabled = false, link = null, iconClass = undefined) {
+      function addType(id, group, disabled = false, emberLink = null, iconClass = undefined) {
         const label = getters['i18n/withFallback'](`cluster.provider."${ id }"`, null, id);
         const description = getters['i18n/withFallback'](`cluster.providerDescription."${ id }"`, null, '');
         const tag = '';
@@ -372,7 +411,7 @@ export default {
           iconClass,
           group,
           disabled,
-          link,
+          emberLink,
           tag
         };
 
@@ -485,8 +524,13 @@ export default {
 
         return;
       }
+      if (obj.link) {
+        this.$router.push(obj.link);
+
+        return;
+      }
 
-      this.$router.applyQuery({ [SUB_TYPE]: id });
+      this.$router.applyQuery({ [SUB_TYPE]: id, [RKE_TYPE]: this.preferredProvisioner });
       this.selectType(id);
     },
 
@@ -545,16 +589,16 @@ export default {
       >
         <h4>
           <div
-            v-if="showRkeToggle(i)"
+            v-if="showRkeToggle(i) && rke1UiEnabled"
             class="grouped-type"
           >
             <ToggleSwitch
               v-model="provisioner"
               data-testid="cluster-manager-create-rke-switch"
               class="rke-switch"
-              off-value="rke1"
+              :off-value="_RKE1"
               :off-label="t('cluster.toggle.v1')"
-              on-value="rke2"
+              :on-value="_RKE2"
               :on-label="t('cluster.toggle.v2')"
             />
           </div>
@@ -578,14 +622,26 @@ export default {
       :mode="mode"
       :provider="subType"
     />
-    <Rke2Config
-      v-else-if="subType"
-      v-model="value"
-      :initial-value="initialValue"
-      :live-value="liveValue"
-      :mode="mode"
-      :provider="subType"
-    />
+    <template v-else-if="subType">
+      <!-- allow extensions to provide their own cluster provisioning form -->
+      <component
+        :is="selectedSubType.component"
+        v-if="selectedSubType && selectedSubType.component"
+        v-model="value"
+        :initial-value="initialValue"
+        :live-value="liveValue"
+        :mode="mode"
+        :provider="subType"
+      />
+      <Rke2Config
+        v-else
+        v-model="value"
+        :initial-value="initialValue"
+        :live-value="liveValue"
+        :mode="mode"
+        :provider="subType"
+      />
+    </template>
 
     <template
       v-if="subType"