Skip to content

Commit 95d0cc6

Browse files
authored
Merge pull request #28126 from GreenApple10/fature/update_retainkeys_strategy
Add missing --type merge for retainkeys examples
2 parents bf608bd + 0a7120a commit 95d0cc6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

content/zh/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,10 @@ spec:
452452
453453
{{< tabs name="kubectl_retainkeys_example" >}}
454454
{{{< tab name="Bash" codelang="bash" >}}
455-
kubectl patch deployment retainkeys-demo --patch "$(cat patch-file-no-retainkeys.yaml)"
455+
kubectl patch deployment retainkeys-demo --type merge --patch "$(cat patch-file-no-retainkeys.yaml)"
456456
{{< /tab >}}
457457
{{< tab name="PowerShell" codelang="posh" >}}
458-
kubectl patch deployment retainkeys-demo --patch $(Get-Content patch-file-no-retainkeys.yaml -Raw)
458+
kubectl patch deployment retainkeys-demo --type merge --patch $(Get-Content patch-file-no-retainkeys.yaml -Raw)
459459
{{< /tab >}}}
460460
{{< /tabs >}}
461461
@@ -499,10 +499,10 @@ Patch your Deployment again with this new patch:
499499
500500
{{< tabs name="kubectl_retainkeys2_example" >}}
501501
{{{< tab name="Bash" codelang="bash" >}}
502-
kubectl patch deployment retainkeys-demo --patch "$(cat patch-file-retainkeys.yaml)"
502+
kubectl patch deployment retainkeys-demo --type merge --patch "$(cat patch-file-retainkeys.yaml)"
503503
{{< /tab >}}
504504
{{< tab name="PowerShell" codelang="posh" >}}
505-
kubectl patch deployment retainkeys-demo --patch $(Get-Content patch-file-retainkeys.yaml -Raw)
505+
kubectl patch deployment retainkeys-demo --type merge --patch $(Get-Content patch-file-retainkeys.yaml -Raw)
506506
{{< /tab >}}}
507507
{{< /tabs >}}
508508

0 commit comments

Comments
 (0)