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'
           }
         ],

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/fleet/gitrepos.ts

@@ -1,5 +1,5 @@
 export const gitRepoCreateRequest = {
-  type:     'fleet.cattle.io.gitrepo',
+  // 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,7 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
       it('can create new cluster', () => {
         cy.intercept('POST', `/v1/${ type }s`).as('createRequest');
         const request = {
-          type,
+          // type,
           metadata: {
             namespace,
             name: rke2CustomName
@@ -270,7 +270,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

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;
+  }
 }

shell/models/secret.js

@@ -6,6 +6,7 @@ import { SERVICE_ACCOUNT } from '@shell/config/types';
 import { set } from '@shell/utils/object';
 import { NAME as MANAGER } from '@shell/config/product/manager';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { NEVER_ADD } from '@shell/utils/create-yaml';
 import { colorForState, stateDisplay, STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 import { diffFrom } from '@shell/utils/time';
 import day from 'dayjs';
@@ -49,7 +50,7 @@ export default class Secret extends SteveModel {
   }
 
   get issuer() {
-    const { metadata:{ annotations = {} } } = this;
+    const { metadata: { annotations = {} } } = this;
 
     if (annotations[CERTMANAGER.ISSUER]) {
       return annotations[CERTMANAGER.ISSUER];
@@ -109,10 +110,10 @@ export default class Secret extends SteveModel {
       }
     ];
 
-    if ( this._type === TYPES.SERVICE_ACCT ) {
+    if (this._type === TYPES.SERVICE_ACCT) {
       const name = this.metadata?.annotations?.[KUBERNETES.SERVICE_ACCOUNT_NAME];
 
-      if ( name ) {
+      if (name) {
         out.push({
           label:         'Service Account',
           formatter:     'LinkName',
@@ -153,11 +154,11 @@ export default class Secret extends SteveModel {
   }
 
   get canUpdate() {
-    if ( !this.hasLink('update') ) {
+    if (!this.hasLink('update')) {
       return false;
     }
 
-    if ( this._type === TYPES.SERVICE_ACCT ) {
+    if (this._type === TYPES.SERVICE_ACCT) {
       return false;
     }
 
@@ -170,7 +171,7 @@ export default class Secret extends SteveModel {
       ...Object.keys(this.binaryData || [])
     ];
 
-    if ( !keys.length ) {
+    if (!keys.length) {
       return '(none)';
     }
 
@@ -204,40 +205,40 @@ export default class Secret extends SteveModel {
       }
     } else if (this._type === TYPES.TLS) {
       return this.certInfo || this.keysDisplay;
-    } else if ( this._type === TYPES.BASIC ) {
+    } else if (this._type === TYPES.BASIC) {
       return base64Decode(this.data.username);
-    } else if ( this._type === TYPES.SSH ) {
+    } else if (this._type === TYPES.SSH) {
       return this.sshUser;
-    } else if ( this._type === TYPES.SERVICE_ACCT ) {
+    } else if (this._type === TYPES.SERVICE_ACCT) {
       return this.metadata?.annotations?.['kubernetes.io/service-account.name'];
     }
 
     return this.keysDisplay;
   }
 
   get sshUser() {
-    if ( this._type !== TYPES.SSH ) {
+    if (this._type !== TYPES.SSH) {
       return null;
     }
 
     const pub = base64Decode(this.data['ssh-publickey']);
 
-    if ( !pub ) {
+    if (!pub) {
       return null;
     }
 
-    if ( pub.startsWith('----') ) {
+    if (pub.startsWith('----')) {
       // PEM format
       const match = pub.match(/from OpenSSH by ([^"]+)"/);
 
-      if ( match ) {
+      if (match) {
         return match[1];
       }
-    } else if ( pub.startsWith('ssh-') ) {
+    } else if (pub.startsWith('ssh-')) {
       // OpenSSH format
       const parts = pub.replace(/\n/g, '').split(/\s+/);
 
-      if ( parts && parts.length === 3 ) {
+      if (parts && parts.length === 3) {
         return parts[2];
       }
     }
@@ -354,7 +355,7 @@ export default class Secret extends SteveModel {
   get decodedData() {
     const out = {};
 
-    for ( const k in this.data || {} ) {
+    for (const k in this.data || {}) {
       out[k] = base64Decode(this.data[k]);
     }
 
@@ -365,33 +366,49 @@ export default class Secret extends SteveModel {
     return (key, value) => { // or (mapOfNewData)
       const isMap = key && typeof key === 'object';
 
-      if ( !this.data || isMap ) {
+      if (!this.data || isMap) {
         set(this, 'data', {});
       }
 
       let neu;
 
-      if ( isMap ) {
+      if (isMap) {
         neu = key;
       } else {
         neu = { [key]: value };
       }
 
-      for ( const k in neu ) {
+      for (const k in neu) {
         // The key is quoted so that keys like '.dockerconfigjson' that contain dot don't get parsed into an object path
         set(this.data, `"${ k }"`, base64Encode(neu[k]));
       }
     };
   }
 
   get doneRoute() {
-    if ( this.$rootGetters['currentProduct'].name === MANAGER ) {
+    if (this.$rootGetters['currentProduct'].name === MANAGER) {
       return 'c-cluster-manager-secret';
     } else {
       return 'c-cluster-product-resource';
     }
   }
 
+  cleanForSave(data) {
+    // There are some properties in ACTIVELY_REMOVE
+    // that should be removed from the data
+    const val = super._cleanForSave(data);
+
+    const fieldsToRemove = [...NEVER_ADD];
+
+    for (const field of fieldsToRemove) {
+      if (val[field] !== undefined) {
+        delete val[field];
+      }
+    }
+
+    return val;
+  }
+
   get certLifetime() {
     if (this._type === TYPES.TLS) {
       const certInfo = this.cachedCertInfo;