mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #61692 from CaoShuFeng/output-version
Automatic merge from submit-queue (batch tested with PRs 61452, 61727, 61462, 61692, 61738). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. clean up output-version ref: https://github.com/kubernetes/kubernetes/pull/41576 **Release note**: ```release-note NONE ```
This commit is contained in:
commit
2b03013307
@ -361,7 +361,7 @@ run_pod_tests() {
|
||||
kube::test::get_object_assert 'pods/valid-pod' "{{.metadata.namespace}} {{.metadata.name}}" '<no value> valid-pod' "--export=true"
|
||||
|
||||
### Dump current valid-pod POD
|
||||
output_pod=$(kubectl get pod valid-pod -o yaml --output-version=v1 "${kube_flags[@]}")
|
||||
output_pod=$(kubectl get pod valid-pod -o yaml "${kube_flags[@]}")
|
||||
|
||||
### Delete POD valid-pod by id
|
||||
# Pre-condition: valid-pod POD exists
|
||||
@ -2566,7 +2566,7 @@ run_service_tests() {
|
||||
kube::test::get_object_assert 'services redis-master' "{{range$service_selector_field}}{{.}}:{{end}}" "redis:master:backend:"
|
||||
|
||||
### Dump current redis-master service
|
||||
output_service=$(kubectl get service redis-master -o json --output-version=v1 "${kube_flags[@]}")
|
||||
output_service=$(kubectl get service redis-master -o json "${kube_flags[@]}")
|
||||
|
||||
### Delete redis-master-service by id
|
||||
# Pre-condition: redis-master service exists
|
||||
|
@ -59,8 +59,8 @@ var (
|
||||
# Create a pod based on the JSON passed into stdin.
|
||||
cat pod.json | kubectl create -f -
|
||||
|
||||
# Edit the data in docker-registry.yaml in JSON using the v1 API format then create the resource using the edited data.
|
||||
kubectl create -f docker-registry.yaml --edit --output-version=v1 -o json`))
|
||||
# Edit the data in docker-registry.yaml in JSON then create the resource using the edited data.
|
||||
kubectl create -f docker-registry.yaml --edit -o json`))
|
||||
)
|
||||
|
||||
func NewCmdCreate(f cmdutil.Factory, out, errOut io.Writer) *cobra.Command {
|
||||
|
Loading…
Reference in New Issue
Block a user