From 3d4c705aecd789e7a4313d2d646e073c7937b30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=82=9F=E7=A9=BA?= Date: Wed, 9 Apr 2025 09:54:03 +0800 Subject: [PATCH 1/2] fix: update ADC to use JSON instead of YAML --- internal/provider/adc/adc.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/internal/provider/adc/adc.go b/internal/provider/adc/adc.go index bec7ab17c..abfd952b3 100644 --- a/internal/provider/adc/adc.go +++ b/internal/provider/adc/adc.go @@ -8,12 +8,6 @@ import ( "os" "os/exec" - "go.uber.org/zap" - 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" "github.com/api7/api7-ingress-controller/internal/controller/config" @@ -21,6 +15,10 @@ import ( "github.com/api7/api7-ingress-controller/internal/provider" "github.com/api7/api7-ingress-controller/internal/provider/adc/translator" "github.com/api7/gopkg/pkg/log" + "go.uber.org/zap" + networkingv1 "k8s.io/api/networking/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" ) type adcClient struct { @@ -119,12 +117,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 +131,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 From a928ae46d76204dc55fd536f9182914a237a5ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=82=9F=E7=A9=BA?= Date: Wed, 9 Apr 2025 10:03:59 +0800 Subject: [PATCH 2/2] fmt --- internal/provider/adc/adc.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/provider/adc/adc.go b/internal/provider/adc/adc.go index abfd952b3..285de1a1a 100644 --- a/internal/provider/adc/adc.go +++ b/internal/provider/adc/adc.go @@ -8,6 +8,11 @@ import ( "os" "os/exec" + "go.uber.org/zap" + networkingv1 "k8s.io/api/networking/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" + types "github.com/api7/api7-ingress-controller/api/adc" "github.com/api7/api7-ingress-controller/api/v1alpha1" "github.com/api7/api7-ingress-controller/internal/controller/config" @@ -15,10 +20,6 @@ import ( "github.com/api7/api7-ingress-controller/internal/provider" "github.com/api7/api7-ingress-controller/internal/provider/adc/translator" "github.com/api7/gopkg/pkg/log" - "go.uber.org/zap" - networkingv1 "k8s.io/api/networking/v1" - "sigs.k8s.io/controller-runtime/pkg/client" - gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" ) type adcClient struct {