mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-17 15:13:08 +00:00
Merge pull request #46091 from xilabao/new-output-in-edit
Automatic merge from submit-queue (batch tested with PRs 46091, 48280) allow output patch string in edit command **What this PR does / why we need it**: allow user to get the patch from edit command if user is not familiar with the patch format. ``` # ./cluster/kubectl.sh create role a --verb=get,list --resource=no role "a" created # ./cluster/kubectl.sh edit role a --output-patch=true Patch: {"rules":[{"apiGroups":[""],"resources":["nodes"],"verbs":["get","list","delete"]}]} role "a" edited # ./cluster/kubectl.sh create role b --verb=get,list --resource=no role "b" created # ./cluster/kubectl.sh patch role b -p '{"rules":[{"apiGroups":[""],"resources":["nodes"],"verbs":["get","list","delete"]}]}' role "b" patched ``` **Which issue this PR fixes**: fixes #47173 **Special notes for your reviewer**: **Release note**: ```release-note Could get the patch from kubectl edit command ```
This commit is contained in:
@@ -797,7 +797,7 @@ __EOF__
|
||||
chmod +x /tmp/tmp-editor.sh
|
||||
# Pre-condition: valid-pod POD has image nginx
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'nginx:'
|
||||
EDITOR=/tmp/tmp-editor.sh kubectl edit "${kube_flags[@]}" pods/valid-pod
|
||||
[[ "$(EDITOR=/tmp/tmp-editor.sh kubectl edit "${kube_flags[@]}" pods/valid-pod --output-patch=true | grep Patch:)" ]]
|
||||
# Post-condition: valid-pod POD has image gcr.io/google_containers/serve_hostname
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'gcr.io/google_containers/serve_hostname:'
|
||||
# cleaning
|
||||
|
Reference in New Issue
Block a user