Skip to content

Commit

Permalink
fix(kubernetes): Fix link to strategic merge patch docs (#7177)
Browse files Browse the repository at this point in the history
This file was moved in this kubernetes/community#3145
  • Loading branch information
brianstorti authored and louisjimenez committed Jul 2, 2019
1 parent 51b8d2d commit f6163a9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/scripts/modules/kubernetes/src/help/kubernetes.help.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ const helpContents: { [key: string]: string } = {
'kubernetes.manifest.patch.record': `Record the applied patch in the <i>kubernetes.io/change-cause</i> annotation. If the annotation already exists, the contents are replaced.`,
'kubernetes.manifest.patch.mergeStrategy': `
<p>The merge strategy to use when patching Kubernetes objects:</p>
<p><b>strategic</b>: <i>(Default)</i> <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md" target="_blank">Kubernetes Strategic merge patch.</a></p>
<p><b>strategic</b>: <i>(Default)</i> <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/sig-api-machinery/strategic-merge-patch.md" target="_blank">Kubernetes Strategic merge patch.</a></p>
<p><b>json</b>: <a href="https://tools.ietf.org/html/rfc6902" target="_blank">JSON Patch, RFC 6902</a></p>
<p><b>merge</b>: <a href="https://tools.ietf.org/html/rfc7386" target="_blank">JSON Merge Patch, RFC 7386</a></p>
`,
Expand Down

0 comments on commit f6163a9

Please sign in to comment.