From f6163a9e86ca77f38e2b6b3daa6f6315e0ec6b1d Mon Sep 17 00:00:00 2001 From: Brian Storti Date: Tue, 2 Jul 2019 20:25:13 -0300 Subject: [PATCH] fix(kubernetes): Fix link to strategic merge patch docs (#7177) This file was moved in this https://github.com/kubernetes/community/pull/3145 --- app/scripts/modules/kubernetes/src/help/kubernetes.help.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/modules/kubernetes/src/help/kubernetes.help.ts b/app/scripts/modules/kubernetes/src/help/kubernetes.help.ts index 16f1d21f4e2..b4ceed62bf0 100644 --- a/app/scripts/modules/kubernetes/src/help/kubernetes.help.ts +++ b/app/scripts/modules/kubernetes/src/help/kubernetes.help.ts @@ -221,7 +221,7 @@ const helpContents: { [key: string]: string } = { 'kubernetes.manifest.patch.record': `Record the applied patch in the kubernetes.io/change-cause annotation. If the annotation already exists, the contents are replaced.`, 'kubernetes.manifest.patch.mergeStrategy': `

The merge strategy to use when patching Kubernetes objects:

-

strategic: (Default) Kubernetes Strategic merge patch.

+

strategic: (Default) Kubernetes Strategic merge patch.

json: JSON Patch, RFC 6902

merge: JSON Merge Patch, RFC 7386

`,