
Clean up the code paths that lead to objects being transformed and output with negotiation. Remove some duplicate code that was not consistent. Now, watch will respond correctly to Table and PartialObjectMetadata requests. Add unit and integration tests. When transforming responses to Tables, only the first watch event for a given type will include the columns. Columns will not change unless the watch is restarted. Add a volume attachment printer and tighten up table validation error cases. Disable protobuf from table conversion because Tables don't have protobuf because they use `interface{}`
46 lines
1.3 KiB
Go
46 lines
1.3 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package storage
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/kubernetes/pkg/printers"
|
|
)
|
|
|
|
type TableConvertor struct {
|
|
printers.TablePrinter
|
|
}
|
|
|
|
func (c TableConvertor) ConvertToTable(ctx context.Context, obj runtime.Object, tableOptions runtime.Object) (*metav1beta1.Table, error) {
|
|
noHeaders := false
|
|
if tableOptions != nil {
|
|
switch t := tableOptions.(type) {
|
|
case *metav1beta1.TableOptions:
|
|
if t != nil {
|
|
noHeaders = t.NoHeaders
|
|
}
|
|
default:
|
|
return nil, fmt.Errorf("unrecognized type %T for table options, can't display tabular output", tableOptions)
|
|
}
|
|
}
|
|
return c.TablePrinter.PrintTable(obj, printers.PrintOptions{Wide: true, NoHeaders: noHeaders})
|
|
}
|