build(deps): bump the k8s group with 5 updates
Bumps the k8s group with 5 updates: | Package | From | To | | --- | --- | --- | | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.30.3` | `0.31.0` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.30.3` | `0.31.0` | | [k8s.io/component-base](https://github.com/kubernetes/component-base) | `0.30.3` | `0.31.0` | | [k8s.io/kubelet](https://github.com/kubernetes/kubelet) | `0.30.3` | `0.31.0` | | [k8s.io/utils](https://github.com/kubernetes/utils) | `0.0.0-20230726121419-3b25d923346b` | `0.0.0-20240711033017-18e509b52bc8` | Updates `k8s.io/apimachinery` from 0.30.3 to 0.31.0 - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.30.3...v0.31.0) Updates `k8s.io/client-go` from 0.30.3 to 0.31.0 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/kubernetes/client-go/compare/v0.30.3...v0.31.0) Updates `k8s.io/component-base` from 0.30.3 to 0.31.0 - [Commits](https://github.com/kubernetes/component-base/compare/v0.30.3...v0.31.0) Updates `k8s.io/kubelet` from 0.30.3 to 0.31.0 - [Commits](https://github.com/kubernetes/kubelet/compare/v0.30.3...v0.31.0) Updates `k8s.io/utils` from 0.0.0-20230726121419-3b25d923346b to 0.0.0-20240711033017-18e509b52bc8 - [Commits](https://github.com/kubernetes/utils/commits) --- updated-dependencies: - dependency-name: k8s.io/apimachinery dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s - dependency-name: k8s.io/component-base dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s - dependency-name: k8s.io/kubelet dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s - dependency-name: k8s.io/utils dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
43
vendor/github.com/moby/spdystream/connection.go
generated
vendored
43
vendor/github.com/moby/spdystream/connection.go
generated
vendored
@@ -208,9 +208,10 @@ type Connection struct {
|
||||
nextStreamId spdy.StreamId
|
||||
receivedStreamId spdy.StreamId
|
||||
|
||||
pingIdLock sync.Mutex
|
||||
pingId uint32
|
||||
pingChans map[uint32]chan error
|
||||
// pingLock protects pingChans and pingId
|
||||
pingLock sync.Mutex
|
||||
pingId uint32
|
||||
pingChans map[uint32]chan error
|
||||
|
||||
shutdownLock sync.Mutex
|
||||
shutdownChan chan error
|
||||
@@ -274,16 +275,20 @@ func NewConnection(conn net.Conn, server bool) (*Connection, error) {
|
||||
// returns the response time
|
||||
func (s *Connection) Ping() (time.Duration, error) {
|
||||
pid := s.pingId
|
||||
s.pingIdLock.Lock()
|
||||
s.pingLock.Lock()
|
||||
if s.pingId > 0x7ffffffe {
|
||||
s.pingId = s.pingId - 0x7ffffffe
|
||||
} else {
|
||||
s.pingId = s.pingId + 2
|
||||
}
|
||||
s.pingIdLock.Unlock()
|
||||
pingChan := make(chan error)
|
||||
s.pingChans[pid] = pingChan
|
||||
defer delete(s.pingChans, pid)
|
||||
s.pingLock.Unlock()
|
||||
defer func() {
|
||||
s.pingLock.Lock()
|
||||
delete(s.pingChans, pid)
|
||||
s.pingLock.Unlock()
|
||||
}()
|
||||
|
||||
frame := &spdy.PingFrame{Id: pid}
|
||||
startTime := time.Now()
|
||||
@@ -612,10 +617,14 @@ func (s *Connection) handleDataFrame(frame *spdy.DataFrame) error {
|
||||
}
|
||||
|
||||
func (s *Connection) handlePingFrame(frame *spdy.PingFrame) error {
|
||||
if s.pingId&0x01 != frame.Id&0x01 {
|
||||
s.pingLock.Lock()
|
||||
pingId := s.pingId
|
||||
pingChan, pingOk := s.pingChans[frame.Id]
|
||||
s.pingLock.Unlock()
|
||||
|
||||
if pingId&0x01 != frame.Id&0x01 {
|
||||
return s.framer.WriteFrame(frame)
|
||||
}
|
||||
pingChan, pingOk := s.pingChans[frame.Id]
|
||||
if pingOk {
|
||||
close(pingChan)
|
||||
}
|
||||
@@ -731,16 +740,14 @@ func (s *Connection) shutdown(closeTimeout time.Duration) {
|
||||
|
||||
if err != nil {
|
||||
duration := 10 * time.Minute
|
||||
time.AfterFunc(duration, func() {
|
||||
select {
|
||||
case err, ok := <-s.shutdownChan:
|
||||
if ok {
|
||||
debugMessage("Unhandled close error after %s: %s", duration, err)
|
||||
}
|
||||
default:
|
||||
}
|
||||
})
|
||||
s.shutdownChan <- err
|
||||
timer := time.NewTimer(duration)
|
||||
defer timer.Stop()
|
||||
select {
|
||||
case s.shutdownChan <- err:
|
||||
// error was handled
|
||||
case <-timer.C:
|
||||
debugMessage("Unhandled close error after %s: %s", duration, err)
|
||||
}
|
||||
}
|
||||
close(s.shutdownChan)
|
||||
}
|
||||
|
||||
2
vendor/github.com/moby/spdystream/stream.go
generated
vendored
2
vendor/github.com/moby/spdystream/stream.go
generated
vendored
@@ -305,6 +305,8 @@ func (s *Stream) Identifier() uint32 {
|
||||
// IsFinished returns whether the stream has finished
|
||||
// sending data
|
||||
func (s *Stream) IsFinished() bool {
|
||||
s.finishLock.Lock()
|
||||
defer s.finishLock.Unlock()
|
||||
return s.finished
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user