diff --git a/.husky/pre-push b/.husky/pre-push index e301c61b43..d1ee22f96f 100755 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -1,4 +1,2 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" npm test && npm run lint diff --git a/src/patch.ts b/src/patch.ts index b13aba14eb..a4ff6de180 100644 --- a/src/patch.ts +++ b/src/patch.ts @@ -2,6 +2,9 @@ * Valid Content-Type header values for patch operations. See * https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/ * for details. + * + * Additionally for Server-Side Apply https://kubernetes.io/docs/reference/using-api/server-side-apply/ + * and https://kubernetes.io/docs/reference/using-api/server-side-apply/#api-implementation */ export enum PatchStrategy { /** Diff-like JSON format. */ @@ -10,4 +13,6 @@ export enum PatchStrategy { MergePatch = 'application/merge-patch+json', /** Merge with different strategies depending on field metadata. */ StrategicMergePatch = 'application/strategic-merge-patch+json', + /** Server-Side Apply */ + ServerSideApply = 'application/apply-patch+yaml', }