mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 18:53:35 +00:00
rebase: bump the k8s-dependencies group in /e2e with 3 updates
Bumps the k8s-dependencies group in /e2e with 3 updates: [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery), [k8s.io/cloud-provider](https://github.com/kubernetes/cloud-provider) and [k8s.io/pod-security-admission](https://github.com/kubernetes/pod-security-admission). Updates `k8s.io/apimachinery` from 0.32.3 to 0.33.0 - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.32.3...v0.33.0) Updates `k8s.io/cloud-provider` from 0.32.3 to 0.33.0 - [Commits](https://github.com/kubernetes/cloud-provider/compare/v0.32.3...v0.33.0) Updates `k8s.io/pod-security-admission` from 0.32.3 to 0.33.0 - [Commits](https://github.com/kubernetes/pod-security-admission/compare/v0.32.3...v0.33.0) --- updated-dependencies: - dependency-name: k8s.io/apimachinery dependency-version: 0.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/cloud-provider dependency-version: 0.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/pod-security-admission dependency-version: 0.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
committed by
mergify[bot]
parent
d52dc2c4ba
commit
dd77e72800
34
e2e/vendor/google.golang.org/grpc/resolver/manual/manual.go
generated
vendored
34
e2e/vendor/google.golang.org/grpc/resolver/manual/manual.go
generated
vendored
@ -62,7 +62,7 @@ type Resolver struct {
|
||||
// Fields actually belong to the resolver.
|
||||
// Guards access to below fields.
|
||||
mu sync.Mutex
|
||||
CC resolver.ClientConn
|
||||
cc resolver.ClientConn
|
||||
// Storing the most recent state update makes this resolver resilient to
|
||||
// restarts, which is possible with channel idleness.
|
||||
lastSeenState *resolver.State
|
||||
@ -78,12 +78,12 @@ func (r *Resolver) InitialState(s resolver.State) {
|
||||
func (r *Resolver) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
// Call BuildCallback after locking to avoid a race when UpdateState
|
||||
// or ReportError is called before Build returns.
|
||||
// Call BuildCallback after locking to avoid a race when UpdateState or CC
|
||||
// is called before Build returns.
|
||||
r.BuildCallback(target, cc, opts)
|
||||
r.CC = cc
|
||||
r.cc = cc
|
||||
if r.lastSeenState != nil {
|
||||
err := r.CC.UpdateState(*r.lastSeenState)
|
||||
err := r.cc.UpdateState(*r.lastSeenState)
|
||||
go r.UpdateStateCallback(err)
|
||||
}
|
||||
return r, nil
|
||||
@ -104,25 +104,27 @@ func (r *Resolver) Close() {
|
||||
r.CloseCallback()
|
||||
}
|
||||
|
||||
// UpdateState calls CC.UpdateState.
|
||||
// UpdateState calls UpdateState(s) on the channel. If the resolver has not
|
||||
// been Built before, this instead sets the initial state of the resolver, like
|
||||
// InitialState.
|
||||
func (r *Resolver) UpdateState(s resolver.State) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
var err error
|
||||
if r.CC == nil {
|
||||
panic("cannot update state as grpc.Dial with resolver has not been called")
|
||||
}
|
||||
err = r.CC.UpdateState(s)
|
||||
r.lastSeenState = &s
|
||||
if r.cc == nil {
|
||||
return
|
||||
}
|
||||
err := r.cc.UpdateState(s)
|
||||
r.UpdateStateCallback(err)
|
||||
}
|
||||
|
||||
// ReportError calls CC.ReportError.
|
||||
func (r *Resolver) ReportError(err error) {
|
||||
// CC returns r's ClientConn when r was last Built. Panics if the resolver has
|
||||
// not been Built before.
|
||||
func (r *Resolver) CC() resolver.ClientConn {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
if r.CC == nil {
|
||||
panic("cannot report error as grpc.Dial with resolver has not been called")
|
||||
if r.cc == nil {
|
||||
panic("Manual resolver instance has not yet been built.")
|
||||
}
|
||||
r.CC.ReportError(err)
|
||||
return r.cc
|
||||
}
|
||||
|
Reference in New Issue
Block a user