Commit Graph

3515 Commits

Author SHA1 Message Date
Kubernetes Publisher
80cc0af517 Update dependencies to v0.25.15 tag kubernetes-1.25.15 v0.25.15 2023-10-20 23:32:41 +00:00
Kubernetes Publisher
4f1c2e7b97 Merge pull request #121125 from MadhavJivrajani/bump-x-net-125
[1.25][CVE-2023-39325] .: bump golang.org/x/net to v0.17.0

Kubernetes-commit: 3da6e3c67afa5accc945cb78f4793e391e4791f0
2023-10-12 11:32:48 +00:00
Madhav Jivrajani
b3a295f82b .: bump golang.org/x/net to v0.17.0
Bumping golang.org/x/net in light of CVE-2023-39325 and CVE-2023-44487.

Signed-off-by: Madhav Jivrajani <madhav.jiv@gmail.com>

Kubernetes-commit: 3d980e0633d9043f1bc4e6a3141185fbece78183
2023-10-11 03:27:04 +05:30
Kubernetes Publisher
715525bc50 Merge pull request #120065 from HirazawaUi/automated-cherry-pick-of-#116506-upstream-release-1.25
Automated cherry pick of #116506: generate ReportingInstance and ReportingController in Event

Kubernetes-commit: 3f833a47f0970c1533b4a3163ac59ccec4ffc3a1
2023-08-28 01:17:43 -07:00
HirazawaUi
86b06c1be8 generate ReportingInstance and ReportingController in Event
Kubernetes-commit: 3d425a4a31bb513257dd0a9a067d12516957020e
2023-03-27 22:23:45 +08:00
Kubernetes Publisher
f20171e958 Merge pull request #119376 from dgrisonnet/automated-cherry-pick-of-#114237-#114236-#112334-upstream-release-1.25
Automated cherry pick of #114237: tools/events: retry on AlreadyExist for Series
#114236: tools/events: fix data race when emitting series
#112334: events: fix EventSeries starting count discrepancy

Kubernetes-commit: c242e3399f1fe573654b2a78e5fb8d006faabecf
2023-08-02 15:51:44 +00:00
Kubernetes Publisher
d98cb4daa7 Merge pull request #119115 from champtar/automated-cherry-pick-of-#118922-upstream-release-1.25
Automated cherry pick of #118922: kubeadm: backdate generated CAs

Kubernetes-commit: bc9e637fbbed4ec8c3c40f80c1d1a8c5e2e27494
2023-08-02 11:57:39 +00:00
Etienne Champetier
a1640357a4 client-go: allow to set NotBefore in NewSelfSignedCACert()
Signed-off-by: Etienne Champetier <e.champetier@ateme.com>

Kubernetes-commit: 5100606eb8ba2476dbe61224b97b9eef4ca874b0
2023-06-28 00:01:34 -04:00
Kubernetes Publisher
94abfc9324 Merge pull request #118972 from champtar/automated-cherry-pick-of-#117791-upstream-release-1.25
Automated cherry pick of #117791: update serial number to a valid non-zero number in ca

Kubernetes-commit: 3a755bf28ca1fbb1802b45f5a3e45a8498224587
2023-07-01 03:58:48 -07:00
Min Ni
9b7807ea0b update serial number to a valid non-zero number in ca certificate
Kubernetes-commit: a1ed19a4af4f5e857e3503aa92ccab2575076235
2023-05-08 16:39:35 -07:00
Kubernetes Publisher
25e88fd0c2 Merge pull request #118556 from puerco/bump-1.25-go-1.19.10
[release-1.25] releng/go: Update images, deps and ver to go 1.19.10

Kubernetes-commit: 8826d7ee3fb80fc4d85ad8e9e50cbab14233ecf9
2023-06-12 17:34:53 +00:00
Adolfo García Veytia (Puerco)
a3636b916c update-vendor: update vendored go.sums
Run of ./hack/update-vendor.sh

Signed-off-by: Adolfo García Veytia (Puerco) <adolfo.garcia@uservers.net>

Kubernetes-commit: 61254725a43ce127f1ffe99b0df766415e2e7aa8
2023-06-08 00:18:54 -06:00
Kubernetes Publisher
5ddf75f6a2 Merge pull request #115050 from MadhavJivrajani/release-1.25
[1.25] Cherry Pick of #114766: [Prepare for go1.20] *: Bump versions and fix tests

