Update dependencies to v0.19.0-rc.1 tag

Merge remote-tracking branch 'origin/master' into release-1.19
Kubernetes-commit: 4c700f46775d035b3a926b16f1a536e100706848
2026-06-09 18:55:26 +00:00 · 2020-07-14 17:09:32 +00:00 · 2020-07-12 17:12:29 +00:00 · 2020-07-13 13:19:45 +00:00 · 2020-07-13 13:19:43 +00:00 · 2020-07-13 13:19:42 +00:00
7 changed files with 20 additions and 20 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -240,7 +240,7 @@
 		},
 		{
 			"ImportPath": "github.com/json-iterator/go",
-			"Rev": "v1.1.9"
+			"Rev": "v1.1.10"
 		},
 		{
 			"ImportPath": "github.com/jstemmer/go-junit-report",
@@ -440,11 +440,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "02047b7ecbbf"
+			"Rev": "v0.19.0-rc.1"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "106aebdc1c0a"
+			"Rev": "v0.19.0-rc.1"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -468,7 +468,7 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
-			"Rev": "v3.0.0"
+			"Rev": "43c19bbb7fba"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
--- a/8
+++ b/8
@@ -10,9 +10,7 @@
 # DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
 # INSTRUCTIONS AT https://kubernetes.io/security/

-cjcullen
-joelsmith
-liggitt
-philips
+caesarxuchao
+deads2k
+lavalamp
 sttts
-tallclair
--- a/discovery/cached/disk/cached_discovery.go
+++ b/discovery/cached/disk/cached_discovery.go
@@ -268,8 +268,6 @@ func (d *CachedDiscoveryClient) Invalidate() {
 // CachedDiscoveryClient cache data. If httpCacheDir is empty, the restconfig's transport will not
 // be updated with a roundtripper that understands cache responses.
 // If discoveryCacheDir is empty, cached server resource data will be looked up in the current directory.
-// TODO(juanvallejo): the value of "--cache-dir" should be honored. Consolidate discoveryCacheDir with httpCacheDir
-// so that server resources and http-cache data are stored in the same location, provided via config flags.
 func NewCachedDiscoveryClientForConfig(config *restclient.Config, discoveryCacheDir, httpCacheDir string, ttl time.Duration) (*CachedDiscoveryClient, error) {
 	if len(httpCacheDir) > 0 {
 		// update the given restconfig with a custom roundtripper that
--- a/go.mod
+++ b/go.mod
@@ -26,15 +26,14 @@ require (
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
+	k8s.io/api v0.19.0-rc.1
+	k8s.io/apimachinery v0.19.0-rc.1
 	k8s.io/klog/v2 v2.2.0
 	k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
 	sigs.k8s.io/yaml v1.2.0
 )

 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
+	k8s.io/api => k8s.io/api v0.19.0-rc.1
+	k8s.io/apimachinery => k8s.io/apimachinery v0.19.0-rc.1
 )
--- a/go.sum
+++ b/go.sum
@@ -127,8 +127,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
@@ -332,6 +332,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+k8s.io/api v0.19.0-rc.1/go.mod h1:NdiA9gl+9BuvhHU0WfqE5A7SrA4iO5TrmRE0caDteuA=
+k8s.io/apimachinery v0.19.0-rc.1/go.mod h1:eHbWZVMaaewmYBAUuRYnAmTTMtDhvpPNZuh8/6Yl7v0=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
--- a/scale/fake/client.go
+++ b/scale/fake/client.go
@@ -60,7 +60,7 @@ func (f *fakeNamespacedScaleClient) Get(ctx context.Context, resource schema.Gro

 func (f *fakeNamespacedScaleClient) Update(ctx context.Context, resource schema.GroupResource, scale *autoscalingapi.Scale, opts metav1.UpdateOptions) (*autoscalingapi.Scale, error) {
 	obj, err := f.fake.
-		Invokes(testing.NewUpdateSubresourceAction(resource.WithVersion(""), f.namespace, "scale", scale), &autoscalingapi.Scale{})
+		Invokes(testing.NewUpdateSubresourceAction(resource.WithVersion(""), "scale", f.namespace, scale), &autoscalingapi.Scale{})

 	if err != nil {
 		return nil, err
--- a/tools/record/events_cache.go
+++ b/tools/record/events_cache.go
@@ -153,7 +153,8 @@ func (f *EventSourceObjectSpamFilter) Filter(event *v1.Event) bool {
 // localKey - key that makes this event in the local group
 type EventAggregatorKeyFunc func(event *v1.Event) (aggregateKey string, localKey string)

-// EventAggregatorByReasonFunc aggregates events by exact match on event.Source, event.InvolvedObject, event.Type and event.Reason
+// EventAggregatorByReasonFunc aggregates events by exact match on event.Source, event.InvolvedObject, event.Type,
+// event.Reason, event.ReportingController and event.ReportingInstance
 func EventAggregatorByReasonFunc(event *v1.Event) (string, string) {
 	return strings.Join([]string{
 		event.Source.Component,
@@ -165,6 +166,8 @@ func EventAggregatorByReasonFunc(event *v1.Event) (string, string) {
 		event.InvolvedObject.APIVersion,
 		event.Type,
 		event.Reason,
+		event.ReportingController,
+		event.ReportingInstance,
 	},
 		""), event.Message
 }
Author	SHA1	Message	Date
Kubernetes Publisher	f7e4e24458	Update dependencies to v0.19.0-rc.1 tag	2020-07-14 17:09:32 +00:00
Kubernetes Publisher	b501d6e7bb	Merge remote-tracking branch 'origin/master' into release-1.19 Kubernetes-commit: 4c700f46775d035b3a926b16f1a536e100706848	2020-07-12 17:12:29 +00:00
Kubernetes Publisher	69f0a18004	Merge pull request #92926 from detiber/FixFakeScaleClientUpdate [client-go] Fix argument ordering for fake scale client update Kubernetes-commit: 165a221b1c8eea44dd1a6281bc9c8ff5ee3a33d3	2020-07-13 13:19:45 +00:00
Kubernetes Publisher	e8a27546e8	Merge pull request #92919 from dashpole/update_cadvisor Update cAdvisor to v0.37.0 Kubernetes-commit: 6b5dc3770851fdc1f356e36fd17810c744181fb1	2020-07-13 13:19:43 +00:00
Kubernetes Publisher	10b99a8ee8	Merge pull request #92910 from soltysh/kubectl_cache Setup cache dirs properly based on --cache-dir value Kubernetes-commit: 7d1daa09383d32fe7a325d6275d9bd51cba45ee5	2020-07-13 13:19:42 +00:00
Kubernetes Publisher	63841cef17	Merge pull request #92874 from chelseychen/event-api Fix a few places where source field is empty when creating events via events/v1 Kubernetes-commit: c23a4b08d704156db724769a32edc71c921095d4	2020-07-13 13:19:41 +00:00
Kubernetes Publisher	33f5fff4a5	Merge pull request #92768 from deads2k/security-contacts update security contacts for apimachinery repos Kubernetes-commit: 0cc96859473a21eb7d4f44f355d50881e12925ad	2020-07-13 13:19:39 +00:00
Kubernetes Publisher	367809baaa	Merge pull request #92661 from jpbetz/smd-bump-field-unsetting Bump to SMD PR#166 to pick up unsetting field changes and add integration tests Kubernetes-commit: 49dced762da7bc9f74474e9f8f3efe198ff46767	2020-07-13 13:19:38 +00:00
David Ashpole	157fd1a595	update cAdvisor to v0.37.0 Kubernetes-commit: 1f70708f6cc85985725c11cd69c4965c1f97b314	2020-07-09 10:23:10 -07:00
Jason DeTiberus	f98e990e6f	[client-go] Fix argument ordering for fake scale client update Fixes the argument order used when calling testing.NewUpdateSubresourceAction within the fake scale client. This was causing the generated action to swap the values of the Namespace and Subresource in the Action. Kubernetes-commit: 34a446d812c423da7a306963f250f4002dac9be8	2020-07-08 20:27:13 -04:00
Maciej Szulik	76326df43e	Setup cache dirs properly based on --cache-dir value Kubernetes-commit: 6c6cd2deeb03040d458b00824fd6c1a900a81b51	2020-07-08 15:43:25 +02:00
Chelsey Chen	c0b8411f2d	Update conversion between ReportingController and Source.Component Kubernetes-commit: e010436e2acc96d710620a91ceaaa86becca4060	2020-07-07 13:38:48 -04:00
David Eads	1a3f7941d8	update security contacts for apimachinery repos Kubernetes-commit: 29c4e858b0017f8aa328d487adbbe910b8205cf8	2020-07-02 16:00:53 -04:00