github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #61477 from soltysh/server_print_default 

Automatic merge from submit-queue (batch tested with PRs 61842, 61477, 61777). 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>.

Turn server-print on by default in kubectl

**What this PR does / why we need it**:
#55637 introduced `-experimental-server-print` that enabled users to opt-in to user server-side printing. This is a followup which enables this functionality by default, with the ability to fallback not to do it with `--server-print=false`. 

/assign @smarterclayton @juanvallejo 

**Release note**:
```release-note
Enable server-side print in kubectl by default, with the ability to turn it off with --server-print=false
```
pull/8/head
Kubernetes Submit Queue 2018-03-28 15:57:09 -07:00 committed by GitHub
parent 35e3734ed7 94d8b93239
commit 9c19c4e338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hack/make-rules/test-cmd-util.sh
View File

@ -1324,15 +1324,15 @@ run_kubectl_run_tests() {
set +o errexit set +o errexit
} }
run_kubectl_server_print_tests() { run_kubectl_old_print_tests() {
set -o nounset set -o nounset
set -o errexit set -o errexit
create_and_use_new_namespace create_and_use_new_namespace
kube::log::status "Testing kubectl get --experimental-server-print" kube::log::status "Testing kubectl get --server-print=false"
### Test retrieval of all types in discovery ### Test retrieval of all types in discovery
# Pre-condition: no resources exist # Pre-condition: no resources exist
output_message=$(kubectl get pods --experimental-server-print 2>&1 "${kube_flags[@]}") output_message=$(kubectl get pods --server-print=false 2>&1 "${kube_flags[@]}")
# Post-condition: Expect text indicating no resources were found # Post-condition: Expect text indicating no resources were found
kube::test::if_has_string "${output_message}" 'No resources found.' kube::test::if_has_string "${output_message}" 'No resources found.'
@ -1343,7 +1343,7 @@ run_kubectl_server_print_tests() {
# Compare "old" output with experimental output and ensure both are the same # Compare "old" output with experimental output and ensure both are the same
# remove the last column, as it contains the object's AGE, which could cause a mismatch. # remove the last column, as it contains the object's AGE, which could cause a mismatch.
expected_output=$(kubectl get pod "${kube_flags[@]}" | awk 'NF{NF--};1') expected_output=$(kubectl get pod "${kube_flags[@]}" | awk 'NF{NF--};1')
actual_output=$(kubectl get pod --experimental-server-print "${kube_flags[@]}" | awk 'NF{NF--};1') actual_output=$(kubectl get pod --server-print=false "${kube_flags[@]}" | awk 'NF{NF--};1')
kube::test::if_has_string "${actual_output}" "${expected_output}" kube::test::if_has_string "${actual_output}" "${expected_output}"
### Test retrieval of daemonsets against server-side printing ### Test retrieval of daemonsets against server-side printing
@ -1353,7 +1353,7 @@ run_kubectl_server_print_tests() {
# Compare "old" output with experimental output and ensure both are the same # Compare "old" output with experimental output and ensure both are the same
# remove the last column, as it contains the object's AGE, which could cause a mismatch. # remove the last column, as it contains the object's AGE, which could cause a mismatch.
expected_output=$(kubectl get ds "${kube_flags[@]}" | awk 'NF{NF--};1') expected_output=$(kubectl get ds "${kube_flags[@]}" | awk 'NF{NF--};1')
actual_output=$(kubectl get ds --experimental-server-print "${kube_flags[@]}" | awk 'NF{NF--};1') actual_output=$(kubectl get ds --server-print=false "${kube_flags[@]}" | awk 'NF{NF--};1')
kube::test::if_has_string "${actual_output}" "${expected_output}" kube::test::if_has_string "${actual_output}" "${expected_output}"
### Test retrieval of replicationcontrollers against server-side printing ### Test retrieval of replicationcontrollers against server-side printing
@ -1363,7 +1363,7 @@ run_kubectl_server_print_tests() {
# Compare "old" output with experimental output and ensure both are the same # Compare "old" output with experimental output and ensure both are the same
# remove the last column, as it contains the object's AGE, which could cause a mismatch. # remove the last column, as it contains the object's AGE, which could cause a mismatch.
expected_output=$(kubectl get rc "${kube_flags[@]}" | awk 'NF{NF--};1') expected_output=$(kubectl get rc "${kube_flags[@]}" | awk 'NF{NF--};1')
actual_output=$(kubectl get rc --experimental-server-print "${kube_flags[@]}" | awk 'NF{NF--};1') actual_output=$(kubectl get rc --server-print=false "${kube_flags[@]}" | awk 'NF{NF--};1')
kube::test::if_has_string "${actual_output}" "${expected_output}" kube::test::if_has_string "${actual_output}" "${expected_output}"
### Test retrieval of replicasets against server-side printing ### Test retrieval of replicasets against server-side printing
@ -1373,7 +1373,7 @@ run_kubectl_server_print_tests() {
# Compare "old" output with experimental output and ensure both are the same # Compare "old" output with experimental output and ensure both are the same
# remove the last column, as it contains the object's AGE, which could cause a mismatch. # remove the last column, as it contains the object's AGE, which could cause a mismatch.
expected_output=$(kubectl get rs "${kube_flags[@]}" | awk 'NF{NF--};1') expected_output=$(kubectl get rs "${kube_flags[@]}" | awk 'NF{NF--};1')
actual_output=$(kubectl get rs --experimental-server-print "${kube_flags[@]}" | awk 'NF{NF--};1') actual_output=$(kubectl get rs --server-print=false "${kube_flags[@]}" | awk 'NF{NF--};1')
kube::test::if_has_string "${actual_output}" "${expected_output}" kube::test::if_has_string "${actual_output}" "${expected_output}"
### Test retrieval of jobs against server-side printing ### Test retrieval of jobs against server-side printing
@ -1383,7 +1383,7 @@ run_kubectl_server_print_tests() {
# Compare "old" output with experimental output and ensure both are the same # Compare "old" output with experimental output and ensure both are the same
# remove the last column, as it contains the object's AGE, which could cause a mismatch. # remove the last column, as it contains the object's AGE, which could cause a mismatch.
expected_output=$(kubectl get jobs/pi "${kube_flags[@]}" | awk 'NF{NF--};1') expected_output=$(kubectl get jobs/pi "${kube_flags[@]}" | awk 'NF{NF--};1')
actual_output=$(kubectl get jobs/pi --experimental-server-print "${kube_flags[@]}" | awk 'NF{NF--};1') actual_output=$(kubectl get jobs/pi --server-print=false "${kube_flags[@]}" | awk 'NF{NF--};1')
kube::test::if_has_string "${actual_output}" "${expected_output}" kube::test::if_has_string "${actual_output}" "${expected_output}"
### Test retrieval of clusterroles against server-side printing ### Test retrieval of clusterroles against server-side printing
@ -1393,7 +1393,7 @@ run_kubectl_server_print_tests() {
# Compare "old" output with experimental output and ensure both are the same # Compare "old" output with experimental output and ensure both are the same
# remove the last column, as it contains the object's AGE, which could cause a mismatch. # remove the last column, as it contains the object's AGE, which could cause a mismatch.
expected_output=$(kubectl get clusterroles/sample-role "${kube_flags[@]}" | awk 'NF{NF--};1') expected_output=$(kubectl get clusterroles/sample-role "${kube_flags[@]}" | awk 'NF{NF--};1')
actual_output=$(kubectl get clusterroles/sample-role --experimental-server-print "${kube_flags[@]}" | awk 'NF{NF--};1') actual_output=$(kubectl get clusterroles/sample-role --server-print=false "${kube_flags[@]}" | awk 'NF{NF--};1')
kube::test::if_has_string "${actual_output}" "${expected_output}" kube::test::if_has_string "${actual_output}" "${expected_output}"
### Test retrieval of crds against server-side printing ### Test retrieval of crds against server-side printing
@ -1422,7 +1422,7 @@ __EOF__
kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" ''
# Compare "old" output with experimental output and ensure both are the same # Compare "old" output with experimental output and ensure both are the same
expected_output=$(kubectl get foos "${kube_flags[@]}") expected_output=$(kubectl get foos "${kube_flags[@]}")
actual_output=$(kubectl get foos --experimental-server-print "${kube_flags[@]}" | awk 'NF{NF--};1') actual_output=$(kubectl get foos --server-print=false "${kube_flags[@]}" | awk 'NF{NF--};1')
kube::test::if_has_string "${actual_output}" "${expected_output}" kube::test::if_has_string "${actual_output}" "${expected_output}"
# teardown # teardown
@ -4942,7 +4942,7 @@ runTests() {
if kube::test::if_supports_resource "${pods}" ; then if kube::test::if_supports_resource "${pods}" ; then
record_command run_kubectl_get_tests record_command run_kubectl_get_tests
record_command run_kubectl_server_print_tests record_command run_kubectl_old_print_tests
fi fi

11
pkg/kubectl/cmd/resource/get.go
View File

@ -122,7 +122,7 @@ var (
const ( const (
useOpenAPIPrintColumnFlagLabel = "use-openapi-print-columns" useOpenAPIPrintColumnFlagLabel = "use-openapi-print-columns"
useServerPrintColumns = "experimental-server-print" useServerPrintColumns = "server-print"
) )
// NewGetOptions returns a GetOptions with default chunk size 500. // NewGetOptions returns a GetOptions with default chunk size 500.
@ -202,6 +202,13 @@ func (options *GetOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args
} }
options.Sort = len(isSorting) > 0 options.Sort = len(isSorting) > 0
// TODO (soltysh): currently we don't support sorting and custom columns
// with server side print. So in these cases force the old behavior.
outputOption := cmd.Flags().Lookup("output").Value.String()
if options.Sort && outputOption == "custom-columns" {
options.ServerPrint = false
}
options.IncludeUninitialized = cmdutil.ShouldIncludeUninitialized(cmd, false) options.IncludeUninitialized = cmdutil.ShouldIncludeUninitialized(cmd, false)
switch { switch {
@ -727,7 +734,7 @@ func addOpenAPIPrintColumnFlags(cmd *cobra.Command) {
} }
func addServerPrintColumnFlags(cmd *cobra.Command) { func addServerPrintColumnFlags(cmd *cobra.Command) {
cmd.Flags().Bool(useServerPrintColumns, false, "If true, have the server return the appropriate table output. Supports extension APIs and CRD. Experimental.") cmd.Flags().Bool(useServerPrintColumns, true, "If true, have the server return the appropriate table output. Supports extension APIs and CRDs.")
} }
func shouldGetNewPrinterForMapping(printer printers.ResourcePrinter, lastMapping, mapping *meta.RESTMapping) bool { func shouldGetNewPrinterForMapping(printer printers.ResourcePrinter, lastMapping, mapping *meta.RESTMapping) bool {