cni: Allow text-ts log format value

The new log format (e.g. text-ts) is added recently in the below commit,
so we need to allow it in regex. Additionally, text-ts is used as the
default value if not specified or invalid.

Fixes: a099bf1
Signed-off-by: Tam Mach <tam.mach@cilium.io>

pkg/logging/logging.go

@@ -36,7 +36,7 @@ const (
 	// we want to use (possible values: text or json)
 	DefaultLogFormat LogFormat = LogFormatText
 
-	// DefaultLogFormat is the string representation of the default logrus.Formatter
+	// DefaultLogFormatTimestamp is the string representation of the default logrus.Formatter
 	// including timestamps.
 	// We don't use this for general runtime logs since kubernetes log capture handles those.
 	// This is only used for applications such as CNI which is written to disk so we have no
@@ -85,7 +85,7 @@ type LogOptions map[string]string
 // settings.
 func initializeDefaultLogger() (logger *logrus.Logger) {
 	logger = logrus.New()
-	logger.SetFormatter(GetFormatter(DefaultLogFormat))
+	logger.SetFormatter(GetFormatter(DefaultLogFormatTimestamp))
 	logger.SetLevel(DefaultLogLevel)
 	return
 }
@@ -112,16 +112,16 @@ func (o LogOptions) GetLogLevel() (level logrus.Level) {
 func (o LogOptions) GetLogFormat() LogFormat {
 	formatOpt, ok := o[FormatOpt]
 	if !ok {
-		return DefaultLogFormat
+		return DefaultLogFormatTimestamp
 	}
 
 	formatOpt = strings.ToLower(formatOpt)
-	re := regexp.MustCompile(`^(text|json|json-ts)$`)
+	re := regexp.MustCompile(`^(text|text-ts|json|json-ts)$`)
 	if !re.MatchString(formatOpt) {
 		logrus.WithError(
-			fmt.Errorf("incorrect log format configured '%s', expected 'text', 'json' or 'json-ts'", formatOpt),
+			fmt.Errorf("incorrect log format configured '%s', expected 'text', 'text-ts', 'json' or 'json-ts'", formatOpt),
 		).Warning("Ignoring user-configured log format")
-		return DefaultLogFormat
+		return DefaultLogFormatTimestamp
 	}
 
 	return LogFormat(formatOpt)
@@ -149,7 +149,7 @@ func SetLogFormat(logFormat LogFormat) {
 
 // SetDefaultLogFormat updates the DefaultLogger with the DefaultLogFormat
 func SetDefaultLogFormat() {
-	DefaultLogger.SetFormatter(GetFormatter(DefaultLogFormat))
+	DefaultLogger.SetFormatter(GetFormatter(DefaultLogFormatTimestamp))
 }
 
 // AddHooks adds additional logrus hook to default logger