Kubernetes-commit: 1b9137732b227f6f97aeccaab179435bbf8a0b1f
2023-05-23 18:39:03 +00:00
Kubernetes Publisher
d32b1d7c08 Merge pull request #117682 from kolyshkin/1.25-bump-runc-1.1.6
[1.25] vendor: bump runc to 1.1.6

Kubernetes-commit: c51f7edb0503277f1f8adb500c41b3d7051ee3b3
2023-05-06 01:27:01 +00:00
Kir Kolyshkin
e53b407e85 [1.25] vendor: bump runc to 1.1.6
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Kubernetes-commit: cc3bdb6e1e5b2f69f0cac5d5529ab67abf0c3d18
2023-04-28 17:03:58 -07:00
Kubernetes Publisher
51c17ec9ab Merge pull request #115900 from odinuge/automated-cherry-pick-of-#115620-upstream-release-1.25
Automated cherry pick of #115620: client-go/cache: fix missing delete event on replace  (+ #116623)

Kubernetes-commit: 5cd05fae618f6ebd438117bce02e1ff631652253
2023-04-04 11:17:41 -07:00
Daniel Smith
3c81ccc036 Change where transformers are called.
odinuge: sorted out some function signature changes during
cherry-picking that caused conflicts.

(cherry picked from commit e76dff38cf74c3c8ad9ed4d3bc6e3641d9b64565)
Signed-off-by: Odin Ugedal <odin@uged.al>

Kubernetes-commit: a247e48bcd3742da7ddb43aa0b4d2f947afc3d33
2023-03-14 23:05:20 +00:00
Odin Ugedal
8205c38649 client-go/cache: update Replace comment to be more clear
Since the behavior is now changed, and the old behavior leaked objects,
this adds a new comment about how Replace works.

Signed-off-by: Odin Ugedal <ougedal@palantir.com>
Signed-off-by: Odin Ugedal <odin@uged.al>

Kubernetes-commit: cc675a5367d9d09992d7f12b8a43a10d672370b9
2023-02-13 11:23:50 +00:00
Odin Ugedal
3bb5a08497 client-go/cache: rewrite Replace to check queue first
This is useful to both reduce the code complexity, and to ensure clients
get the "newest" version of an object known when its deleted. This is
all best-effort, but for clients it makes more sense giving them the
newest object they observed rather than an old one.

This is especially useful when an object is recreated. eg.

Object A with key K is in the KnownObjects store;
- DELETE delta for A is queued with key K
- CREATE delta for B is queued with key K
- Replace without any object with key K in it.

In this situation its better to create a DELETE delta with
DeletedFinalStateUnknown with B (with this patch), than it is to give
the client an DeletedFinalStateUnknown with A (without this patch).

Signed-off-by: Odin Ugedal <ougedal@palantir.com>
Signed-off-by: Odin Ugedal <odin@uged.al>

Kubernetes-commit: 4283020151ab233101e77996fd8084488057f9c2
2023-02-13 11:12:37 +00:00
Odin Ugedal
e9d3761795 client-go/cache: merge ReplaceMakesDeletionsForObjectsInQueue tests
Signed-off-by: Odin Ugedal <ougedal@palantir.com>
Signed-off-by: Odin Ugedal <odin@uged.al>

Kubernetes-commit: db451e163d97f6a2c023efa30aa12b751c785798
2023-02-10 14:30:10 +00:00
Odin Ugedal
8a3d757be0 client-go/cache: fix missing delete event on replace without knownObjects
This fixes an issue where a relist could result in a DELETED delta
with an object wrapped in a DeletedFinalStateUnknown object; and then on
the next relist, it would wrap that object inside another
DeletedFinalStateUnknown, leaving the user with a "double" layer
of DeletedFinalStateUnknown's.

Signed-off-by: Odin Ugedal <ougedal@palantir.com>
Signed-off-by: Odin Ugedal <odin@uged.al>

Kubernetes-commit: a818874dce54226ecc8ef384ff8b4c82aa6aaa85
2023-02-10 14:16:26 +00:00
Odin Ugedal
58381003a1 client-go/cache: fix missing delete event on replace
This fixes a race condition when a "short lived" object
is created and the create event is still present on the queue
when a relist replaces the state. Previously that would lead in the
object being leaked.

