diff --git a/packages/server-core/src/projects/project/project-helper.ts b/packages/server-core/src/projects/project/project-helper.ts index f2877fe16d..95dc3faf61 100644 --- a/packages/server-core/src/projects/project/project-helper.ts +++ b/packages/server-core/src/projects/project/project-helper.ts @@ -1,3 +1,4 @@ +import k8s from '@kubernetes/client-node' import appRootPath from 'app-root-path' import AWS from 'aws-sdk' import axios from 'axios' @@ -109,7 +110,7 @@ export const updateBuilder = async ( undefined, { headers: { - 'Content-Type': 'application/strategic-merge-patch+json' + 'Content-Type': k8s.PatchUtils.PATCH_FORMAT_STRATEGIC_MERGE_PATCH } } ) @@ -876,7 +877,7 @@ export const createOrUpdateProjectUpdateJob = async (app: Application, projectNa undefined, { headers: { - 'content-type': 'application/merge-patch+json' + 'content-type': k8s.PatchUtils.PATCH_FORMAT_JSON_MERGE_PATCH } } ) diff --git a/packages/server-core/src/setting/authentication-setting/authentication.class.ts b/packages/server-core/src/setting/authentication-setting/authentication.class.ts index f06bba82b5..76e826f51e 100644 --- a/packages/server-core/src/setting/authentication-setting/authentication.class.ts +++ b/packages/server-core/src/setting/authentication-setting/authentication.class.ts @@ -1,4 +1,5 @@ import { Paginated, Params } from '@feathersjs/feathers' +import k8s from '@kubernetes/client-node' import { SequelizeServiceOptions, Service } from 'feathers-sequelize' import { AdminAuthSetting as AdminAuthSettingInterface } from '@etherealengine/common/src/interfaces/AdminAuthSetting' @@ -120,7 +121,7 @@ export class Authentication extends Service { undefined, { headers: { - 'Content-Type': 'application/strategic-merge-patch+json' + 'Content-Type': k8s.PatchUtils.PATCH_FORMAT_STRATEGIC_MERGE_PATCH } } ) diff --git a/scripts/update-cronjob-image.ts b/scripts/update-cronjob-image.ts index 144cd7ee5d..50a8025447 100644 --- a/scripts/update-cronjob-image.ts +++ b/scripts/update-cronjob-image.ts @@ -61,6 +61,7 @@ cli.main(async () => { undefined, undefined, undefined, + undefined, { headers: { 'content-type': 'application/merge-patch+json' @@ -68,7 +69,7 @@ cli.main(async () => { } ) } catch (err) { - console.log('Missing cronjob', `${process.env.RELEASE_NAME}-${project.name}-auto-update`) + console.error('cronjob update error on', `${process.env.RELEASE_NAME}-${project.name}-auto-update`, err) } } cli.exit(0)