Merge branch 'master' of github.com:replicatedhq/kots into 1.19.0

replicatedhq · Sep 11, 2020 · 07e5805 · 07e5805
2 parents 02f44a5 + c48e8bb
commit 07e5805
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 8 deletions.
diff --git a/kotsadm/cmd/kotsadm/cli/api.go b/kotsadm/cmd/kotsadm/cli/api.go
@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/replicatedhq/kots/kotsadm/pkg/apiserver"
+	"github.com/replicatedhq/kots/kotsadm/pkg/logger"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -17,6 +18,12 @@ func APICmd() *cobra.Command {
 			viper.BindPFlags(cmd.Flags())
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
+			v := viper.GetViper()
+
+			if v.GetString("log-level") == "debug" {
+				logger.SetDebug()
+			}
+
 			apiserver.Start()
 			return nil
 		},

diff --git a/kotsadm/cmd/kotsadm/cli/restore.go b/kotsadm/cmd/kotsadm/cli/restore.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"github.com/replicatedhq/kots/kotsadm/pkg/logger"
 	"github.com/replicatedhq/kots/kotsadm/pkg/snapshot"
 	"github.com/replicatedhq/kots/pkg/kotsadm"
 	kotsadmtypes "github.com/replicatedhq/kots/pkg/kotsadm/types"
@@ -26,6 +27,11 @@ func RestoreCmd() *cobra.Command {
 				os.Exit(1)
 			}
 
+			v := viper.GetViper()
+			if v.GetString("log-level") == "debug" {
+				logger.SetDebug()
+			}
+
 			if err := kotsadm.Delete(&kotsadmtypes.DeleteOptions{}); err != nil {
 				return errors.Wrap(err, "failed to delete kotsadm")
 			}

diff --git a/kotsadm/cmd/kotsadm/cli/root.go b/kotsadm/cmd/kotsadm/cli/root.go
@@ -25,6 +25,8 @@ func RootCmd() *cobra.Command {
 
 	cobra.OnInitialize(initConfig)
 
+	cmd.PersistentFlags().String("log-level", "info", "set the log level")
+
 	cmd.AddCommand(APICmd())
 	cmd.AddCommand(OperatorCmd())
 	cmd.AddCommand(RestoreCmd())

diff --git a/kotsadm/kustomize/overlays/dev/deployment.yaml b/kotsadm/kustomize/overlays/dev/deployment.yaml
@@ -21,6 +21,8 @@ spec:
             - name: kubelet-client-cert
               mountPath: /etc/kubernetes/pki/kubelet
           env:
+            - name: KOTSADM_LOG_LEVEL
+              value: "debug"
             - name: DISABLE_SPA_SERVING
               value: "1"
             - name: KOTSADM_TARGET_NAMESPACE

diff --git a/kotsadm/pkg/handlers/snapshots.go b/kotsadm/pkg/handlers/snapshots.go
@@ -439,7 +439,7 @@ func GetVeleroStatus(w http.ResponseWriter, r *http.Request) {
 
 	if detectVelero == nil {
 		getVeleroStatusResponse.IsVeleroInstalled = false
-		JSON(w, 404, getVeleroStatusResponse)
+		JSON(w, 200, getVeleroStatusResponse)
 		return
 	}
 

diff --git a/kotsadm/pkg/logger/logger.go b/kotsadm/pkg/logger/logger.go
@@ -1,20 +1,35 @@
 package logger
 
 import (
+	"os"
+
 	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 )
 
 var log *zap.Logger
+var atom zap.AtomicLevel
 
 func init() {
-	l, err := zap.NewDevelopment(zap.AddCallerSkip(1))
-	if err != nil {
-		panic(err)
-	}
+	atom = zap.NewAtomicLevel()
+	atom.SetLevel(zapcore.InfoLevel)
+
+	encoderCfg := zap.NewProductionEncoderConfig()
+
+	l := zap.New(zapcore.NewCore(
+		zapcore.NewJSONEncoder(encoderCfg),
+		zapcore.Lock(os.Stdout),
+		atom,
+	))
+	defer l.Sync()
 
 	log = l
 }
 
+func SetDebug() {
+	atom.SetLevel(zapcore.DebugLevel)
+}
+
 func Error(err error) {
 	defer log.Sync()
 	sugar := log.Sugar()
@@ -24,7 +39,7 @@ func Error(err error) {
 func Errorf(template string, args ...interface{}) {
 	defer log.Sync()
 	sugar := log.Sugar()
-	sugar.Errorf(template, args...)
+	sugar.Errorf(template, args)
 }
 
 func Info(msg string, fields ...zap.Field) {
@@ -36,7 +51,7 @@ func Info(msg string, fields ...zap.Field) {
 func Infof(template string, args ...interface{}) {
 	defer log.Sync()
 	sugar := log.Sugar()
-	sugar.Infof(template, args...)
+	sugar.Infof(template, args)
 }
 
 func Debug(msg string, fields ...zap.Field) {
@@ -48,5 +63,5 @@ func Debug(msg string, fields ...zap.Field) {
 func Debugf(template string, args ...interface{}) {
 	defer log.Sync()
 	sugar := log.Sugar()
-	sugar.Debugf(template, args...)
+	sugar.Debugf(template, args)
 }