whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28126 from GreenApple10/fature/update_retainkeys_strategy

Browse Source 
Add missing --type merge for retainkeys examples
This commit is contained in:
Kubernetes Prow Robot
2021-05-27 02:44:23 -07:00
committed by GitHub
parent bf608bdb6b 0a7120a939
commit 95d0cc621a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/zh/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md
+4 -4
View File
@@ -452,10 +452,10 @@ spec:
{{< tabs name="kubectl_retainkeys_example" >}} {{< tabs name="kubectl_retainkeys_example" >}}
{{{< tab name="Bash" codelang="bash" >}} {{{< tab name="Bash" codelang="bash" >}}
kubectl patch deployment retainkeys-demo --patch "$(cat patch-file-no-retainkeys.yaml)" kubectl patch deployment retainkeys-demo --type merge --patch "$(cat patch-file-no-retainkeys.yaml)"
{{< /tab >}} {{< /tab >}}
{{< tab name="PowerShell" codelang="posh" >}} {{< tab name="PowerShell" codelang="posh" >}}
kubectl patch deployment retainkeys-demo --patch $(Get-Content patch-file-no-retainkeys.yaml -Raw) kubectl patch deployment retainkeys-demo --type merge --patch $(Get-Content patch-file-no-retainkeys.yaml -Raw)
{{< /tab >}}} {{< /tab >}}}
{{< /tabs >}} {{< /tabs >}}
@@ -499,10 +499,10 @@ Patch your Deployment again with this new patch:
{{< tabs name="kubectl_retainkeys2_example" >}} {{< tabs name="kubectl_retainkeys2_example" >}}
{{{< tab name="Bash" codelang="bash" >}} {{{< tab name="Bash" codelang="bash" >}}
kubectl patch deployment retainkeys-demo --patch "$(cat patch-file-retainkeys.yaml)" kubectl patch deployment retainkeys-demo --type merge --patch "$(cat patch-file-retainkeys.yaml)"
{{< /tab >}} {{< /tab >}}
{{< tab name="PowerShell" codelang="posh" >}} {{< tab name="PowerShell" codelang="posh" >}}
kubectl patch deployment retainkeys-demo --patch $(Get-Content patch-file-retainkeys.yaml -Raw) kubectl patch deployment retainkeys-demo --type merge --patch $(Get-Content patch-file-retainkeys.yaml -Raw)
{{< /tab >}}} {{< /tab >}}}
{{< /tabs >}} {{< /tabs >}}