The way this could happen is roughly;

1. new Object is added O, agent gets CREATED event for it
2. watch is terminated, and the agent runs a new list, L
3. CREATE event for O is still on the queue to be processed.
4. informer replaces the old data in store with L, and O is not in L
  - Since O is not in the store, and not in the list L, no DELETED event
    is queued
5. CREATE event for O is still on the queue to be processed.
6. CREATE event for O is processed
7. O is <leaked>; its present in the cache but not in k8s.

With this patch, on step 4. above it would create a DELETED event
ensuring that the object will be removed.

Signed-off-by: Odin Ugedal <ougedal@palantir.com>
Signed-off-by: Odin Ugedal <odin@uged.al>

Kubernetes-commit: bdc4a22309fc51f824aca41f11ee4466758ea9b0
2023-02-08 14:57:23 +00:00
Kubernetes Publisher
d51156025a Merge pull request #115788 from liggitt/net-0.7.0-1.25
[1.25] Update golang.org/x/net to v0.7.0

Kubernetes-commit: 8972d2b73a497eb0d15615b24fa7ca82d5b38b86
2023-02-15 11:21:15 +00:00
Jordan Liggitt
c3942e6cb3 Update golang.org/x/net to v0.7.0
Kubernetes-commit: fc043497d870b68ba35701a42c06071340b68bb2
2023-02-14 23:21:55 -05:00
Kubernetes Publisher
705901c8a7 Merge pull request #115567 from enj/automated-cherry-pick-of-#115315-upstream-release-1.25
Automated cherry pick of #115315: kubelet/client: collapse transport wiring onto standard

Kubernetes-commit: dd286416074ab1796ce100e27a7eb008d4624936
2023-02-10 22:42:41 +00:00
Kubernetes Publisher
e42bae1174 Merge pull request #115641 from nckturner/pin-golang.org/x/net-to-v0.4.0-in-1.25
Pin golang.org/x/net to v0.4.0 in 1.25

Kubernetes-commit: 641272fbcf7a75a06fb55909b5514523271737ef
2023-02-10 15:27:41 +00:00
Nick Turner
27f722275a Pin golang.org/x/net to v0.4.0 in 1.25
Kubernetes-commit: cd5e3b8a1f65c464168093ef516726d3b603d011
2023-02-08 17:57:20 -08:00
Monis Khan
212fb452f3 kubelet/client: collapse transport wiring onto standard approach
Signed-off-by: Monis Khan <mok@microsoft.com>

Kubernetes-commit: 2fe98e9c00d6a084b482fa337acf5fe4f2fdedeb
2023-02-05 20:51:54 -05:00
Madhav Jivrajani
133a487bfa *: Bump version of vmware/govmomi
Bumping version to include changes that
better handle TLS errors. Bump nescessary
to prepare for when the version of Go is
bumped to 1.20

Signed-off-by: Madhav Jivrajani <madhav.jiv@gmail.com>

Kubernetes-commit: 0ef4b72cf0cfec94fecc80d78f149d9eb56a6a10
2023-01-13 12:00:36 +05:30
Kubernetes Publisher
ab9a2e8199 Merge pull request #113990 from liggitt/automated-cherry-pick-of-#113933-upstream-release-1.25
Automated cherry pick of #113933: Limit request retrying to []byte request bodies

Kubernetes-commit: e6d249f777d83c0c33cbda56fc1e9df8142b29a7
2022-12-13 00:03:09 +00:00
Kubernetes Publisher
b2883ba878 Merge pull request #114320 from liggitt/net-1.25
Update golang.org/x/net 1e63c2f

Kubernetes-commit: 6711e16058e842dae009f0263b8b313677cebbfb
2022-12-07 02:20:47 +00:00
Jordan Liggitt
fcb591bc0a Update golang.org/x/net 1e63c2f
Includes fix for CVE-2022-41717

Kubernetes-commit: 73c3dcb6558eeeea9e77940dde525a81d7e0bc1d
2022-12-06 17:35:53 -05:00
Kubernetes Publisher
b63afdf260 Merge pull request #113425 from aimuz/automated-cherry-pick-of-#112693-upstream-release-1.25
Automated cherry pick of #112693: Fixed (CVE-2022-27664) Bump golang.org/x/net to

