Commit Graph

2492 Commits

Author SHA1 Message Date
Kubernetes Publisher 8577c320c8 Merge pull request #84966 from liggitt/automated-cherry-pick-of-#84963-upstream-release-1.14
Automated cherry pick of #84963: json unmarshal coded error at function applyJSPatch()

Kubernetes-commit: 174df5b8d1cef183959791daeff00ffab667f27c
2019-11-09 01:55:54 +00:00
Kubernetes Publisher 28be6b3e6d Merge pull request #84962 from liggitt/automated-cherry-pick-of-#84693-upstream-release-1.14
Automated cherry pick of #84693: Stop Watching when there is encoding error

Kubernetes-commit: b458c4e56bb0702fa88e25af7e33b912ab63715c
2019-11-08 15:56:00 -08:00
Ted Yu ea58a61cf5 Stop Watching when there is encoding error
Kubernetes-commit: 79c25d60062d82a107c35c6ae80be926c91f4eca
2019-11-07 14:32:47 -08:00
attlee-wang b6605aa4b6 json unmarshal coded error at function applyJSPatch()
Kubernetes-commit: 0b817a6353817d8ddf5fe58c6c73017beac307d4
2019-11-07 20:40:28 +08:00
Kubernetes Publisher 9ce82fc3a4 Merge pull request #84780 from RainbowMango/manually-cherry-pick-of-#83427-upstream-release-1.14
Manually cherry pick of #83427: Fix double counting issue for request metrics on timeout

Kubernetes-commit: 9aed496008521d33f2eff5e15d2a61d1ae319538
2019-11-07 01:54:58 +00:00
RainbowMango f04a5fe4f8 Cherry-pick #83427
Fix double counting issue for request metrics on timeout.

Kubernetes-commit: 02fdb52f0f26d2d13f3f9b63321793740b63c745
2019-11-05 17:07:41 +08:00
Kubernetes Publisher 3893be10d3 Merge pull request #82639 from enj/automated-cherry-pick-of-#82638-upstream-release-1.14
[1.14] Automated cherry pick of #82638: Encryption config: correctly handle overlapping providers

Kubernetes-commit: fe24a1d23315d839cd1e79ca8ec8357ece641585
2019-10-10 01:43:13 +00:00
Kubernetes Publisher d62eae5221 Merge pull request #83373 from liggitt/automated-cherry-pick-of-#83333-upstream-release-1.14
Automated cherry pick of #83333: Don't leak a go routine on timeout

Kubernetes-commit: b1d90868ad049c8db13d4240f21e13ce3ec550a3
2019-10-09 17:43:11 +00:00
Kubernetes Publisher 6ece93cf38 Merge pull request #83435 from liggitt/automated-cherry-pick-of-#83261-upstream-release-1.14
[1.14] Automated cherry pick of #83261: bump gopkg.in/yaml.v2 v2.2.4

Kubernetes-commit: bdc7ad2ca2d8f54b59ca076981535b769627834d
2019-10-04 10:37:52 +00:00
Daniel Smith 46dec7872c Don't leak a go routine on panic
Kubernetes-commit: 5f82013faba48c2fd98c96b20da6a305792e6d4c
2019-09-30 11:34:15 -07:00
Jordan Liggitt dbfb631535 Limit YAML/JSON decode size
Kubernetes-commit: 9f8fd1d6ed79dfae347d8d5f20378cdfd02810ca
2019-09-27 16:36:48 -04:00
Jordan Liggitt 8bd37c3ca2 bump gopkg.in/yaml.v2 v2.2.4
Kubernetes-commit: bbb8be5e548b438d4db49822f6019f11910d17ce
2019-10-02 14:46:08 -04:00
Kubernetes Publisher ac9c319f41 Merge pull request #83141 from liggitt/automated-cherry-pick-of-#80465-upstream-release-1.14
Automated cherry pick of #80465 #83250: remove apiserver loopback client QPS limit

Kubernetes-commit: ac609db45e80bc9f5ed7d463e191e756ed13029c
2019-09-27 13:45:36 -07:00
Monis Khan 20ef4329e4 Encryption config: correctly handle overlapping providers
This change updates NewPrefixTransformers to not short-circuit on
the first transformer that has a matching prefix.  If the same type
of encryption ProviderConfiguration is used more than once, they
will share the same prefix.  A failure in the first one should not
prevent a later match from being attempted.

Added TestCBCKeyRotationWithOverlappingProviders unit test to
prevent regressions.  Note that this test explicitly exercises this
flow using an EncryptionConfiguration object as the structure of the
resulting transformer is an important part of the check.

Signed-off-by: Monis Khan <mkhan@redhat.com>

Kubernetes-commit: 7fe6508efcdfc403142a6dd9b7ad83fb6f006a8f
2019-09-06 16:24:47 -04:00
chenjun.cj daeb7f6009 remove apiserver loopback client QPS limit
Kubernetes-commit: ca4ecde429005c5063b43d29f09f4e305c176100
2019-07-23 16:35:45 +08:00
Kubernetes Publisher e0eab8d3a4 Merge pull request #82310 from roycaihw/automated-cherry-pick-of-#82303-upstream-release-1.14
Automated cherry pick of #82303: in GuaranteedUpdate, retry on precondition check failure if we are working with cached data

