Skip to content

chore(refactor): the translation of upstream #1295

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

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

chore(refactor): the translation of upstream #1295

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
59c54b9
refactor: translate upstream
AlinsRan Aug 24, 2022
95c4bc1
Merge branch 'apache:master' into refactor/upstream
AlinsRan Aug 29, 2022
4559b34
refactor TranslateEndpoint
AlinsRan Aug 29, 2022
57f604c
golangci-lint
AlinsRan Aug 30, 2022
33d472c
Merge branch 'apache:master' into refactor/upstream
AlinsRan Aug 30, 2022
f385ccd
update ingress tanslate upstream
AlinsRan Aug 31, 2022
e90b181
Merge branch 'master' into refactor/upstream
AlinsRan Sep 13, 2022
94f1b0d
resolve comment
AlinsRan Sep 13, 2022
0e08fb6
update TranslateEndpoint
AlinsRan Sep 13, 2022
23fe9e6
Merge branch 'master' into refactor/upstream
AlinsRan Sep 26, 2022
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
6 changes: 1 addition & 5 deletions pkg/providers/apisix/translation/apisix_plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,7 @@ func (t *translator) translateTrafficSplitPlugin(ctx *translation.TranslateConte
)

for _, backend := range backends {
svcClusterIP, svcPort, err := t.GetServiceClusterIPAndPort(&backend, ns)
if err != nil {
return nil, err
}
ups, err := t.translateService(ns, backend.ServiceName, backend.Subset, backend.ResolveGranularity, svcClusterIP, svcPort)
ups, err := t.TranslateUpstream(ns, backend.ServiceName, backend.Subset, backend.ResolveGranularity, backend.ServicePort)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/providers/apisix/translation/apisix_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ func TestTranslateTrafficSplitPluginBadCases(t *testing.T) {
cfg, err = tr.translateTrafficSplitPlugin(ctx, ar1.Namespace, 30, backends)
assert.Nil(t, cfg)
assert.NotNil(t, err)
assert.Equal(t, "service.spec.ports: port not defined", err.Error())
assert.Contains(t, err.Error(), "service.Spec.Ports: port.Name not defined")

backends[1].ServicePort.StrVal = "port2"
backends[1].ResolveGranularity = "service"
Expand Down
Loading