Removed unwanted properties from steve resources

.vscode/settings.json

@@ -11,7 +11,7 @@
   "eslint.packageManager": "yarn",
   "eslint.validate": ["vue","html","javascript","typescript"],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "eslint.workingDirectories": ["./", "./pkg/rancher-components/"],
   "javascript.preferences.importModuleSpecifier": "non-relative",

cypress/e2e/blueprints/explorer/workloads/deployments/deployment-create.ts

@@ -37,7 +37,6 @@ export const createDeploymentBlueprint = {
 };
 
 export const deploymentCreateRequest = {
-  type:     'apps.deployment',
   metadata: {
     namespace: 'default',
     labels:    { 'workload.user.cattle.io/workloadselector': 'apps.deployment-default-test-deployment' },
@@ -58,9 +57,7 @@ export const deploymentCreateRequest = {
               privileged:               false,
               allowPrivilegeEscalation: false
             },
-            _init:        false,
             volumeMounts: [],
-            __active:     true,
             image:        'nginx'
           }
         ],
@@ -80,7 +77,6 @@ export const deploymentCreateRequest = {
 
 export const deploymentCreateResponse = {
   id:    'default/test-deployment',
-  type:  'apps.deployment',
   links: {
     remove: 'https://localhost:8005/v1/apps.deployments/default/test-deployment',
     self:   'https://localhost:8005/v1/apps.deployments/default/test-deployment',

cypress/e2e/blueprints/explorer/workloads/deployments/deployment-get.ts

@@ -1,6 +1,5 @@
 export const deploymentGetResponse = {
   id:    'default/test-deployment',
-  type:  'apps.deployment',
   links: {
     remove: 'https://localhost:8005/v1/apps.deployments/default/test-deployment',
     self:   'https://localhost:8005/v1/apps.deployments/default/test-deployment',

cypress/e2e/blueprints/explorer/workloads/deployments/deplyment-list.ts

@@ -10,7 +10,6 @@ export const deploymentCollection = {
 
     {
       id:    'default/test-deployment',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/default/test-deployment',
         self:   'https://localhost:8005/v1/apps.deployments/default/test-deployment',
@@ -261,7 +260,6 @@ export const deploymentCollectionResponseFull = {
   data:         [
     {
       id:    'cattle-fleet-local-system/fleet-agent',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-fleet-local-system/fleet-agent',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-fleet-local-system/fleet-agent',
@@ -597,7 +595,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'cattle-fleet-system/fleet-controller',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-fleet-system/fleet-controller',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-fleet-system/fleet-controller',
@@ -941,7 +938,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'cattle-fleet-system/gitjob',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-fleet-system/gitjob',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-fleet-system/gitjob',
@@ -1219,7 +1215,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'cattle-monitoring-system/pushprox-k3s-server-proxy',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/pushprox-k3s-server-proxy',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/pushprox-k3s-server-proxy',
@@ -1502,7 +1497,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'cattle-monitoring-system/rancher-monitoring-grafana',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/rancher-monitoring-grafana',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/rancher-monitoring-grafana',
@@ -2486,7 +2480,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'cattle-monitoring-system/rancher-monitoring-kube-state-metrics',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/rancher-monitoring-kube-state-metrics',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/rancher-monitoring-kube-state-metrics',
@@ -2852,7 +2845,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'cattle-monitoring-system/rancher-monitoring-operator',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/rancher-monitoring-operator',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/rancher-monitoring-operator',
@@ -3251,7 +3243,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'cattle-monitoring-system/rancher-monitoring-prometheus-adapter',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/rancher-monitoring-prometheus-adapter',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-monitoring-system/rancher-monitoring-prometheus-adapter',
@@ -3704,7 +3695,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'cattle-system/rancher-webhook',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-system/rancher-webhook',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-system/rancher-webhook',
@@ -4117,7 +4107,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'cattle-ui-plugin-system/ui-plugin-operator',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/cattle-ui-plugin-system/ui-plugin-operator',
         self:   'https://localhost:8005/v1/apps.deployments/cattle-ui-plugin-system/ui-plugin-operator',
@@ -4417,7 +4406,6 @@ export const deploymentCollectionResponseFull = {
 
     {
       id:    'default/test-deployment',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/default/test-deployment',
         self:   'https://localhost:8005/v1/apps.deployments/default/test-deployment',
@@ -4656,7 +4644,6 @@ export const deploymentCollectionResponseFull = {
     },
     {
       id:    'kube-system/coredns',
-      type:  'apps.deployment',
       links: {
         remove: 'https://localhost:8005/v1/apps.deployments/kube-system/coredns',
         self:   'https://localhost:8005/v1/apps.deployments/kube-system/coredns',

cypress/e2e/blueprints/fleet/gitrepos.ts

@@ -1,5 +1,4 @@
 export const gitRepoCreateRequest = {
-  type:     'fleet.cattle.io.gitrepo',
   metadata: {
     namespace: 'fleet-default',
     name:      'fleet-e2e-test-gitrepo'

cypress/e2e/tests/pages/manager/cluster-manager.spec.ts

@@ -45,7 +45,6 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
       it('can create new cluster', () => {
         cy.intercept('POST', `/v1/${ type }s`).as('createRequest');
         const request = {
-          type,
           metadata: {
             namespace,
             name: rke2CustomName
@@ -270,7 +269,6 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
 
         cy.wait('@importRequest').then((intercept) => {
           expect(intercept.request.body).to.deep.equal({
-            type,
             metadata: {
               namespace,
               name: importGenericName

cypress/support/commands/rancher-api-commands.ts

@@ -246,7 +246,6 @@ Cypress.Commands.add('createNamespace', (nsName, projId) => {
       Accept:       'application/json'
     },
     body: {
-      type:     'namespace',
       metadata: {
         annotations: {
           'field.cattle.io/containerDefaultResourceLimit': '{}',

shell/models/__tests__/workload.test.ts

@@ -0,0 +1,60 @@
+import Workload from '@shell/models/workload.js';
+
+describe('class: Workload', () => {
+  describe('given custom workload keys', () => {
+    const customContainer = {
+      __clone:  'whatever',
+      __active: 'whatever',
+      __init:   'whatever',
+      _init:    'whatever',
+      error:    'whatever',
+    };
+    const customWorkload = {
+      __rehydrate: 'whatever',
+      __clone:     'whatever',
+      spec:        {
+        template: {
+          spec: {
+            containers:     [customContainer],
+            initContainers: [customContainer],
+          }
+        }
+      }
+    };
+
+    it('should keep internal keys', () => {
+      const workload = new Workload(customWorkload, {
+        getters:     { schemaFor: () => ({ linkFor: jest.fn() }) },
+        dispatch:    jest.fn(),
+        rootGetters: { 'i18n/t': jest.fn() },
+      });
+
+      expect({ ...workload }).toStrictEqual(customWorkload);
+    });
+
+    describe('method: save', () => {
+    /**
+     * DISCLAIMER ***************************************************************************************
+     * Logs are prevented to avoid polluting the test output.
+     ****************************************************************************************************
+    */
+      // eslint-disable-next-line jest/no-hooks
+      beforeEach(() => {
+        jest.spyOn(console, 'warn').mockImplementation(() => { });
+      });
+
+      it('should remove all the internal keys', async() => {
+        const workload = new Workload(customWorkload, {
+          getters:     { schemaFor: () => ({ linkFor: jest.fn() }) },
+          dispatch:    jest.fn(),
+          rootGetters: { 'i18n/t': jest.fn() },
+        });
+        const expectation = { spec: { template: { spec: { containers: [{}], initContainers: [{}] } } } };
+
+        await workload.save();
+
+        expect({ ...workload }).toStrictEqual(expectation);
+      });
+    });
+  });
+});

shell/models/pod.js

@@ -3,6 +3,8 @@ import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/reso
 import { NODE, WORKLOAD_TYPES } from '@shell/config/types';
 import { escapeHtml, shortenedImage } from '@shell/utils/string';
 import WorkloadService from '@shell/models/workload.service';
+import { NEVER_ADD_CONTAINER_FIELDS } from '@shell/utils/create-yaml';
+import { unset } from 'lodash';
 
 export const WORKLOAD_PRIORITY = {
   [WORKLOAD_TYPES.DEPLOYMENT]:             1,
@@ -256,4 +258,32 @@ export default class Pod extends WorkloadService {
       return Promise.reject(e);
     });
   }
+
+  removeContainerField(container) {
+    for (const field of NEVER_ADD_CONTAINER_FIELDS) {
+      unset(container, field);
+    }
+
+    return container;
+  }
+
+  cleanForSave(data) {
+    const val = super.cleanForSave(data);
+
+    // remove fields from array of spec.template.spec.containers
+    if (val.spec?.containers) {
+      val.spec.containers.forEach((container) => {
+        this.removeContainerField(container);
+      });
+    }
+
+    // remove fields from initContainers
+    if (val.spec?.initContainers) {
+      val.spec.initContainers.forEach((container) => {
+        this.removeContainerField(container);
+      });
+    }
+
+    return val;
+  }
 }