Fixed bugs in project auto-update.

Dockerfile

@@ -24,6 +24,7 @@ COPY packages/server-core/package.json ./packages/server-core/
 COPY packages/taskserver/package.json ./packages/taskserver/
 COPY packages/projects/package.json ./packages/projects/
 COPY project-package-jsons ./
+COPY patches/ ./patches/
 
 #RUN  npm ci --verbose  # we should make lockfile or shrinkwrap then use npm ci for predicatble builds
 

packages/server-core/src/projects/project/project-helper.ts

@@ -829,7 +829,7 @@ export const getCronJobBody = (project: ProjectInterface, image: string): object
   }
 }
 
-export const createProjectUpdateJob = async (app: Application, projectName: string): Promise<void> => {
+export const createOrUpdateProjectUpdateJob = async (app: Application, projectName: string): Promise<void> => {
   const project = await app.service('project').Model.findOne({
     where: {
       name: projectName
@@ -845,31 +845,8 @@ export const createProjectUpdateJob = async (app: Application, projectName: stri
 
   const image = apiPods.pods[0].containers.find((container) => container.name === 'xrengine')!.image
 
-  try {
-    if (app.k8BatchClient) await app.k8BatchClient.createNamespacedCronJob('default', getCronJobBody(project, image))
-  } catch (err) {
-    logger.error('Failed to create project update cronjob %o', err)
-  }
-}
-
-export const updateProjectUpdateJob = async (app: Application, projectName: string): Promise<void> => {
-  const project = await app.service('project').Model.findOne({
-    where: {
-      name: projectName
-    }
-  })
-
-  const apiPods = await getPodsData(
-    `app.kubernetes.io/instance=${config.server.releaseName},app.kubernetes.io/component=api`,
-    'api',
-    'Api',
-    app
-  )
-
-  const image = apiPods.pods[0].containers.find((container) => container.name === 'xrengine')!.image
-
-  try {
-    if (app.k8BatchClient)
+  if (app.k8BatchClient) {
+    try {
       await app.k8BatchClient.patchNamespacedCronJob(
         `${process.env.RELEASE_NAME}-${projectName}-auto-update`,
         'default',
@@ -884,8 +861,10 @@ export const updateProjectUpdateJob = async (app: Application, projectName: stri
           }
         }
       )
-  } catch (err) {
-    logger.error('Failed to patch project update cronjob %o', err)
+    } catch (err) {
+      logger.error('Could not find cronjob %o', err)
+      await app.k8BatchClient.createNamespacedCronJob('default', getCronJobBody(project, image))
+    }
   }
 }
 

packages/server-core/src/projects/project/project.class.ts

@@ -38,13 +38,12 @@ import {
   getUserRepos
 } from './github-helper'
 import {
-  createProjectUpdateJob,
+  createOrUpdateProjectUpdateJob,
   getEnginePackageJson,
   getProjectConfig,
   getProjectPackageJson,
   onProjectEvent,
-  removeProjectUpdateJob,
-  updateProjectUpdateJob
+  removeProjectUpdateJob
 } from './project-helper'
 
 const templateFolderDirectory = path.join(appRootPath.path, `packages/projects/template-project/`)
@@ -490,8 +489,7 @@ export class Project extends Service {
     }
 
     if (this.app.k8BatchClient && (data.updateType === 'tag' || data.updateType === 'commit')) {
-      if (!existingProjectResult) await createProjectUpdateJob(this.app, projectName)
-      else await updateProjectUpdateJob(this.app, projectName)
+      await createOrUpdateProjectUpdateJob(this.app, projectName)
     } else if (this.app.k8BatchClient && (data.updateType === 'none' || data.updateType == null))
       await removeProjectUpdateJob(this.app, projectName)
 

scripts/update-cronjob-image.ts

@@ -1,9 +1,10 @@
 import appRootPath from 'app-root-path'
 import cli from 'cli'
 import dotenv from 'dotenv-flow'
-import {createFeathersExpressApp} from "@xrengine/server-core/src/createApp";
-import {ServerMode} from "@xrengine/server-core/declarations";
-import {getCronJobBody} from "@xrengine/server-core/src/projects/project/project-helper";
+
+import { ServerMode } from '@xrengine/server-core/declarations'
+import { createFeathersExpressApp } from '@xrengine/server-core/src/createApp'
+import { getCronJobBody } from '@xrengine/server-core/src/projects/project/project-helper'
 
 dotenv.config({
   path: appRootPath.path,
@@ -49,11 +50,24 @@ cli.main(async () => {
     })
     if (app.k8BatchClient)
       for (const project of autoUpdateProjects.data) {
-        await app.k8BatchClient.patchNamespacedCronJob(`${process.env.RELEASE_NAME}-${project.name}-auto-update`, 'default', getCronJobBody(project, `${options.ecrUrl}/${options.repoName}-api:${options.tag}__${options.startTime}`), undefined, undefined, undefined, undefined, {
-          headers: {
-            'content-type': "application/merge-patch+json"
-          }
-        })
+        try {
+          await app.k8BatchClient.patchNamespacedCronJob(
+            `${process.env.RELEASE_NAME}-${project.name}-auto-update`,
+            'default',
+            getCronJobBody(project, `${options.ecrUrl}/${options.repoName}-api:${options.tag}__${options.startTime}`),
+            undefined,
+            undefined,
+            undefined,
+            undefined,
+            {
+              headers: {
+                'content-type': 'application/merge-patch+json'
+              }
+            }
+          )
+        } catch (err) {
+          console.log('Missing cronjob', `${process.env.RELEASE_NAME}-${project.name}-auto-update`)
+        }
       }
     cli.exit(0)
   } catch (err) {