fix: fixed an issue where byte arrays are not correctly encoded when …

…fetching YAMLs
KusionStack · Dec 15, 2023 · 74be14b · 74be14b
1 parent e462939
commit 74be14b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/core/manager/cluster/manager.go b/pkg/core/manager/cluster/manager.go
@@ -34,6 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
+	k8syaml "sigs.k8s.io/yaml"
 )
 
 type ClusterManager struct {
@@ -165,7 +166,7 @@ func (c *ClusterManager) GetYAMLForCluster(ctx context.Context, client *multiclu
 	if err != nil {
 		return nil, err
 	}
-	return yaml.Marshal(obj)
+	return k8syaml.Marshal(obj)
 }
 
 // GetYAMLForCluster returns the yaml byte array for a given cluster

diff --git a/pkg/core/manager/resource/manager.go b/pkg/core/manager/resource/manager.go
@@ -24,10 +24,10 @@ import (
 	topologyutil "github.com/KusionStack/karbour/pkg/util/topology"
 	"github.com/dominikbraun/graph"
 	"github.com/dominikbraun/graph/draw"
-	yaml "gopkg.in/yaml.v3"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	k8syaml "sigs.k8s.io/yaml"
 )
 
 type ResourceManager struct {
@@ -56,7 +56,7 @@ func (c *ResourceManager) GetYAMLForResource(ctx context.Context, client *multic
 	if err != nil {
 		return nil, err
 	}
-	return yaml.Marshal(obj.Object)
+	return k8syaml.Marshal(obj.Object)
 }
 
 // GetTopologyForResource returns a map that describes topology for a given cluster