Merge remote-tracking branch 'origin/release-v2-dev' into feat/support_multi_ingress_class

Author: ronething

internal/provider/adc/adc.go

@@ -12,7 +12,6 @@ import (
 	networkingv1 "k8s.io/api/networking/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
-	"sigs.k8s.io/yaml"
 
 	types "github.com/api7/api7-ingress-controller/api/adc"
 	"github.com/api7/api7-ingress-controller/api/v1alpha1"
@@ -119,12 +118,12 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 func (d *adcClient) sync(task Task) error {
 	log.Debugw("syncing resources", zap.Any("task", task))
 
-	data, err := yaml.Marshal(task.Resources)
+	data, err := json.Marshal(task.Resources)
 	if err != nil {
 		return err
 	}
 
-	tmpFile, err := os.CreateTemp("", "adc-task-*.yaml")
+	tmpFile, err := os.CreateTemp("", "adc-task-*.json")
 	if err != nil {
 		return err
 	}
@@ -133,7 +132,7 @@ func (d *adcClient) sync(task Task) error {
 		_ = os.Remove(tmpFile.Name())
 	}()
 
-	log.Debugw("generated adc yaml", zap.String("file", tmpFile.Name()), zap.String("yaml", string(data)))
+	log.Debugf("generated adc file, filename: %s, json: %s\n", tmpFile.Name(), string(data))
 
 	if _, err := tmpFile.Write(data); err != nil {
 		return err