Kubernetes-commit: de90ca751c8dc4581929c9321460508c63dfbf96
2019-09-10 19:54:48 -07:00
Haowei Cai ab3a4c8006 in GuaranteedUpdate, retry on precondition check failure if we are working with cached data
Kubernetes-commit: 1a167b8025835672b1beb0f795a772ecd4660804
2019-09-03 17:26:39 -07:00
Haowei Cai 99515baf42 test
Kubernetes-commit: 763c620e2952479192871d6686a809d14e8e7c56
2019-09-03 17:09:12 -07:00
Kubernetes Publisher 051ff9eff4 Merge pull request #81521 from cblecker/automated-cherry-pick-of-#78958-#79966-#81390-#81489-upstream-release-1.14
Update release-1.14 to go 1.12.9

Kubernetes-commit: 96fac5cd13a5dc064f7d9f4f23030a6aeface6cc
2019-08-16 22:28:13 +00:00
Kubernetes Publisher e518dd5553 Merge pull request #81525 from cblecker/1.14-x/net
Update golang/x/net dependency on release-1.14

Kubernetes-commit: 8d394792b0e36316371ba90b51bfe64381e2e88a
2019-08-16 22:27:26 +00:00
Christoph Blecker 9cc0eb06b0 Update generated protobufs
Kubernetes-commit: 73c04baebcfa9fdb19648d491fc75a2c3cf4d075
2019-08-16 11:58:56 -07:00
Christoph Blecker 60b3d37fc9 Update golang/x/net dependency
Kubernetes-commit: 4a9f1962500b3570bee33614f5d34ac5935d89fc
2019-08-16 11:49:44 -07:00
Kubernetes Publisher e5f5c6e528 Merge pull request #79182 from tallclair/automated-cherry-pick-of-#78313-upstream-release-1.14
Automated cherry pick of #78313: Avoid the default server mux

Kubernetes-commit: 2cc510093384165b1a1d07f93dab3a096d29d364
2019-07-04 10:14:51 +00:00
Kubernetes Publisher 449339fbe7 Merge pull request #79575 from nikhita/ipv6-unit-test-fix
Allow unit test to pass on machines without ipv6

Kubernetes-commit: c5a761cc6ec38ebd0a6bf0308e5310e306f1546d
2019-07-01 09:21:23 -07:00
Jordan Liggitt cbc3cd0466 Allow unit test to pass on machines without ipv6
Kubernetes-commit: a50985cbb009fae7785d694859f59b2e484340ff
2019-06-28 10:39:28 -07:00
Kubernetes Publisher 24fd0f18bc Merge pull request #78034 from liggitt/automated-cherry-pick-of-#78029-upstream-release-1.14
Automated cherry pick of #78029: Terminate watchers when watch cache is destroyed

Kubernetes-commit: 9150633414dcc9ca4685c1c404cfdc76c49dd330
2019-05-31 03:14:30 +00:00
Kubernetes Publisher e7cfcff547 Merge pull request #77875 from caesarxuchao/automated-cherry-pick-of-#77619-upstream-release-1.14
Automated cherry pick of #77619: In GuaranteedUpdate, retry on any error if we are working

Kubernetes-commit: 92e692de59b6c6e80a46f77f379070e7b416ac4c
2019-05-21 19:20:03 +00:00
Kubernetes Publisher 6eed424036 Merge pull request #77897 from mikedanese/automated-cherry-pick-of-#77613-upstream-release-1.14
Automated cherry pick of #77613 upstream release 1.14

Kubernetes-commit: 484ab1431d8c7afb8e2cb37578c731df72840406
2019-05-21 19:19:28 +00:00
Jordan Liggitt ec0d918fbf Terminate watchers when watch cache is destroyed
Kubernetes-commit: 21b9a31c3308c1f4c0e3b5492fbe0301f2bfeaf7
2019-05-17 10:02:08 -04:00
Tim Allclair 0059444fe7 Avoid the default server mux
Kubernetes-commit: 0f9623d937a5c5a4b06b405645554fe52822399d
2019-05-16 17:31:16 -07:00
Mike Danese cfb8fffae9 BoundServiceAccountTokenVolume: fix InClusterConfig
Kubernetes-commit: 6919c6e1ab3dcd3f02bcbf3c6f106089d867090b
2019-05-14 09:29:16 -07:00
Chao Xu ae1821fc59 In GuaranteedUpdate, retry on any error if we are working with stale data
Kubernetes-commit: 0a7e849adfa13c5b0306db627e5c0a338867c669
2019-05-08 15:05:07 -07:00
Kubernetes Publisher 5c7fdad0ef Merge pull request #77393 from liggitt/automated-cherry-pick-of-#76675-upstream-release-1.14
Automated cherry pick of #76675: Error when etcd3 watch finds delete event with nil prevKV

