Fix kubecfg -template to be versioned

This commit is contained in:
Daniel Smith
2014-11-07 14:41:48 -08:00
parent acd4fdca9b
commit 66d62229f6
3 changed files with 36 additions and 10 deletions

View File

@@ -26,7 +26,6 @@ import (
"sort"
"strconv"
"strings"
"text/template"
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@@ -324,14 +323,12 @@ func getPrinter() kubecfg.ResourcePrinter {
} else {
data = []byte(*templateStr)
}
tmpl, err := template.New("output").Parse(string(data))
var err error
printer, err = kubecfg.NewTemplatePrinter(data)
if err != nil {
glog.Fatalf("Error parsing template %s, %v\n", string(data), err)
glog.Fatalf("Error '%v' parsing template:\n'%s'", err, string(data))
return nil
}
printer = &kubecfg.TemplatePrinter{
Template: tmpl,
}
default:
printer = humanReadablePrinter()
}