Skip to content
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.

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

fix: zrpc kube resolver builder #4119

Merged
merged 7 commits into from
May 6, 2024
Merged
Changes from all commits
Commits
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
35 changes: 30 additions & 5 deletions zrpc/resolver/internal/kubebuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import (
"context"
"fmt"
"runtime/debug"
"time"

"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/proc"
"github.com/zeromicro/go-zero/core/threading"
"github.com/zeromicro/go-zero/zrpc/resolver/internal/kube"
"google.golang.org/grpc/resolver"
Expand All @@ -21,10 +21,30 @@
nameSelector = "metadata.name="
)

type kubeResolver struct {
cc resolver.ClientConn
stopCh chan struct{}
inf informers.SharedInformerFactory
}

func (r *kubeResolver) start() {
threading.GoSafe(func() {
r.inf.Start(r.stopCh)
})

Check warning on line 33 in zrpc/resolver/internal/kubebuilder.go

View check run for this annotation

Codecov / codecov/patch

zrpc/resolver/internal/kubebuilder.go#L30-L33

Added lines #L30 - L33 were not covered by tests
}

func (r *kubeResolver) ResolveNow(_ resolver.ResolveNowOptions) {}

Check warning on line 36 in zrpc/resolver/internal/kubebuilder.go

View check run for this annotation

Codecov / codecov/patch

zrpc/resolver/internal/kubebuilder.go#L36

Added line #L36 was not covered by tests

func (r *kubeResolver) Close() {
close(r.stopCh)

Check warning on line 39 in zrpc/resolver/internal/kubebuilder.go

View check run for this annotation

Codecov / codecov/patch

zrpc/resolver/internal/kubebuilder.go#L38-L39

Added lines #L38 - L39 were not covered by tests
}

type kubeBuilder struct{}

func (b *kubeBuilder) Build(target resolver.Target, cc resolver.ClientConn,
_ resolver.BuildOptions) (resolver.Resolver, error) {
logx.Debugf("target: %s, callstack: %s, cc ptr: %p", target, string(debug.Stack()), cc)

svc, err := kube.ParseTarget(target)
if err != nil {
return nil, err
Expand Down Expand Up @@ -73,17 +93,22 @@
return nil, err
}

threading.GoSafe(func() {
inf.Start(proc.Done())
})
endpoints, err := cs.CoreV1().Endpoints(svc.Namespace).Get(context.Background(), svc.Name, v1.GetOptions{})
if err != nil {
return nil, err
}

handler.Update(endpoints)

return &nopResolver{cc: cc}, nil
resolver := &kubeResolver{
cc: cc,
stopCh: make(chan struct{}),
inf: inf,

Check warning on line 106 in zrpc/resolver/internal/kubebuilder.go

View check run for this annotation

Codecov / codecov/patch

zrpc/resolver/internal/kubebuilder.go#L103-L106

Added lines #L103 - L106 were not covered by tests
}

resolver.start()

Check warning on line 109 in zrpc/resolver/internal/kubebuilder.go

View check run for this annotation

Codecov / codecov/patch

zrpc/resolver/internal/kubebuilder.go#L109

Added line #L109 was not covered by tests

return resolver, nil

Check warning on line 111 in zrpc/resolver/internal/kubebuilder.go

View check run for this annotation

Codecov / codecov/patch

zrpc/resolver/internal/kubebuilder.go#L111

Added line #L111 was not covered by tests
}

func (b *kubeBuilder) Scheme() string {
Expand Down