kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove conflict marker

This commit is contained in:
bassaer 2020-11-18 01:44:42 +09:00
parent 497e2ccb10
commit 8ae0b72e59
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/ja/docs/reference/kubectl/cheatsheet.md
View File

@ -214,10 +214,6 @@ kubectl get pods -o json | jq -c 'path(..)|[.[]|tostring]|join(".")'
## リソースのアップデート ## リソースのアップデート
<<<<<<< HEAD
=======
>>>>>>> 8d357bf1e (finished translating cheartsheet.md)
```bash ```bash
kubectl set image deployment/frontend www=image:v2 # frontend Deploymentのwwwコンテナイメージをv2にローリングアップデートします kubectl set image deployment/frontend www=image:v2 # frontend Deploymentのwwwコンテナイメージをv2にローリングアップデートします
kubectl rollout history deployment/frontend # frontend Deploymentの改訂履歴を確認します kubectl rollout history deployment/frontend # frontend Deploymentの改訂履歴を確認します