Kubernetes-commit: 09f3af06e3d0d40495d3fc41ba6e8f8af18bc816
2019-05-06 23:08:26 +00:00
Ryan McNamara 55c2f36bae Error when etcd3 watch finds delete event with nil prevKV
Kubernetes-commit: c9731088e4b471d2065ede04904a1978073433d2
2019-04-16 12:55:15 -07:00
Kubernetes Publisher 8b27c41bdb Merge remote-tracking branch 'origin/master' into release-1.14
Kubernetes-commit: 1ddce0577ab12daa1f934562debb0563b5c44fe7
2019-03-13 20:51:20 +00:00
Kubernetes Publisher 75f4d4308d Merge pull request #75289 from dims/update-http2-dep-go-1.12
Update golang.org/x/net/... dependencies to release-branch.go1.12

Kubernetes-commit: e7d09ceb5019153831b4921ff35a170e46f634d2
2019-03-14 00:04:00 +00:00
Kubernetes Publisher fa00273c5b Merge remote-tracking branch 'origin/master' into release-1.14
Kubernetes-commit: 49f639c01619b515e31cb8586f42ad8d9604416d
2019-03-13 12:11:19 +00:00
Kubernetes Publisher 5ec12a8862 Merge pull request #75277 from jennybuckley/fix-ints
Fix server side apply int/float bug

Kubernetes-commit: 93402fc8e85dd980af2ca2007232065bb9cf0d5d
2019-03-13 12:10:46 +00:00
Kubernetes Publisher b66f75b6fe Merge pull request #74040 from ajatprabha/issue_73648
add ResourceVersion to DeleteOptions.Preconditions

Kubernetes-commit: cc8afb25fcfbb2a12ef43300db89d724b284e3e3
2019-03-13 12:10:46 +00:00
Kubernetes Publisher 4292040afc Merge pull request #75157 from aaron-prindle/version-check-apply
Added version check between patch and live object in server side apply

Kubernetes-commit: 0977ab69ade1fb9e286fe8cc6075fe1ac00ef3ca
2019-03-13 12:10:45 +00:00
Davanum Srinivas 713f476018 Update to go 1.12 version of golang.org/x/net
Change-Id: I3f2fa5d7b6811c9eca58992318d19e44ec9131fd

Kubernetes-commit: 2aa1348e6cf4d51f91025c41d41bb7e3b9b9384d
2019-03-12 09:16:45 -04:00
Kubernetes Publisher 8bbd9f58a9 Merge remote-tracking branch 'origin/master' into release-1.14
Kubernetes-commit: b1e389e6f7bd798a8dd162f82b918f509ac5291b
2019-03-12 12:06:44 +00:00
jennybuckley a4d17271a9 Fix int/float apply bug
Kubernetes-commit: 10259c959e9f20668659f7e20251a217b51c6355
2019-03-11 23:07:21 -07:00
Aaron Prindle 8d31b4328a Added version check between patch and live object in server side apply
What is the problem being solved?
https://github.com/kubernetes/kubernetes/pull/75135
Currently version compatibility is not being checked in server side apply between the patch object and the live object.  This is causing a merge that will error to be run and the apiserver returns a 500 error.  The request should fail if the apiVersion provided in the object is different from the apiVersion in the url, but it should fail before trying to merge, and be a 4xx error. Probably a bad request error.

Why is this the best approach?
The approach of serializing the patch byte array and then checking for version equality with the already serialized live object is the simplest and most straightforward solution.

Kubernetes-commit: d5bd17cda0c134e5ef5c03c3eac79a9ce4e18003
2019-03-07 16:52:26 -08:00
ajatprabha 662a88c486 update testDeleteWithResourceVersion
Kubernetes-commit: fe3b9f486fe988cf6b6cd83c54c2be77892fa123
2019-02-25 22:43:28 +05:30
ajatprabha e5f4051bb1 add ResourceVersion check to Preconditions#Check
Kubernetes-commit: 3135cea2cce02bc8c6796e97f4579d538f357f74
2019-02-15 12:30:34 +05:30
ajatprabha 97b276251f check for ResourceVersion conflict in separate if block
Kubernetes-commit: 42f0a36f44bac33f4230fdea9f3dcc4bfb645a0a
2019-02-15 04:37:18 +05:30
ajatprabha d1c2dc1c5c add ResourceVersion to DeleteOptions.Preconditions
Kubernetes-commit: 8f48d762717dfe1f479cfabaabc4fb9261a1bc8f
2019-02-14 04:09:12 +05:30
Chao Xu 90ad52c432 generated BUILD
generated proto

Kubernetes-commit: 887cb93d8d74ac6491df850edef051bf607fceb6
2019-01-15 13:41:53 -08:00
Chao Xu 0ec764a7f9 Expose storage version hash
Kubernetes-commit: 3b618af0d435628feedf06f97bd1c69340d07d95
2019-01-14 19:31:25 -08:00