Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Fixed a bug with update-cronjob-image.ts #7871

Merged
merged 1 commit into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/server-core/src/projects/project/project-helper.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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
}
}
)
Expand Down Expand Up @@ -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
}
}
)
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -120,7 +121,7 @@ export class Authentication<T = AdminAuthSettingDataType> extends Service<T> {
undefined,
{
headers: {
'Content-Type': 'application/strategic-merge-patch+json'
'Content-Type': k8s.PatchUtils.PATCH_FORMAT_STRATEGIC_MERGE_PATCH
}
}
)
Expand Down
3 changes: 2 additions & 1 deletion scripts/update-cronjob-image.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,15 @@ cli.main(async () => {
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`)
console.error('cronjob update error on', `${process.env.RELEASE_NAME}-${project.name}-auto-update`, err)
}
}
cli.exit(0)
Expand Down