feat: remove team jobs (#1665)

Author: j-zimnowoda

.values/env/settings.yaml

@@ -1 +1 @@
-version: 25
+version: 27

.vscode/launch.json

@@ -66,6 +66,16 @@
       "envFile": ".env",
       "console": "integratedTerminal",
       "cwd": "${workspaceRoot}"
+    },
+    {
+      "name": "Migrate values",
+      "request": "launch",
+      "runtimeArgs": ["run", "migrate-values"],
+      "runtimeExecutable": "npm",
+      "type": "node",
+      "envFile": ".env",
+      "console": "integratedTerminal",
+      "cwd": "${workspaceRoot}"
     }
   ]
 }

helmfile.d/helmfile-60.teams.yaml

@@ -254,28 +254,4 @@ releases:
         svc: prometheus-blackbox-exporter
         port: 9115
   {{- end }}
-  {{- range $job := $team | get "jobs" list }}
-  - name: job-{{ $teamId }}-{{ $job.name }}
-    installed: {{ $job.enabled }}
-    namespace: team-{{ $teamId }}
-    chart: ../charts/jobs
-    labels:
-      group: jobs
-      tag: teams
-      team: {{ $teamId }}
-      pipeline: otomi-task-teams
-    hooks:
-      - events: [presync]
-        showlogs: true
-        command: ../bin/job-presync.sh
-        args:
-          - job-{{ $teamId }}-{{ $job.name }}
-          {{- if hasKey $job "runPolicy" }}
-          - "{{ $job.runPolicy }}"    
-          {{- end }}
-    values:
-      - teamSecrets: {{- $team | get "secrets" nil | toYaml | nindent 10 }}
-        teamId: {{ $teamId }}
-      - {{- $job | toYaml | nindent 8 }}
-  {{- end }}
 {{- end }}

helmfile.d/snippets/defaults.yaml

@@ -785,4 +785,4 @@ environments:
           upgrade:
             version: main
         # TODO: update this when schema version changes: (and think more?)
-        version: 26
+        version: 27

src/cmd/migrate.ts

@@ -28,6 +28,7 @@ interface Change {
   clones?: Array<{
     [targetPath: string]: string
   }>
+  fileDeletions?: Array<string>
   deletions?: Array<string>
   relocations?: Array<{
     [oldLocation: string]: string
@@ -50,6 +51,22 @@ interface Change {
 
 export type Changes = Array<Change>
 
+export const deleteFile = async (
+  relativeFilePath: string,
+  dryRun = false,
+  deps = { pathExists, renameSync, terminal, copy, rm },
+): Promise<void> => {
+  const d = deps.terminal(`cmd:${cmdName}:rename`)
+  const path = `${env.ENV_DIR}/${relativeFilePath}`
+  if (!(await deps.pathExists(path))) {
+    d.warn(`File does not exist: "${path}". Already removed?`)
+    return
+  }
+  if (!dryRun) {
+    await deps.rm(path)
+  }
+}
+
 export const rename = async (
   oldName: string,
   newName: string,
@@ -332,6 +349,13 @@ export const applyChanges = async (
           await setDeep(values, path, tmplStr)
         }
       }
+    // Lastly we remove files
+    for (const change of changes) {
+      change.fileDeletions?.forEach((entry) => {
+        const paths = unparsePaths(entry, values)
+        paths.forEach((path) => deleteFile(path))
+      })
+    }
 
     if (c.networkPoliciesMigration) await networkPoliciesMigration(values)
 

src/common/values.ts

@@ -214,7 +214,6 @@ export const writeValues = async (inValues: Record<string, any>, overwrite = fal
       'apps',
       'backups',
       'builds',
-      'jobs',
       'secrets',
       'netpols',
       'sealedsecrets',

tests/fixtures/env/settings.yaml

@@ -131,4 +131,4 @@ status:
         deployingVersion: 0.21.0
         status: deployed
         version: 0.21.0
-version: 26
+version: 27

tests/fixtures/env/teams/jobs.admin.yaml

@@ -278,3 +278,8 @@ changes:
   - version: 26
     relocations:
       - 'apps.metrics-server.apiServer.enabled': 'apps.metrics-server.apiServer.create'
+  - version: 27
+    deletions:
+      - 'teamConfig.{team}.jobs'
+    fileDeletions:
+      - env/teams/jobs.{team}.yaml

tests/fixtures/env/teams/jobs.demo.yaml

@@ -1088,8 +1088,6 @@ definitions:
       id:
         $ref: '#/definitions/idName'
         description: Must be the same as the name.
-      jobs:
-        $ref: '#/definitions/jobs'
       limitRange:
         description: 'Kubernetes limit range. As is.'
         properties: