Merge pull request #20 from platformercloud/hotfix/remove-unnecessary…

…-properties-from-yaml

remove properties from yaml

src/modules/gitops/manifest-file.ts

@@ -1,6 +1,6 @@
 import { FileInfo } from './fs';
 import { KindPriorityMap } from './manifest-import-types';
-import { ManifestFileObject, modifyTargetNS } from './manifest-object';
+import { ManifestFileObject, modifyYAML } from './manifest-object';
 import { parseK8sManifestsFromFile } from './parser';
 
 export class ManifestFile {
@@ -39,7 +39,7 @@ export class ManifestFile {
         ? sorted.filter((m) => m.kind !== 'Namespace')
         : sorted;
       this.#manifests = filtered.map(
-        (m) => new ManifestFileObject(modifyTargetNS(m, this.#targetNS), this)
+        (m) => new ManifestFileObject(modifyYAML(m, this.#targetNS), this)
       );
     } catch (error) {}
     return this;

src/modules/gitops/manifest-group.ts

@@ -13,7 +13,7 @@ import { queryResource } from '../cluster/api';
 import { ImportType, ResourceType } from './manifest-import-types';
 import {
   ManifestObject,
-  modifyTargetNS,
+  modifyYAML,
   skippedStateNotifier,
 } from './manifest-object';
 import { K8sObject } from './parser';
@@ -42,7 +42,7 @@ export class ManifestImportGroup {
       map((v) => v.payload),
       mergeAll(),
       filter((v) => shouldImport(v, sourceNS)),
-      map((v) => new ManifestObject(modifyTargetNS(v, targetNS))),
+      map((v) => new ManifestObject(modifyYAML(v, targetNS))),
       tap((v) => this.#manifests.push(v)),
       shareReplay()
     );

src/modules/gitops/manifest-import-types.ts

@@ -17,7 +17,7 @@ const importTypes: Array<ImportType> = [
   },
   {
     priority: 1,
-    description: 'configuration',
+    description: 'configurations',
     types: [
       { kind: 'Secret', apiVersion: 'v1' },
       { kind: 'ConfigMap', apiVersion: 'v1' },

src/modules/gitops/manifest-object.ts

@@ -163,12 +163,30 @@ export class ManifestFileObject extends ManifestObject {
   }
 }
 
-export function modifyTargetNS(manifest: K8sObject, target?: string) {
+const metadataToDelete = [
+  'selfLink',
+  'uid',
+  'resourceVersion',
+  'generation',
+  'creationTimestamp',
+];
+const annotationsToDelete = [
+  'kubectl.kubernetes.io/last-applied-configuration',
+];
+
+export function modifyYAML(manifest: K8sObject, target?: string) {
   if (!target) return manifest;
   if (manifest.kind === 'Namespace') {
     manifest.metadata.name = target;
   } else {
     manifest.metadata.namespace = target;
   }
+  delete manifest['status'];
+  metadataToDelete.forEach((key) => {
+    delete manifest.metadata[key];
+  });
+  annotationsToDelete.forEach((key) => {
+    delete manifest.metadata.annotations?.[key];
+  });
   return manifest;
 }

src/modules/gitops/parser.ts

@@ -15,6 +15,8 @@ export interface K8sObject {
     name: string;
     namespace?: string;
     [key: string]: any;
+    labels?: Record<string, string> | null;
+    annotations?: Record<string, string> | null;
   };
   ownerReferences?: null | Array<OwnerReference>;
   [key: string]: any;