Kubernetes-commit: c8d0fbe009b48f96e36bba9c36e20dba79bfdd05
2022-11-16 01:57:44 +00:00
Jordan Liggitt
9c1395ec93 Limit request retrying to []byte request bodies
Kubernetes-commit: 1e5e5330df628ca5fb1306b8fcaf3a1231ae536c
2022-11-15 17:47:35 -05:00
aimuz
5aa9be71ec Fixed (CVE-2022-27664) Bump golang.org/x/net to v0.1.1-0.20221027164007-c63010009c80
Fixed https://pkg.go.dev/vuln/GO-2022-0969

Signed-off-by: aimuz <mr.imuz@gmail.com>

Kubernetes-commit: 9ab1a67d6769303b9c446c25f95d39a0a5218f32
2022-10-28 10:07:56 +08:00
Kubernetes Publisher
166ab05d11 Merge pull request #112808 from cheftako/automated-cherry-pick-of-#112689-upstream-release-1.25
Bump konnectivity-client to v0.0.33

Kubernetes-commit: e1d0471ec1272f959253ffa2ebee1d9caacd7de5
2022-10-07 07:53:11 +00:00
Walter Fender
4b5a63801d Updated vendor to the new preferred versions.
Added missing files.

Kubernetes-commit: 1bc43a0dd51fa9b5450d5f66b594892874501479
2022-09-30 19:01:34 -07:00
Kubernetes Publisher
1904631ef0 Merge pull request #112161 from pohly/automated-cherry-pick-of-#112129-origin-release-1.25
Automated cherry pick of #112129: dependencies: update to ginkgo v2.1.6 and gomega v1.20.1

Kubernetes-commit: 325e65b5d13e37b384bdd08397381a48693013d7
2022-09-09 11:12:16 +00:00
Kubernetes Publisher
8f4eb75bce Merge pull request #112336 from enj/automated-cherry-pick-of-#112017-upstream-release-1.25
Automated cherry pick of #112017: exec auth: support TLS config caching

Kubernetes-commit: 1ab51c3bbf480d7ad58b992de8c03a376beda967
2022-09-09 00:25:24 -07:00
Damien Grisonnet
8e9dfea2c4 events: fix EventSeries starting count discrepancy
The kube-apiserver validation expects the Count of an EventSeries to be
at least 2, otherwise it rejects the Event. There was is discrepancy
between the client and the server since the client was iniatizing an
EventSeries to a count of 1.

According to the original KEP, the first event emitted should have an
EventSeries set to nil and the second isomorphic event should have an
EventSeries with a count of 2. Thus, we should matcht the behavior
define by the KEP and update the client.

Also, as an effort to make the old clients compatible with the servers,
we should allow Events with an EventSeries count of 1 to prevent any
unexpected rejections.

Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>

Kubernetes-commit: 11716b1267daed5e50a52a987492827b2083c052
2022-09-08 23:50:41 +02:00
Damien Grisonnet
75d93aae71 tools/events: fix data race when emitting series
There was a data race in the recordToSink function that caused changes
to the events cache to be overriden if events were emitted
simultaneously via Eventf calls.

The race lies in the fact that when recording an Event, there might be
multiple calls updating the cache simultaneously. The lock period is
optimized so that after updating the cache with the new Event, the lock
is unlocked until the Event is recorded on the apiserver side and then
the cache is locked again to be updated with the new value returned by
the apiserver.

The are a few problem with the approach:

1. If two identical Events are emitted successively the changes of the
   second Event will override the first one. In code the following
   happen:
   1. Eventf(ev1)
   2. Eventf(ev2)
   3. Lock cache
   4. Set cache[getKey(ev1)] = &ev1
   5. Unlock cache
   6. Lock cache
   7. Update cache[getKey(ev2)] = &ev1 + Series{Count: 1}
   8. Unlock cache
   9. Start attempting to record the first event &ev1 on the apiserver side.

   This can be mitigated by recording a copy of the Event stored in
   cache instead of reusing the pointer from the cache.

