Print version and reduce verbosity

* revendor k3sup to prevent arch / OS from being printed in
the logs
* print version on startup
* bump minor CNI and containerd version for e2e tests
* revendor faas-provider for latest log printing update

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd)
2020-06-07 10:58:27 +01:00
committed by Alex Ellis
parent 50de0f34bb
commit 26debca616
19 changed files with 99 additions and 102 deletions

View File

@ -33,7 +33,7 @@ type Request struct {
// allows you to safely compare if two requests have the same value.
func (r Request) String() string {
return fmt.Sprintf(
"name:%s namespace: %s instance:%s since:%v tail:%d follow:%v",
"name: %s namespace: %s instance: %s since: %v tail: %d follow: %v",
r.Name, r.Namespace, r.Instance, r.Since, r.Tail, r.Follow,
)
}
@ -55,8 +55,12 @@ type Message struct {
// String implements the Stringer interface and allows for nice and simple string formatting of a log Message.
func (m Message) String() string {
ns := ""
if len(m.Namespace) > 0 {
ns = fmt.Sprintf("%s ", m.Namespace)
}
return fmt.Sprintf(
"%s %s (%s %s) %s",
m.Timestamp.String(), m.Name, m.Namespace, m.Instance, m.Text,
"%s %s (%s%s) %s",
m.Timestamp.String(), m.Name, ns, m.Instance, m.Text,
)
}