Compare commits

...

10 Commits

Author SHA1 Message Date
Kubernetes Publisher
54b7c48717 Update dependencies to v0.24.0-alpha.1 tag 2021-12-09 05:11:01 +00:00
Kubernetes Publisher
c713f38723 Merge pull request #106153 from hyschumi/refactor_thread_safe_store
refactor: remove dup code

Kubernetes-commit: e9fc46750f6da84d9434a8066d7d2ba1531c5d67
2021-12-08 05:04:35 +00:00
Kubernetes Publisher
d85d0d914a Merge pull request #106774 from SergeyKanzhelev/grpcFieldRename
Grpc field rename

Kubernetes-commit: 0fe049cb93683e488b9829316ac889bc4c2e42fc
2021-12-03 09:07:26 +00:00
Sergey Kanzhelev
2f5ae78650 generated files for the grpc field rename
Kubernetes-commit: 4c9d77d724069ec56140b686d3e8e280f5ab0274
2021-12-01 18:25:37 +00:00
Kubernetes Publisher
91177d7e4d Merge pull request #106716 from aojea/http1_flake_timeout
bump TestHTTP1DoNotReuseRequestAfterTimeout timeout

Kubernetes-commit: c1153d3353bd4f4b68d85245d53d2745586be474
2021-11-29 13:23:22 -08:00
Antonio Ojea
115ee0e475 bump TestHTTP1DoNotReuseRequestAfterTimeout timeout
the test TestHTTP1DoNotReuseRequestAfterTimeout has to wait for
request to time out to assert that subsequent requests does not
reuse the TCP connection.

It seems that current value of 100ms causes issues on some CI
environments and bumping the timeout seems to solve this flakiness,

We can bump the timeout value because is really low compared to real
scenarios and the bump still keeps it in the millisecond order.

Kubernetes-commit: 85797eba7075d83b116b5c91ff3b17c2d5118d01
2021-11-29 15:37:31 +01:00
Kubernetes Publisher
1218545a5b Merge pull request #106660 from liggitt/smd-merge
Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2

Kubernetes-commit: aff056d8a197f6a404ad5e02210ca662d16c3dbe
2021-12-03 09:07:23 +00:00
Jordan Liggitt
38ad836227 Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2
Kubernetes-commit: ed68909177eca588731bc153d2f69dd235e8fe10
2021-11-24 10:32:24 -05:00
Kubernetes Publisher
0e6a989bc4 Merge pull request #99728 from mattcary/control
StatefulSet PVC auto-delete implementation

Kubernetes-commit: b8af116327cd5d8e5411cbac04e7d4d11d22485d
2021-12-03 09:07:22 +00:00
hyschumi
547d6c809a refactor: remove dup code
Signed-off-by: hyschumi<msliudongsheng@gmail.com>

Kubernetes-commit: da5d0a72d9d2a0948e21b746a8c6951dc40c0ce9
2021-11-04 21:11:53 +08:00
6 changed files with 12 additions and 16 deletions

View File

@@ -24,7 +24,7 @@ type ProbeHandlerApplyConfiguration struct {
Exec *ExecActionApplyConfiguration `json:"exec,omitempty"`
HTTPGet *HTTPGetActionApplyConfiguration `json:"httpGet,omitempty"`
TCPSocket *TCPSocketActionApplyConfiguration `json:"tcpSocket,omitempty"`
GRPC *GRPCActionApplyConfiguration `json:"gRPC,omitempty"`
GRPC *GRPCActionApplyConfiguration `json:"grpc,omitempty"`
}
// ProbeHandlerApplyConfiguration constructs an declarative configuration of the ProbeHandler type for use with

View File

@@ -5984,7 +5984,7 @@ var schemaYAML = typed.YAMLObject(`types:
- name: failureThreshold
type:
scalar: numeric
- name: gRPC
- name: grpc
type:
namedType: io.k8s.api.core.v1.GRPCAction
- name: httpGet

8
go.mod
View File

@@ -30,8 +30,8 @@ require (
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/protobuf v1.27.1
k8s.io/api v0.0.0-20211124232210-4c321cf829a0
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
k8s.io/api v0.24.0-alpha.1
k8s.io/apimachinery v0.24.0-alpha.1
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
@@ -40,6 +40,6 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211124232210-4c321cf829a0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
k8s.io/api => k8s.io/api v0.24.0-alpha.1
k8s.io/apimachinery => k8s.io/apimachinery v0.24.0-alpha.1
)

8
go.sum
View File

@@ -610,10 +610,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20211124232210-4c321cf829a0 h1:hTJnV20bAHUQZIzigjK3CvWqQuzeQP/C7AP72fzzEIo=
k8s.io/api v0.0.0-20211124232210-4c321cf829a0/go.mod h1:Iod80qmyxDiUr9X93OyKup/yGuYZGx8VK8nLuWpK9Yc=
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a h1:IggksFfccO+DgJNByne5JOJ+jfqpcMZRsYkwYGZ6qkA=
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
k8s.io/api v0.24.0-alpha.1 h1:RVP4DJ/3RW+8HLxDGMwgJ2wJFzLQjqVZZB0cGEpYV2I=
k8s.io/api v0.24.0-alpha.1/go.mod h1:iHNArmntqNPU7O1yswszG/LNV2MKEOnLxJjxN/zgeo8=
k8s.io/apimachinery v0.24.0-alpha.1 h1:gtxRrchGNsU1sYUkeQU/09TfAo03yW37IdlhQr8NHwo=
k8s.io/apimachinery v0.24.0-alpha.1/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

View File

@@ -2995,7 +2995,7 @@ func TestHTTP1DoNotReuseRequestAfterTimeout(t *testing.T) {
config := &Config{
Host: ts.URL,
Transport: utilnet.SetTransportDefaults(transport),
Timeout: 100 * time.Millisecond,
Timeout: 1 * time.Second,
// These fields are required to create a REST client.
ContentConfig: ContentConfig{
GroupVersion: &schema.GroupVersion{},

View File

@@ -71,11 +71,7 @@ type threadSafeMap struct {
}
func (c *threadSafeMap) Add(key string, obj interface{}) {
c.lock.Lock()
defer c.lock.Unlock()
oldObject := c.items[key]
c.items[key] = obj
c.updateIndices(oldObject, obj, key)
c.Update(key, obj)
}
func (c *threadSafeMap) Update(key string, obj interface{}) {