@rancher/shell 3.0.12-rc.3 → 3.0.12-rc.5

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

@@ -6,7 +6,9 @@ import SortableTable from '@shell/components/SortableTable';
 import CopyCode from '@shell/components/CopyCode';
 import Tab from '@shell/components/Tabbed/Tab';
 import { allHash } from '@shell/utils/promise';
-import { CAPI, MANAGEMENT, NORMAN, SNAPSHOT } from '@shell/config/types';
+import {
+  CAPI, MANAGEMENT, NORMAN, SNAPSHOT, OPERATION
+} from '@shell/config/types';
 import {
   STATE, NAME as NAME_COL, AGE, INTERNAL_EXTERNAL_IP, STATE_NORMAN, ROLES, MACHINE_NODE_OS, MANAGEMENT_NODE_OS, NAME,
 } from '@shell/config/table-headers';
@@ -96,7 +98,18 @@ export default {
     await this.value.waitForProvisioner();
 
     // Support for the 'provisioner' extension
-    const extClass = this.$extension.getDynamic('provisioner', this.value.machineProvider);
+    let extClass = this.$extension.getDynamic('provisioner', this.value.machineProvider);
+    let provider = this.value.machineProvider;
+
+    if (!extClass) {
+      extClass = this.$extension.getDynamic('provisioner', this.value.provisioner.toLowerCase());
+      provider = this.value.provisioner.toLowerCase();
+    }
+
+    if (!extClass && this.value.isImported) {
+      extClass = this.$extension.getDynamic('provisioner', 'imported');
+      provider = 'imported';
+    }
 
     if (extClass) {
       this.extProvider = new extClass({
@@ -111,7 +124,7 @@ export default {
         ...this.extDetailTabs,
         ...this.extProvider.detailTabs
       };
-      this.extCustomParams = { provider: this.value.machineProvider };
+      this.extCustomParams = { provider };
     }
 
     // Support for a model extension
@@ -120,7 +133,7 @@ export default {
         ...this.extDetailTabs,
         ...this.value.customProvisionerHelper.detailTabs
       };
-      this.extCustomParams = { provider: this.value.machineProvider };
+      this.extCustomParams = { provider };
     }
 
     const schema = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
@@ -138,6 +151,21 @@ export default {
       fetchOne.snapshots = this.$store.dispatch('management/findAll', { type: SNAPSHOT });
     }
 
+    // Fetch operation CRDs for clusters with day 2 ops enabled
+    if ( this.value.isImportedWithDayTwoOps ) {
+      const operationTypes = [
+        OPERATION.ETCD_SNAPSHOT,
+        OPERATION.ETCD_SNAPSHOT_RESTORE,
+        OPERATION.ENCRYPTION_KEY_ROTATE,
+      ];
+
+      for (const opType of operationTypes) {
+        if (this.$store.getters['management/canList'](opType)) {
+          fetchOne[`operations_${ opType }`] = this.$store.dispatch('management/findAll', { type: opType });
+        }
+      }
+    }
+
     if ( this.value.isImported || this.value.isCustom || this.value.isHostedKubernetesProvider ) {
       fetchOne.clusterToken = this.value.getOrCreateToken();
     }
@@ -281,6 +309,7 @@ export default {
         registration: true, // in this component
         snapshots:    true, // in this component
         autoscaler:   true, // in this component
+        operations:   true, // in this component
         related:      true, // in ResourceTabs
         events:       true, // in ResourceTabs
         conditions:   true, // in ResourceTabs
@@ -402,8 +431,23 @@ export default {
 
         const templateNamePrefix = `${ pool.metadata.name }-`;
 
+        // The MachineDeployment still exists for empty pools. The
+        // infrastructureRef points to the template that matches the current
+        // config. Fallback to the prefix-match to return an arbitrary template
+        // when multiple exist
+        const machineDeployment = this.allMachineDeployments.find(
+          (d) => d.metadata.name === pool.metadata.name && d.metadata.namespace === pool.metadata.namespace
+        );
+        const activeTemplateName = machineDeployment?.spec?.template?.spec?.infrastructureRef?.name;
+
         // All of these properties are needed to ensure the pool displays correctly and that we can scale up and down
-        pool._template = this.machineTemplates.find((t) => t.metadata.name.startsWith(templateNamePrefix));
+        pool._template = this.machineTemplates.find((t) => {
+          if (activeTemplateName) {
+            return t.metadata.name === activeTemplateName;
+          }
+
+          return t.metadata.name.startsWith(templateNamePrefix);
+        });
         pool._cluster = this.value;
         pool._clusterSpec = mp;
 
@@ -451,13 +495,54 @@ export default {
     showSnapshots() {
       if (this.value.isRke1) {
         return false;
-      } else if (this.value.isRke2) {
+      } else if (this.value.isRke2 || (this.value.isImported && this.value.isDayTwoOpsEnabled)) {
         return this.$store.getters['management/canList'](SNAPSHOT) && this.extDetailTabs.snapshots;
       }
 
       return false;
     },
 
+    showOperations() {
+      return this.value.isImportedWithDayTwoOps && this.extDetailTabs.operations;
+    },
+
+    clusterOperations() {
+      if (!this.value.isImportedWithDayTwoOps) {
+        return [];
+      }
+
+      const mgmtId = this.value.mgmt?.id;
+      const operationTypes = [
+        OPERATION.ETCD_SNAPSHOT,
+        OPERATION.ETCD_SNAPSHOT_RESTORE,
+        OPERATION.ENCRYPTION_KEY_ROTATE,
+      ];
+
+      const allOps = [];
+
+      for (const opType of operationTypes) {
+        const resources = this.$store.getters['management/all'](opType) || [];
+
+        allOps.push(...resources.filter((op) => op.spec?.clusterRef?.name === mgmtId));
+      }
+
+      return allOps;
+    },
+
+    operationHeaders() {
+      return [
+        STATE,
+        NAME,
+        {
+          name:     'type',
+          labelKey: 'tableHeaders.type',
+          value:    'type',
+          sort:     'type',
+        },
+        AGE,
+      ];
+    },
+
     isRke1() {
       return this.value.isRke1;
     },
@@ -540,7 +625,10 @@ export default {
         {
           ...STATE_NORMAN, value: 'snapshotFile.status', formatterOpts: { arbitrary: true }
         },
-        NAME,
+        {
+          ...NAME,
+          formatter: 'EtcdSnapshotName',
+        },
         {
           name:      'size',
           labelKey:  'tableHeaders.size',
@@ -1124,6 +1212,20 @@ export default {
               </template>
             </SortableTable>
           </Tab>
+          <Tab
+            v-if="showOperations"
+            name="operations"
+            :label="t('cluster.tabs.operations')"
+            :weight="0"
+          >
+            <SortableTable
+              :headers="operationHeaders"
+              default-sort-by="age"
+              :table-actions="false"
+              :rows="clusterOperations"
+              :search="false"
+            />
+          </Tab>
           <AutoscalerTab
             v-if="showAutoScalerTab"
             :value="value"

package/detail/workload/index.vue

@@ -36,7 +36,8 @@ export default {
       nodes:        fetchNodesForServiceTargets({
         $store:  this.$store,
         inStore: this.$store.getters['currentStore']()
-      })
+      }),
+      summaries: this.value.fetchSummaries()
     };
 
     if (this.podSchema) {
@@ -71,7 +72,6 @@ export default {
         this.showProjectMetrics = await allDashboardsExist(this.$store, this.currentCluster.id, [this.WORKLOAD_PROJECT_METRICS_DETAIL_URL, this.WORKLOAD_PROJECT_METRICS_SUMMARY_URL], 'cluster', projectId);
       }
     }
-    this.findMatchingIngresses();
   },
 
   async unmounted() {
@@ -82,8 +82,6 @@ export default {
 
   data() {
     return {
-      allIngresses:                    [],
-      matchingIngresses:               [],
       WORKLOAD_METRICS_DETAIL_URL,
       WORKLOAD_METRICS_SUMMARY_URL,
       POD_PROJECT_METRICS_DETAIL_URL:  '',
@@ -124,6 +122,10 @@ export default {
       return this.$store.getters['cluster/schemaFor'](SERVICE);
     },
 
+    relatedServices() {
+      return this.value.relatedServices;
+    },
+
     podTemplateSpec() {
       if ( this.value.type === WORKLOAD_TYPES.CRON_JOB ) {
         return this.value.spec.jobTemplate.spec.template.spec;
@@ -208,51 +210,6 @@ export default {
     }
   },
 
-  methods: {
-    findMatchingIngresses() {
-      if (!this.ingressSchema) {
-        return [];
-      }
-
-      // Find Ingresses that forward traffic to Services
-      // that select this workload.
-      const matchingIngresses = this.allIngresses.filter((ingress) => {
-        try {
-          const rules = ingress.spec.rules;
-
-          if (!rules || !Array.isArray(rules)) return false;
-
-          for (let i = 0; i < rules.length; i++) {
-            const paths = rules[i]?.http?.paths;
-
-            if (!paths || !Array.isArray(paths)) continue;
-            // For each Ingress, check if any Services that match
-            // this workload are also target backends for the Ingress.
-            for (let j = 0; j < paths.length; j++) {
-              const pathData = paths[j];
-              const targetServiceName = pathData?.backend?.service?.name;
-
-              if (!targetServiceName) continue;
-
-              for (let k = 0; k < this.value.relatedServices.length; k++) {
-                const service = this.value.relatedServices[k];
-                const matchingServiceName = service?.metadata?.name;
-
-                if (ingress.metadata?.namespace === this.value.metadata?.namespace && matchingServiceName === targetServiceName) {
-                  return true;
-                }
-              }
-            }
-          }
-        } catch (err) {
-          return false;
-        }
-      });
-
-      this.matchingIngresses = matchingIngresses;
-    }
-  },
-
   watch: {
     async 'value.jobRelationships.length'(neu, old) {
       // If there are MORE jobs ensure we go out and fetch them (changes and removals are tracked by watches)
@@ -348,7 +305,7 @@ export default {
           {{ t('workload.detail.cannotViewServices') }}
         </p>
         <p
-          v-else-if="value.relatedServices.length === 0"
+          v-else-if="relatedServices.length === 0"
           class="caption"
         >
           {{ t('workload.detail.cannotFindServices') }}
@@ -360,8 +317,8 @@ export default {
           {{ t('workload.detail.serviceListCaption') }}
         </p>
         <ResourceTable
-          v-if="serviceSchema && value.relatedServices.length > 0"
-          :rows="value.relatedServices"
+          v-if="serviceSchema && relatedServices.length > 0"
+          :rows="relatedServices"
           :headers="serviceHeaders"
           key-field="id"
           :schema="serviceSchema"
@@ -390,7 +347,7 @@ export default {
           {{ t('workload.detail.cannotViewIngresses') }}
         </p>
         <p
-          v-else-if="matchingIngresses.length === 0"
+          v-else-if="value.matchingIngresses.length === 0"
           class="caption"
         >
           {{ t('workload.detail.cannotFindIngresses') }}
@@ -402,8 +359,8 @@ export default {
           {{ t('workload.detail.ingressListCaption') }}
         </p>
         <ResourceTable
-          v-if="ingressSchema && matchingIngresses.length > 0"
-          :rows="matchingIngresses"
+          v-if="ingressSchema && value.matchingIngresses.length > 0"
+          :rows="value.matchingIngresses"
           :headers="ingressHeaders"
           key-field="id"
           :schema="ingressSchema"

package/dialog/RotateEncryptionKeyDialog.vue

@@ -1,5 +1,5 @@
 <script>
-import { SNAPSHOT } from '@shell/config/types';
+import { SNAPSHOT, OPERATION } from '@shell/config/types';
 import AsyncButton from '@shell/components/AsyncButton';
 import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
@@ -10,7 +10,7 @@ import day from 'dayjs';
 import { escapeHtml } from '@shell/utils/string';
 import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
 import { set } from '@shell/utils/object';
-
+import { createOperationCR } from '@shell/utils/operation-cr';
 export default {
   emits: ['close'],
 
@@ -66,6 +66,10 @@ export default {
     async getEtcdBackups() {
       let etcdBackups = await this.$store.dispatch('management/findAll', { type: SNAPSHOT });
 
+      if (this.cluster.isImportedWithDayTwoOps) {
+        return etcdBackups
+          .filter((backup) => backup.metadata.namespace === this.cluster.mgmt?.id && backup.spec?.clusterName === this.cluster.mgmt?.metadata?.name );
+      }
       etcdBackups = etcdBackups.filter((backup) => backup.clusterId === this.cluster.id);
 
       return etcdBackups;
@@ -82,12 +86,32 @@ export default {
 
     async apply(buttonDone) {
       try {
-        const currentGeneration = this.cluster.spec?.rkeConfig?.rotateEncryptionKeys?.generation || 0;
-
-        // To rotate the encryption keys, increment
-        // rkeConfig.rotateEncyrptionKeys.generation in the YAML.
-        set(this.cluster, 'spec.rkeConfig.rotateEncryptionKeys.generation', currentGeneration + 1);
-        await this.cluster.save();
+        const isImportedWithDayTwoOps = this.cluster?.isImportedWithDayTwoOps || this.cluster?.mgmt?.isDayTwoOpsEnabled;
+
+        if (isImportedWithDayTwoOps) {
+          if (!isImportedWithDayTwoOps) {
+            throw new Error(this.t('promptRotateEncryptionKey.error.unableToResolveTargetCluster'));
+          }
+          // For imported clusters with day 2 ops, create an encryption key rotation operation CR
+          const namespace = this.cluster.mgmt?.id;
+          const safePrefix = this.cluster.mgmt?.id;
+          const spec = {
+            clusterRef: {
+              apiVersion: 'management.cattle.io/v3',
+              kind:       'Cluster',
+              name:       this.cluster.mgmt?.id,
+            }
+          };
+
+          createOperationCR(this.$store.dispatch, OPERATION.ENCRYPTION_KEY_ROTATE, spec, namespace, safePrefix);
+        } else {
+          const currentGeneration = this.cluster.spec?.rkeConfig?.rotateEncryptionKeys?.generation || 0;
+
+          // To rotate the encryption keys, increment
+          // rkeConfig.rotateEncyrptionKeys.generation in the YAML.
+          set(this.cluster, 'spec.rkeConfig.rotateEncryptionKeys.generation', currentGeneration + 1);
+          await this.cluster.save();
+        }
 
         this.close(buttonDone);
       } catch (err) {
@@ -128,7 +152,7 @@ export default {
           <Banner
             v-else
             color="error"
-            label-key="promptRotateEncryptionKey.error"
+            label-key="promptRotateEncryptionKey.error.noBackup"
           />
         </div>
       </div>

package/dialog/__tests__/RotateEncryptionKeyDialog.test.ts

@@ -0,0 +1,78 @@
+import { shallowMount } from '@vue/test-utils';
+import RotateEncryptionKeyDialog from '@shell/dialog/RotateEncryptionKeyDialog.vue';
+import { OPERATION } from '@shell/config/types';
+import { createOperationCR } from '@shell/utils/operation-cr';
+
+jest.mock('@shell/utils/operation-cr', () => ({ createOperationCR: jest.fn() }));
+
+describe('component: RotateEncryptionKeyDialog', () => {
+  const t = (key: string) => key;
+
+  const createWrapper = (cluster: any, dispatch = jest.fn()) => {
+    return shallowMount(RotateEncryptionKeyDialog, {
+      propsData: { cluster },
+      global:    {
+        mocks: {
+          t,
+          $store: {
+            dispatch,
+            getters: {
+              isRancher:   true,
+              'prefs/get': jest.fn((key: string) => (key.includes('date') ? 'YYYY-MM-DD' : 'HH:mm:ss')),
+            }
+          },
+        },
+        directives: { 'clean-html': true }
+      }
+    });
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should create operation CR for imported day 2 ops clusters', async() => {
+    (createOperationCR as jest.Mock).mockResolvedValue(undefined);
+
+    const cluster = {
+      isImportedWithDayTwoOps: true,
+      mgmt:                    { id: 'c-m-1' },
+      save:                    jest.fn(),
+      spec:                    { rkeConfig: {} }
+    };
+    const dispatch = jest.fn();
+    const buttonDone = jest.fn();
+    const wrapper = createWrapper(cluster, dispatch);
+
+    await wrapper.vm.apply(buttonDone);
+
+    expect(createOperationCR).toHaveBeenCalledWith(dispatch, OPERATION.ENCRYPTION_KEY_ROTATE, {
+      clusterRef: {
+        apiVersion: 'management.cattle.io/v3',
+        kind:       'Cluster',
+        name:       'c-m-1',
+      }
+    }, 'c-m-1', 'c-m-1');
+    expect(cluster.save).not.toHaveBeenCalled();
+    expect(buttonDone).toHaveBeenCalledWith(true);
+  });
+
+  it('should update generation and save for non-day-2 clusters', async() => {
+    const save = jest.fn().mockResolvedValue(undefined);
+    const cluster = {
+      isImportedWithDayTwoOps: false,
+      mgmt:                    { id: 'c-m-1' },
+      save,
+      spec:                    { rkeConfig: { rotateEncryptionKeys: { generation: 4 } } }
+    };
+    const buttonDone = jest.fn();
+    const wrapper = createWrapper(cluster);
+
+    await wrapper.vm.apply(buttonDone);
+
+    expect(createOperationCR).not.toHaveBeenCalled();
+    expect(cluster.spec.rkeConfig.rotateEncryptionKeys.generation).toBe(5);
+    expect(save).toHaveBeenCalledWith();
+    expect(buttonDone).toHaveBeenCalledWith(true);
+  });
+});