bugfix: check int type is empty

check int type is empty when do the merge.

Signed-off-by: Rudy Zhang <[email protected]>

Author: rudyfly

daemon/config/config.go

@@ -17,6 +17,7 @@ import (
 	"github.com/alibaba/pouch/pkg/utils"
 	"github.com/alibaba/pouch/storage/volume"
 
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 )
 
@@ -131,6 +132,10 @@ func (cfg *Config) GetCgroupDriver() string {
 
 // Validate validates the user input config.
 func (cfg *Config) Validate() error {
+	// for debug config file.
+	b, _ := json.Marshal(cfg)
+	logrus.Debugf("daemon config: (%s)", string(b))
+
 	// deduplicated elements in slice if there is any.
 	cfg.Listen = utils.DeDuplicate(cfg.Listen)
 	cfg.Labels = utils.DeDuplicate(cfg.Labels)
@@ -193,7 +198,6 @@ func (cfg *Config) MergeConfigurations(flagSet *pflag.FlagSet) error {
 	// merge configurations from command line flags and config file
 	err = mergeConfigurations(fileConfig, cfg.delValue(flagSet, fileFlags))
 	return err
-
 }
 
 // delValue deleles value in config, since we do not do conflict check for slice

pkg/utils/utils.go

@@ -122,6 +122,8 @@ func isEmptyValue(v reflect.Value) bool {
 	switch v.Kind() {
 	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
 		return v.Len() == 0
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return v.Int() == 0
 	case reflect.Uintptr:
 		return v.Uint() == 0
 	case reflect.Float32, reflect.Float64: