@rancher/shell 3.0.8 → 3.0.9-rc.2

package/edit/workload/mixins/workload.js

@@ -204,6 +204,12 @@ export default {
     const spec = this.value.spec;
     let podTemplateSpec = type === WORKLOAD_TYPES.CRON_JOB ? spec.jobTemplate.spec.template.spec : spec?.template?.spec;
 
+    // Area to add default value to securityContext on POD CREATE
+    // Check if the securityContext has been setup, for None should be {} when cloning, for new should be empty.
+    if (this.mode === _CREATE && !podTemplateSpec.securityContext) {
+      podTemplateSpec.securityContext = { seccompProfile: { type: 'RuntimeDefault' } };
+    }
+
     let containers = podTemplateSpec.containers || [];
     let container;
 
@@ -258,6 +264,7 @@ export default {
       secondaryResourceData:      this.secondaryResourceDataConfig(),
       namespacedConfigMaps:       [],
       allNodes:                   null,
+      workerNodes:                null,
       allNodeObjects:             [],
       namespacedSecrets:          [],
       imagePullNamespacedSecrets: [],
@@ -276,20 +283,46 @@ export default {
       container,
       containerChange:            0,
       tabChange:                  0,
-      podFsGroup:                 podTemplateSpec.securityContext?.fsGroup,
       savePvcHookName:            'savePvcHook',
       tabWeightMap:               TAB_WEIGHT_MAP,
-      fvFormRuleSets:             [],
-      fvReportedValidationPaths:  ['spec'],
-      isNamespaceNew:             false,
-      idKey:                      ID_KEY
+      // [fvFormRulesets][localhostProfile] added as default not required, needs to be on the INDEX 0
+      fvFormRuleSets:             [{
+        path:           'podTemplateSpec.securityContext.seccompProfile.localhostProfile',
+        rules:          [''],
+        rootObject:     this,
+        translationKey: 'workload.container.security.localhostProfile.label'
+      }],
+      fvReportedValidationPaths: ['spec'],
+      isNamespaceNew:            false,
+      idKey:                     ID_KEY
     };
   },
 
   computed: {
     ...mapGetters(['currentCluster']),
+    seccompProfileTypes() {
+      return [
+        {
+          value: 'None',
+          label: this.t('workload.container.security.seccompProfile.types.none.label')
+        },
+        {
+          value: 'RuntimeDefault',
+          label: this.t('workload.container.security.seccompProfile.types.runtimeDefault.label')
+        },
+        {
+          value: 'Localhost',
+          label: this.t('workload.container.security.seccompProfile.types.localhost.label')
+        }, {
+          value: 'Unconfined',
+          label: this.t('workload.container.security.seccompProfile.types.unconfined.label')
+        }];
+    },
+
     tabErrors() {
-      return { general: this.fvGetPathErrors(['image'])?.length > 0 };
+      const tabErrors = { podSecurityContext: this.fvGetPathErrors(['podTemplateSpec.securityContext.seccompProfile.localhostProfile'])?.length > 0 };
+
+      return tabErrors;
     },
 
     defaultWorkloadTab() {
@@ -422,8 +455,15 @@ export default {
         }),
       ].map((container) => {
         const containerImageRule = formRulesGenerator(this.$store.getters['i18n/t'], { name: container.name }).containerImage;
+        const localhostProfileRule = formRulesGenerator(this.$store.getters['i18n/t'], { name: container.name }).localhostProfile;
 
-        container.error = containerImageRule(container);
+        const imageError = containerImageRule(container);
+        const localhostProfileError = localhostProfileRule(container);
+
+        container.error = {
+          general:          imageError,
+          localhostProfile: localhostProfileError
+        };
 
         return container;
       });
@@ -560,6 +600,26 @@ export default {
       this.servicesOwned = await this.value.getServicesOwned();
     },
 
+    'podTemplateSpec.securityContext.seccompProfile.type'(neu) {
+      if (neu === 'Localhost') {
+        // [fvFormRulesets][localhostProfile] added here, should be required if Localhost selected
+        this.fvFormRuleSets[0] = {
+          path:           'podTemplateSpec.securityContext.seccompProfile.localhostProfile',
+          rules:          ['required'],
+          rootObject:     this,
+          translationKey: 'workload.container.security.localhostProfile.label'
+        };
+      } else {
+        // [fvFormRulesets][localhostProfile] added here, should not be required if Localhost selected
+        this.fvFormRuleSets[0] = {
+          path:           'podTemplateSpec.securityContext.seccompProfile.localhostProfile',
+          rules:          [''],
+          rootObject:     this,
+          translationKey: 'workload.container.security.localhostProfile.label'
+        };
+      }
+    },
+
     isNamespaceNew(neu, old) {
       if (!old && neu) {
         // As the namespace is new any resource that's been fetched with a namespace is now invalid
@@ -602,15 +662,6 @@ export default {
       this.value['type'] = neu;
       delete this.value.apiVersion;
     },
-
-    container: {
-      handler(c) {
-        this.fvFormRuleSets = [{
-          path: 'image', rootObject: c, rules: ['required'], translationKey: 'workload.container.image'
-        }];
-      },
-      immediate: true
-    }
   },
 
   created() {
@@ -647,7 +698,24 @@ export default {
                 parsingFunc: (data) => {
                   return data.map((node) => node.id);
                 }
-              }
+              },
+              {
+                var:         'workerNodes',
+                parsingFunc: (data) => {
+                  const keys = [
+                    `node-role.kubernetes.io/control-plane`,
+                    `node-role.kubernetes.io/etcd`
+                  ];
+
+                  return data
+                    .filter((node) => {
+                      const taints = node?.spec?.taints || [];
+
+                      return taints.every((taint) => !keys.includes(taint.key));
+                    })
+                    .map((node) => node.id);
+                }
+              },
             ]
           },
           [SERVICE]: {
@@ -806,7 +874,6 @@ export default {
       }
 
       this.fixPodAffinity(podAntiAffinity);
-      this.fixPodSecurityContext(this.podTemplateSpec);
 
       template.metadata.namespace = this.value.metadata.namespace;
 
@@ -903,20 +970,6 @@ export default {
       return podAffinity;
     },
 
-    fixPodSecurityContext(podTempSpec) {
-      if (this.podFsGroup) {
-        podTempSpec.securityContext = podTempSpec.securityContext || {};
-        podTempSpec.securityContext.fsGroup = this.podFsGroup;
-      } else {
-        if (podTempSpec.securityContext?.fsGroup) {
-          delete podTempSpec.securityContext.fsGroup;
-        }
-        if (Object.keys(podTempSpec.securityContext || {}).length === 0) {
-          delete podTempSpec.securityContext;
-        }
-      }
-    },
-
     selectType(type) {
       if (!this.type && type) {
         this.$router.replace({ params: { resource: type } });

package/list/catalog.cattle.io.clusterrepo.vue

@@ -1,7 +1,7 @@
 <script lang="ts">
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
-import { RancherKubeMetadata } from '@shell/types/kube/kube-api';
+import { RancherKubeMetadata } from '@shell/types/rancher/steve.api';
 import { PaginationArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
 import { defineComponent } from 'vue';
 

package/list/projectsecret.vue

@@ -10,7 +10,7 @@ import { TableColumn } from '@shell/types/store/type-map';
 import { mapGetters } from 'vuex';
 import { GROUP_RESOURCES, mapPref } from '@shell/store/prefs';
 import { DEFAULT_PROJECT, SYSTEM_PROJECT, UI_PROJECT_SECRET, UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
-import { RancherKubeMetadata } from '@shell/types/kube/kube-api';
+import { RancherKubeMetadata } from '@shell/types/rancher/steve.api';
 import {
   AGE, SECRET_DATA, STATE, SUB_TYPE, NAME as NAME_COL,
 } from '@shell/config/table-headers';
@@ -170,7 +170,7 @@ export default {
     createLocation() {
       return {
         name:   'c-cluster-product-resource-create',
-        params: { resource: SECRET },
+        params: { resource: VIRTUAL_TYPES.PROJECT_SECRETS },
         query:  { [SECRET_SCOPE]: SECRET_QUERY_PARAMS.PROJECT_SCOPED }
       };
     },

package/machine-config/__tests__/vmwarevsphere.test.ts

@@ -57,6 +57,7 @@ describe('component: vmwarevsphere', () => {
 
       const dataCenterElement = wrapper.find(`[data-testid="datacenter"]`).element;
       const resourcePoolElement = wrapper.find(`[data-testid="resourcePool"]`).element;
+      const storageTypeElement = wrapper.find(`[data-testid="storageType"]`).element;
       const dataStoreElement = wrapper.find(`[data-testid="dataStore"]`).element;
       const folderElement = wrapper.find(`[data-testid="folder"]`).element;
       const hostElement = wrapper.find(`[data-testid="host"]`).element;
@@ -64,6 +65,7 @@ describe('component: vmwarevsphere', () => {
 
       expect(dataCenterElement).toBeDefined();
       expect(resourcePoolElement).toBeDefined();
+      expect(storageTypeElement).toBeDefined();
       expect(dataStoreElement).toBeDefined();
       expect(folderElement).toBeDefined();
       expect(hostElement).toBeDefined();
@@ -297,4 +299,66 @@ describe('component: vmwarevsphere', () => {
       expect(wrapper.vm.value.network).toStrictEqual([legacyName]);
     });
   });
+
+  describe('storage type toggling', () => {
+    it('should toggle storage type to datastore-cluster and clear datastore value', async() => {
+      const wrapper = mount(vmwarevsphere, defaultCreateSetup);
+
+      wrapper.vm.value.datastore = 'some-datastore';
+      await wrapper.setData({ storageType: 'datastore-cluster' });
+
+      expect(wrapper.vm.storageType).toBe('datastore-cluster');
+      expect(wrapper.vm.value.datastore).toBe('');
+    });
+
+    it('should toggle storage type to datastore and clear datastoreCluster value', async() => {
+      const wrapper = mount(vmwarevsphere, defaultCreateSetup);
+
+      // Initialize with datastore-cluster selected
+      await wrapper.setData({ storageType: 'datastore-cluster' });
+      wrapper.vm.value.datastoreCluster = 'some-cluster';
+
+      // Switch back to datastore
+      await wrapper.setData({ storageType: 'datastore' });
+
+      expect(wrapper.vm.storageType).toBe('datastore');
+      expect(wrapper.vm.value.datastoreCluster).toBe('');
+    });
+
+    it('should initialize storage type to datastore-cluster if value has datastoreCluster set', () => {
+      const setup = {
+        ...defaultEditSetup,
+        propsData: {
+          ...defaultEditSetup.propsData,
+          value: {
+            ...defaultEditSetup.propsData.value,
+            datastoreCluster: 'existing-cluster',
+            datastore:        ''
+          }
+        }
+      };
+      const wrapper = mount(vmwarevsphere, setup);
+
+      expect(wrapper.vm.storageType).toBe('datastore-cluster');
+    });
+
+    it('should correctly toggle the visibility of datastore and datastore cluster selects', async() => {
+      const wrapper = mount(vmwarevsphere, defaultCreateSetup);
+      const dataStoreContainer = wrapper.find('[data-testid="dataStore"]');
+
+      // Default state: datastore
+      let select = dataStoreContainer.findComponent({ name: 'LabeledSelect' });
+
+      expect(select.exists()).toBe(true);
+      expect(select.props('label')).toBe('%cluster.machineConfig.vsphere.scheduling.dataStore%');
+
+      // Toggle to datastore-cluster
+      await wrapper.setData({ storageType: 'datastore-cluster' });
+
+      select = dataStoreContainer.findComponent({ name: 'LabeledSelect' });
+
+      expect(select.exists()).toBe(true);
+      expect(select.props('label')).toBe('%cluster.machineConfig.vsphere.scheduling.dataStoreCluster%');
+    });
+  });
 });

package/machine-config/amazonec2.vue

@@ -12,7 +12,7 @@ import { NORMAN } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 import { convertStringToKV, convertKVToString } from '@shell/utils/object';
 import { sortBy } from '@shell/utils/sort';
-import { stringify, exceptionToErrorsArray } from '@shell/utils/error';
+import { stringify, exceptionToErrorsArray, formatAWSError } from '@shell/utils/error';
 import EC2Networking from './components/EC2Networking.vue';
 
 const DEFAULT_GROUP = 'rancher-nodes';
@@ -139,7 +139,7 @@ export default {
 
       this.loadedRegionalFor = region;
     } catch (e) {
-      this.errors = exceptionToErrorsArray(e);
+      this.errors = exceptionToErrorsArray(formatAWSError(e));
     }
   },
 

package/machine-config/vmwarevsphere.vue

@@ -244,7 +244,17 @@ export default {
       haveTemplates:            null,
       vAppOptions,
       vappMode:                 VAPP_MODE.DISABLED,
-
+      storageType:              this.value.datastoreCluster ? 'datastore-cluster' : 'datastore',
+      storageOptions:           [
+        {
+          label: this.t('cluster.machineConfig.vsphere.scheduling.dataStore'),
+          value: 'datastore'
+        },
+        {
+          label: this.t('cluster.machineConfig.vsphere.scheduling.dataStoreCluster'),
+          value: 'datastore-cluster'
+        }
+      ],
       osOptions:        OS_OPTIONS,
       validationErrors: {},
     };
@@ -381,6 +391,19 @@ export default {
     'value.contentLibrary'() {
       this.loadLibraryTemplates();
     },
+    storageType(val) {
+      if (val === 'datastore-cluster') {
+        set(this.value, 'datastore', '');
+        if (!this.dataStoreClustersResults) {
+          this.loadDataStoreClusters();
+        }
+      } else {
+        set(this.value, 'datastoreCluster', '');
+        if (!this.dataStoresResults) {
+          this.loadDataStores();
+        }
+      }
+    },
     'value.creationType'(value) {
       set(this.value, 'cloneFrom', '');
       const boot2dockerUrl = value === CREATION_METHOD.LEGACY ? BOOT_2_DOCKER_URL : '';
@@ -447,7 +470,7 @@ export default {
         if (this.mode === _CREATE || this.poolCreateMode) {
           set(this.value, 'datacenter', options[0]);
           set(this.value, 'cloneFrom', undefined);
-          set(this.value, 'useDataStoreCluster', false);
+          this.storageType = 'datastore';
         }
 
         if ([_EDIT, _VIEW].includes(this.mode) && !this.poolCreateMode) {
@@ -530,7 +553,7 @@ export default {
     },
 
     async loadDataStoreClusters() {
-      set(this, 'dataStoreResults', null);
+      set(this, 'dataStoreClustersResults', null);
 
       const options = await this.requestOptions('data-store-clusters', this.value.datacenter);
       const content = this.mapPathOptionsToContent(options);
@@ -633,7 +656,13 @@ export default {
 
     loadAllDatacenterResources() {
       this.loadResourcePools();
-      this.loadDataStores();
+      if (this.storageType === 'datastore') {
+        this.loadDataStores();
+        this.dataStoreClustersResults = null;
+      } else {
+        this.loadDataStoreClusters();
+        this.dataStoresResults = null;
+      }
       this.loadFolders();
       this.loadHosts();
       this.loadTemplates();
@@ -831,12 +860,27 @@ export default {
               />
             </div>
           </div>
+          <div class="row mt-10">
+            <div
+              class="col span-12"
+              data-testid="storageType"
+            >
+              <RadioGroup
+                v-model:value="storageType"
+                name="storageType"
+                :options="storageOptions"
+                :disabled="isDisabled"
+                :row="true"
+              />
+            </div>
+          </div>
           <div class="row mt-10">
             <div
               class="col span-6"
               data-testid="dataStore"
             >
               <LabeledSelect
+                v-if="storageType === 'datastore'"
                 v-model:value="value.datastore"
                 :loading="dataStoresLoading"
                 :mode="mode"
@@ -845,6 +889,16 @@ export default {
                 :disabled="isDisabled"
                 :tooltip="value.datastore"
               />
+              <LabeledSelect
+                v-else
+                v-model:value="value.datastoreCluster"
+                :loading="dataStoreClustersLoading"
+                :mode="mode"
+                :options="dataStoreClusters"
+                :label="t('cluster.machineConfig.vsphere.scheduling.dataStoreCluster')"
+                :disabled="isDisabled"
+                :tooltip="value.datastoreCluster"
+              />
             </div>
             <div
               class="col span-6"

package/mixins/__tests__/brand.spec.ts

@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils';
 import { CATALOG, MANAGEMENT } from '@shell/config/types';
 import Brand from '@shell/mixins/brand';
+import CspAdapterUtils from '@shell/utils/cspAdaptor';
 
 describe('brandMixin', () => {
   const createWrapper = (vaiOn = false) => {
@@ -54,45 +55,47 @@ describe('brandMixin', () => {
         data:   () => data,
         global: { mocks: { $store: store } }
       });
-    const spyManagementFindAll = jest.spyOn(store, 'dispatch');
+    const spyManagementDispatch = jest.spyOn(store, 'dispatch');
+
+    CspAdapterUtils.resetState();
 
     return {
       wrapper,
       store,
-      spyManagementFindAll,
+      spyManagementDispatch,
     };
   };
 
   describe('should make correct requests', () => {
     it('vai off', async() => {
-      const { wrapper, spyManagementFindAll } = createWrapper(false);
+      const { wrapper, spyManagementDispatch } = createWrapper(false);
 
       // NOTE - wrapper.vm.$options.fetch() doesn't work
       await wrapper.vm.$options.fetch.apply(wrapper.vm);
 
       // wrapper.vm.$nextTick();
-      expect(spyManagementFindAll).toHaveBeenNthCalledWith(1, 'management/findAll', {
+      expect(spyManagementDispatch).toHaveBeenNthCalledWith(1, 'management/findAll', {
         type: MANAGEMENT.SETTING,
         opt:  {
           load: 'multi', redirectUnauthorized: false, url: `/v1/${ MANAGEMENT.SETTING }s`
         }
       });
-      expect(spyManagementFindAll).toHaveBeenNthCalledWith(2, 'management/findAll', { type: CATALOG.APP });
+      expect(spyManagementDispatch).toHaveBeenNthCalledWith(2, 'management/findAll', { type: CATALOG.APP });
     });
 
     it('vai on', async() => {
-      const { wrapper, spyManagementFindAll } = createWrapper(true);
+      const { wrapper, spyManagementDispatch } = createWrapper(true);
 
       // NOTE - wrapper.vm.$options.fetch() doesn't work
       await wrapper.vm.$options.fetch.apply(wrapper.vm);
 
-      expect(spyManagementFindAll).toHaveBeenNthCalledWith(1, 'management/findAll', {
+      expect(spyManagementDispatch).toHaveBeenNthCalledWith(1, 'management/findAll', {
         type: MANAGEMENT.SETTING,
         opt:  {
           load: 'multi', url: `/v1/${ MANAGEMENT.SETTING }s`, redirectUnauthorized: false
         }
       });
-      expect(spyManagementFindAll).toHaveBeenNthCalledWith(2, 'management/findPage', {
+      expect(spyManagementDispatch).toHaveBeenNthCalledWith(2, 'management/findPage', {
         type: CATALOG.APP,
         opt:  {
           pagination: {
@@ -110,7 +113,9 @@ describe('brandMixin', () => {
             pageSize:             null,
             projectsOrNamespaces: [],
             sort:                 []
-          }
+          },
+          transient: true,
+          watch:     false
         }
       });
     });
@@ -120,7 +125,7 @@ describe('brandMixin', () => {
     it('should have correct csp values (off)', async() => {
       const { wrapper, store } = createWrapper();
 
-      const spyManagementFindAll = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
+      const spyManagementDispatch = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
         const { type } = options as any;
 
         if (type === MANAGEMENT.SETTING) {
@@ -136,7 +141,7 @@ describe('brandMixin', () => {
       // NOTE - wrapper.vm.$options.fetch() doesn't work
       await wrapper.vm.$options.fetch.apply(wrapper.vm, []);
 
-      expect(spyManagementFindAll).toHaveBeenCalledTimes(2);
+      expect(spyManagementDispatch).toHaveBeenCalledTimes(2);
 
       expect(wrapper.vm.canCalcCspAdapter).toBeTruthy();
       expect(wrapper.vm.cspAdapter).toBeFalsy();
@@ -145,7 +150,7 @@ describe('brandMixin', () => {
     it.each(['rancher-csp-adapter', 'rancher-csp-billing-adapter'])('should have correct csp values (on - %p )', async(chartName) => {
       const { wrapper, store } = createWrapper();
 
-      const spyManagementFindAll = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
+      const spyManagementDispatch = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
         const { type } = options as any;
 
         if (type === MANAGEMENT.SETTING) {
@@ -161,7 +166,7 @@ describe('brandMixin', () => {
       // NOTE - wrapper.vm.$options.fetch() doesn't work
       await wrapper.vm.$options.fetch.apply(wrapper.vm, []);
 
-      expect(spyManagementFindAll).toHaveBeenCalledTimes(2);
+      expect(spyManagementDispatch).toHaveBeenCalledTimes(2);
 
       expect(wrapper.vm.canCalcCspAdapter).toBeTruthy();
       expect(wrapper.vm.cspAdapter).toBeTruthy();

package/mixins/__tests__/chart.test.ts

@@ -2,6 +2,8 @@ import ChartMixin from '@shell/mixins/chart';
 import { OPA_GATE_KEEPER_ID } from '@shell/pages/c/_cluster/gatekeeper/index.vue';
 import { mount } from '@vue/test-utils';
 import { APP_UPGRADE_STATUS } from '@shell/store/catalog';
+import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
+import { CATALOG } from '@shell/config/types';
 
 describe('chartMixin', () => {
   const testCases = {
@@ -151,6 +153,67 @@ describe('chartMixin', () => {
 
       expect(mockStore.getters['catalog/version']).toHaveBeenCalledWith(expect.objectContaining({ showDeprecated: true }));
     });
+
+    it('should find existing app using version annotations', async() => {
+      const mockStore = {
+        dispatch: jest.fn((action, payload) => {
+          if (action === 'cluster/find') {
+            return Promise.resolve({ id: payload.id, fetchValues: jest.fn() });
+          }
+
+          return Promise.resolve();
+        }),
+        getters: {
+          currentCluster: () => {},
+          isRancher:      () => true,
+          'catalog/repo': () => {
+            return () => 'repo';
+          },
+          'catalog/chart': () => {
+            return {
+              id: 'chart-id', versions: [{ version: '1.0.0' }], matchingInstalledApps: []
+            };
+          },
+          'catalog/version': () => ({
+            version:     '1.0.0',
+            annotations: {
+              [CATALOG_ANNOTATIONS.NAMESPACE]:    'custom-ns',
+              [CATALOG_ANNOTATIONS.RELEASE_NAME]: 'custom-name',
+            }
+          }),
+          'prefs/get': () => {},
+          'i18n/t':    () => jest.fn()
+        }
+      };
+
+      const DummyComponent = {
+        mixins:   [ChartMixin],
+        template: '<div></div>',
+      };
+
+      const wrapper = mount(
+        DummyComponent,
+        {
+          global: {
+            mocks: {
+              $store: mockStore,
+              $route: {
+                query: {
+                  chart:       'chart_name',
+                  versionName: '1.0.0'
+                }
+              }
+            }
+          }
+        });
+
+      await wrapper.vm.fetchChart();
+
+      expect(mockStore.dispatch).toHaveBeenCalledWith('cluster/find', {
+        type: CATALOG.APP,
+        id:   'custom-ns/custom-name'
+      });
+    });
   });
 
   describe('action', () => {