Skip to content

fix: update ADC to use JSON instead of YAML #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 9, 2025
Merged

fix: update ADC to use JSON instead of YAML #86

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d4c705
fix: update ADC to use JSON instead of YAML
dspo Apr 9, 2025
a928ae4
fmt
dspo Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions internal/provider/adc/adc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,17 @@ 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"
"github.com/api7/api7-ingress-controller/internal/controller/label"
"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 {
Expand Down Expand Up @@ -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
}
Expand All @@ -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
Expand Down
Loading