2. When the Event has been recorded on the apiserver the cache is
   updated again with the value of the Event returned by the server.
   This update will override any changes made to the cache entry when
   attempting to record the new Event since the cache was unlocked at
   that time. This might lead to some inconsistencies when dealing with
   EventSeries since the count may be overriden or the client might even
   try to record the first isomorphic Event multiple time.

   This could be mitigated with a lock that has a larger scope, but we
   shouldn't want to reflect Event returned by the apiserver in the
   cache in the first place since mutation could mess with the
   aggregation by either allowing users to manipulate values to update
   a different cache entry or even having two cache entries for the same
   Events.

Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>

Kubernetes-commit: 84fa11b1f241c3401991678884331111957eaf9f
2022-12-01 15:39:34 +01:00
Damien Grisonnet
9f44018370 tools/events: retry on AlreadyExist for Series
When attempting to record a new Event and a new Serie on the apiserver
at the same time, the patch of the Serie might happen before the Event
is actually created. In that case, we handle the error and try to create
the Event. But the Event might be created during that period of time and
it is treated as an error today. So in order to handle that scenario, we
need to retry when a Create call for a Serie results in an AlreadyExist
error.

Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>

Kubernetes-commit: 87e55d9144f886585c7ec6c825acbc5e6f6f7d6a
2022-12-01 15:40:01 +01:00
Patrick Ohly
e278668ebe dependencies: update to ginkgo v2.1.6 and gomega v1.20.1
Ginkgo v2.1.6 adds ginkgo.SuppressProgressReporting which is needed
to suppress too verbose output each time the ReportAfterEach of the custom
progress reporter is invoked.

Kubernetes-commit: a440c257a9119c899af18f424e8e4daeb0078564
2022-08-30 19:33:50 +02:00
Monis Khan
1874bc6496 exec auth: support TLS config caching
This change updates the transport.Config .Dial and .TLS.GetCert fields
to use a struct wrapper.  This indirection via a pointer allows the
functions to be compared and thus makes them valid to use as map keys.
This change is then leveraged by the existing global exec auth and TLS
config caches to return the same authenticator and TLS config even when
distinct but identical rest configs were used to create distinct
clientsets.

Signed-off-by: Monis Khan <mok@microsoft.com>

Kubernetes-commit: 01044903860c7e2463888c48db91270dc9c7281d
2022-08-24 16:04:19 +00:00
Kubernetes Publisher
db7e2d829e Merge pull request #112055 from aanm/automated-cherry-pick-of-#111752-origin-gh-aanm-release-1.25
Automated cherry pick of #111752: Revert "client-go: remove no longer used

Kubernetes-commit: 4a017e900085af7d617782eab413551585582a8a
2022-09-06 18:34:35 -07:00
André Martins
c9008f3abb client-go/rest: check if url is nil to prevent nil pointer dereference
Signed-off-by: André Martins <aanm90@gmail.com>

Kubernetes-commit: fa1d4c327716ae117120311f566d26abff9d91ad
2022-08-09 14:19:01 +02:00
André Martins
1a46dfdf57 Revert "client-go: remove no longer used finalURLTemplate"
The functionality provided by the finalURLTemplate is still used by
certain external projects to track the request latency for requests
performed to kube-apiserver.

Using a template of the URL, instead of the URL itself, prevents the
explosion of label cardinality in exposed metrics since it aggregates
the URLs in a way that common URLs requests are reported as being the
same.

This reverts commit bebf5a608f68523fc430a44f6db26b16022dc862.

Signed-off-by: André Martins <aanm90@gmail.com>

Kubernetes-commit: 11e16c63c87f07e9e68977c74b937989983754c1
2022-08-08 23:27:45 +02:00
Kubernetes Publisher
b3e4a4065a Merge remote-tracking branch 'origin/master' into release-1.25
Kubernetes-commit: 35f46d004bd2c7dc88b2c5e0218d5de392369b27
2022-08-18 22:45:44 +00:00
Jordan Liggitt
c2f61ae20a Update removal warnings to 1.26
Kubernetes-commit: 68758fc5c5099c83104a637e6d6ad3f4534f0d08
2022-08-18 14:17:56 -04:00
Jordan Liggitt
54e42ab6f2 update-gofmt
Kubernetes-commit: 79c09f0b310b8b66f8f14ad254f268788c42e076
2022-08-18 14:17:31 -04:00