Merge pull request #531 from longngn/yaml-unmarshal

[MTB] refactor: use yaml unmarshal

benchmarks/e2e/config/config.go

@@ -7,15 +7,15 @@ import (
 const ConfigPath = "./config.yaml"
 
 type BenchmarkConfig struct {
-	Adminkubeconfig string     `json:"adminKubeconfig"`
-	Label           string     `json:"label,omitempty"`
-	TenantA         TenantSpec `json:"tenantA,omitempty"`
-	TenantB         TenantSpec `json:"tenantB,omitempty"`
+	Adminkubeconfig string     `yaml:"adminKubeconfig"`
+	Label           string     `yaml:"label,omitempty"`
+	TenantA         TenantSpec `yaml:"tenantA,omitempty"`
+	TenantB         TenantSpec `yaml:"tenantB,omitempty"`
 }
 
 type TenantSpec struct {
-	Kubeconfig string `json:"kubeconfig"`
-	Namespace  string `json:"namespace"`
+	Kubeconfig string `yaml:"kubeconfig"`
+	Namespace  string `yaml:"namespace"`
 }
 
 func (c *BenchmarkConfig) GetValidTenant() TenantSpec {

benchmarks/e2e/config/utils.go

@@ -1,11 +1,10 @@
 package test
 
 import (
-	"encoding/json"
 	"io/ioutil"
 	"os"
 
-	yaml "k8s.io/apimachinery/pkg/util/yaml"
+	"gopkg.in/yaml.v2"
 	kubernetes "k8s.io/client-go/kubernetes"
 	clientcmd "k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -39,12 +38,7 @@ func ReadConfig(path string) (*BenchmarkConfig, error) {
 		return nil, err
 	}
 
-	data, err := yaml.ToJSON(file)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(data, &config); err != nil {
+	if err := yaml.Unmarshal(file, &config); err != nil {
 		return nil, err
 	}