@@ -28,6 +28,7 @@ import (
2828 "github.com/fatih/color"
2929 "github.com/gobuffalo/flect"
3030 "github.com/olekukonko/tablewriter"
31+ "github.com/olekukonko/tablewriter/tw"
3132 corev1 "k8s.io/api/core/v1"
3233 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3334 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
6667func PrintObjectTree (tree * tree.ObjectTree , w io.Writer ) {
6768 // Creates the output table
6869 tbl := tablewriter .NewWriter (w )
69- tbl .SetHeader ([]string {"NAME" , "REPLICAS" , "AVAILABLE" , "READY" , "UP TO DATE" , "STATUS" , "REASON" , "SINCE" , "MESSAGE" })
70+ tbl .Header ([]string {"NAME" , "REPLICAS" , "AVAILABLE" , "READY" , "UP TO DATE" , "STATUS" , "REASON" , "SINCE" , "MESSAGE" })
7071
7172 formatTableTree (tbl )
7273 // Add row for the root object, the cluster, and recursively for all the nodes representing the cluster status.
@@ -81,7 +82,7 @@ func PrintObjectTree(tree *tree.ObjectTree, w io.Writer) {
8182func PrintObjectTreeV1Beta1 (tree * tree.ObjectTree ) {
8283 // Creates the output table
8384 tbl := tablewriter .NewWriter (os .Stdout )
84- tbl .SetHeader ([]string {"NAME" , "READY" , "SEVERITY" , "REASON" , "SINCE" , "MESSAGE" })
85+ tbl .Header ([]string {"NAME" , "READY" , "SEVERITY" , "REASON" , "SINCE" , "MESSAGE" })
8586
8687 formatTableTreeV1Beta1 (tbl )
8788 // Add row for the root object, the cluster, and recursively for all the nodes representing the cluster status.
@@ -93,32 +94,30 @@ func PrintObjectTreeV1Beta1(tree *tree.ObjectTree) {
9394
9495// formats the table with required attributes.
9596func formatTableTree (tbl * tablewriter.Table ) {
96- tbl .SetAutoWrapText ( false )
97- tbl . SetHeaderAlignment ( tablewriter . ALIGN_LEFT )
98- tbl . SetAlignment ( tablewriter . ALIGN_LEFT )
99-
100- tbl . SetCenterSeparator ( "" )
101- tbl . SetRowSeparator ( "" )
102-
103- tbl . SetHeaderLine ( false )
104- tbl . SetTablePadding ( " " )
105- tbl . SetNoWhiteSpace ( true )
97+ tbl .Options (
98+ tablewriter . WithRowAutoWrap ( tw . WrapNone ),
99+ tablewriter . WithHeaderAlignment ( tw . AlignLeft ),
100+ tablewriter . WithRendition (tw. Rendition {
101+ Borders : tw . BorderNone ,
102+ Settings : tw. Settings {
103+ Separators : tw . SeparatorsNone ,
104+ }}),
105+ tablewriter . WithPadding (tw. Padding { Right : " " }),
106+ )
106107}
107108
108109// formats the table with required attributes.
109110func formatTableTreeV1Beta1 (tbl * tablewriter.Table ) {
110- tbl .SetAutoWrapText (false )
111- tbl .SetHeaderAlignment (tablewriter .ALIGN_LEFT )
112- tbl .SetAlignment (tablewriter .ALIGN_LEFT )
113-
114- tbl .SetCenterSeparator ("" )
115- tbl .SetColumnSeparator ("" )
116- tbl .SetRowSeparator ("" )
117-
118- tbl .SetHeaderLine (false )
119- tbl .SetBorder (false )
120- tbl .SetTablePadding (" " )
121- tbl .SetNoWhiteSpace (true )
111+ tbl .Options (
112+ tablewriter .WithRowAutoWrap (tw .WrapNone ),
113+ tablewriter .WithHeaderAlignment (tw .AlignLeft ),
114+ tablewriter .WithRendition (tw.Rendition {
115+ Borders : tw .BorderNone ,
116+ Settings : tw.Settings {
117+ Separators : tw .SeparatorsNone ,
118+ }}),
119+ tablewriter .WithPadding (tw.Padding {Right : " " }),
120+ )
122121}
123122
124123// addObjectRow add a row for a given object, and recursively for all the object's children.
0 commit comments