@@ -8,19 +8,17 @@ import (
88 "os"
99 "os/exec"
1010
11- "go.uber.org/zap"
12- networkingv1 "k8s.io/api/networking/v1"
13- "sigs.k8s.io/controller-runtime/pkg/client"
14- gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
15- "sigs.k8s.io/yaml"
16-
1711 types "github.com/api7/api7-ingress-controller/api/adc"
1812 "github.com/api7/api7-ingress-controller/api/v1alpha1"
1913 "github.com/api7/api7-ingress-controller/internal/controller/config"
2014 "github.com/api7/api7-ingress-controller/internal/controller/label"
2115 "github.com/api7/api7-ingress-controller/internal/provider"
2216 "github.com/api7/api7-ingress-controller/internal/provider/adc/translator"
2317 "github.com/api7/gopkg/pkg/log"
18+ "go.uber.org/zap"
19+ networkingv1 "k8s.io/api/networking/v1"
20+ "sigs.k8s.io/controller-runtime/pkg/client"
21+ gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
2422)
2523
2624type adcClient struct {
@@ -119,12 +117,12 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
119117func (d * adcClient ) sync (task Task ) error {
120118 log .Debugw ("syncing resources" , zap .Any ("task" , task ))
121119
122- data , err := yaml .Marshal (task .Resources )
120+ data , err := json .Marshal (task .Resources )
123121 if err != nil {
124122 return err
125123 }
126124
127- tmpFile , err := os .CreateTemp ("" , "adc-task-*.yaml " )
125+ tmpFile , err := os .CreateTemp ("" , "adc-task-*.json " )
128126 if err != nil {
129127 return err
130128 }
@@ -133,7 +131,7 @@ func (d *adcClient) sync(task Task) error {
133131 _ = os .Remove (tmpFile .Name ())
134132 }()
135133
136- log .Debugw ("generated adc yaml" , zap . String ( "file" , tmpFile .Name ()), zap . String ( "yaml" , string (data ) ))
134+ log .Debugf ("generated adc file, filename: %s, json: %s \n " , tmpFile .Name (), string (data ))
137135
138136 if _ , err := tmpFile .Write (data ); err != nil {
139137 return err
0 commit comments