Update dependencies to v0.16.4 tag

Merge pull request #83433 from liggitt/automated-cherry-pick-of-#83261-upstream-release-1.16
[1.16] Automated cherry pick of #83261: bump gopkg.in/yaml.v2 v2.2.4 Kubernetes-commit: a2ff5d71deafff1d9688eb6f7533dd239980c420
2026-03-24 00:00:25 +08:00 · 2019-12-11 19:36:21 +00:00 · 2019-10-04 12:29:58 +00:00 · 2019-10-02 14:46:08 -04:00 · 2019-08-31 16:09:41 +00:00 · 2019-08-29 19:10:28 -07:00
6 changed files with 37 additions and 39 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -232,11 +232,11 @@
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo",
-			"Rev": "v1.10.1"
+			"Rev": "v1.8.0"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega",
-			"Rev": "v1.7.0"
+			"Rev": "v1.5.0"
 		},
 		{
 			"ImportPath": "github.com/peterbourgon/diskv",
@@ -368,19 +368,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "35675025e55c"
+			"Rev": "v0.16.4"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "fb3eea214746"
+			"Rev": "v0.16.4"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "347e4def6c74"
+			"Rev": "v0.16.4"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "700b1226c0bd"
+			"Rev": "v0.16.4"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -388,7 +388,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/klog",
-			"Rev": "v1.0.0"
+			"Rev": "v0.4.0"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
@@ -396,7 +396,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/utils",
-			"Rev": "8d271d903fe4"
+			"Rev": "581e00157fb1"
 		},
 		{
 			"ImportPath": "modernc.org/cc",
--- a/1
+++ b/1
@@ -4,6 +4,7 @@ approvers:
 - sttts
 - munnerz
 reviewers:
+- gregory-m
 - sttts
 - munnerz
 - nikhita
--- a/README.md
+++ b/README.md
@@ -159,7 +159,7 @@ The CRD in [`crd-status-subresource.yaml`](./artifacts/examples/crd-status-subre
 for custom resources.
 This means that [`UpdateStatus`](./controller.go#L330) can be used by the controller to update only the status part of the custom resource.

-To understand why only the status part of the custom resource should be updated, please refer to the [Kubernetes API conventions](https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status).
+To understand why only the status part of the custom resource should be updated, please refer to the [Kubernetes API conventions](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status).

 In the above steps, use `crd-status-subresource.yaml` to create the CRD:

--- a/controller_test.go
+++ b/controller_test.go
@@ -175,8 +175,8 @@ func checkAction(expected, actual core.Action, t *testing.T) {
 	}

 	switch a := actual.(type) {
-	case core.CreateActionImpl:
-		e, _ := expected.(core.CreateActionImpl)
+	case core.CreateAction:
+		e, _ := expected.(core.CreateAction)
 		expObject := e.GetObject()
 		object := a.GetObject()

@@ -184,8 +184,8 @@ func checkAction(expected, actual core.Action, t *testing.T) {
 			t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
 				a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expObject, object))
 		}
-	case core.UpdateActionImpl:
-		e, _ := expected.(core.UpdateActionImpl)
+	case core.UpdateAction:
+		e, _ := expected.(core.UpdateAction)
 		expObject := e.GetObject()
 		object := a.GetObject()

@@ -193,8 +193,8 @@ func checkAction(expected, actual core.Action, t *testing.T) {
 			t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
 				a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expObject, object))
 		}
-	case core.PatchActionImpl:
-		e, _ := expected.(core.PatchActionImpl)
+	case core.PatchAction:
+		e, _ := expected.(core.PatchAction)
 		expPatch := e.GetPatch()
 		patch := a.GetPatch()

@@ -202,9 +202,6 @@ func checkAction(expected, actual core.Action, t *testing.T) {
 			t.Errorf("Action %s %s has wrong patch\nDiff:\n %s",
 				a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expPatch, patch))
 		}
-	default:
-		t.Errorf("Uncaptured Action %s %s, you should explicitly add a case to capture it",
-			actual.GetVerb(), actual.GetResource().Resource)
 	}
 }

--- a/go.mod
+++ b/go.mod
@@ -5,11 +5,11 @@ module k8s.io/sample-controller
 go 1.12

 require (
-	k8s.io/api v0.0.0-20191015145727-35675025e55c
-	k8s.io/apimachinery v0.0.0-20191014065749-fb3eea214746
-	k8s.io/client-go v0.0.0-20191015145958-347e4def6c74
-	k8s.io/code-generator v0.0.0-20191003035328-700b1226c0bd
-	k8s.io/klog v1.0.0
+	k8s.io/api v0.16.4
+	k8s.io/apimachinery v0.16.4
+	k8s.io/client-go v0.16.4
+	k8s.io/code-generator v0.16.4
+	k8s.io/klog v0.4.0
 )

 replace (
@@ -20,8 +20,8 @@ replace (
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
 	golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
-	k8s.io/api => k8s.io/api v0.0.0-20191015145727-35675025e55c
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191014065749-fb3eea214746
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20191015145958-347e4def6c74
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191003035328-700b1226c0bd
+	k8s.io/api => k8s.io/api v0.16.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.16.4
+	k8s.io/client-go => k8s.io/client-go v0.16.4
+	k8s.io/code-generator => k8s.io/code-generator v0.16.4
 )
--- a/go.sum
+++ b/go.sum
@@ -108,11 +108,11 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
-github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -200,22 +200,22 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.0.0-20191015145727-35675025e55c/go.mod h1:QkEbiSvETjiF869vsgCmJAUDD1VVz6Ut0ULyQP6ivY4=
-k8s.io/apimachinery v0.0.0-20191014065749-fb3eea214746/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw=
-k8s.io/client-go v0.0.0-20191015145958-347e4def6c74/go.mod h1:JiN/9Cmvzr0p0TGfAathQ9szdWRKjJfHkNgPklcURRE=
-k8s.io/code-generator v0.0.0-20191003035328-700b1226c0bd/go.mod h1:HC9p4y3SBN+txSs8x57qmNPXFZ/CxdCHiDTNnocCSEw=
+k8s.io/api v0.16.4/go.mod h1:AtzMnsR45tccQss5q8RnF+W8L81DH6XwXwo/joEx9u0=
+k8s.io/apimachinery v0.16.4/go.mod h1:llRdnznGEAqC3DcNm6yEj472xaFVfLM7hnYofMb12tQ=
+k8s.io/client-go v0.16.4/go.mod h1:ZgxhFDxSnoKY0J0U2/Y1C8obKDdlhGPZwA7oHH863Ok=
+k8s.io/code-generator v0.16.4/go.mod h1:mJUgkl06XV4kstAnLHAIzJPVCOzVR+ZcfPIv4fUsFCY=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ=
 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
-k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 h1:Gi+/O1saihwDqnlmC8Vhv1M5Sp4+rbOmK9TbsLn8ZEA=
-k8s.io/utils v0.0.0-20191010214722-8d271d903fe4/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
Author	SHA1	Message	Date
Kubernetes Publisher	18370d76a3	Update dependencies to v0.16.4 tag	2019-12-11 19:36:21 +00:00
Kubernetes Publisher	d040c2be0d	Merge pull request #83433 from liggitt/automated-cherry-pick-of-#83261-upstream-release-1.16 [1.16] Automated cherry pick of #83261: bump gopkg.in/yaml.v2 v2.2.4 Kubernetes-commit: a2ff5d71deafff1d9688eb6f7533dd239980c420	2019-10-04 12:29:58 +00:00
Jordan Liggitt	e872298ce7	bump gopkg.in/yaml.v2 v2.2.4 Kubernetes-commit: 90a50158270ed5e7406386a12b12b2606c587ffd	2019-10-02 14:46:08 -04:00
Kubernetes Publisher	4db7fd04a9	Merge remote-tracking branch 'origin/master' into release-1.16 Kubernetes-commit: 78981197d01e8524d254656095f3cb71a5851e61	2019-08-31 16:09:41 +00:00
jennybuckley	d63f5af2ea	Update generated Kubernetes-commit: badd5b9a26026138e4fc44a643ec1c6b65a7891b	2019-08-29 19:10:28 -07:00
Kubernetes Publisher	5d1b22f67b	Merge remote-tracking branch 'origin/master' into release-1.16 Kubernetes-commit: 1aea0dd9383a2f7ac9f7e055ff10a08ea241db51	2019-08-28 16:08:52 +00:00
Pavithra Ramesh	edceb5070c	Update vendor k8s-cloud-provider and google API Ran commands: hack/pin-dependency.sh github.com/GoogleCloudPlatform/k8s-cloud-provider 27a4ced34534a6c32b63159b100ac0efaa1d37b3 hack/update-vendor.sh hack/pin-dependency.sh google.golang.org/api 5213b809086156e6e2b262a41394993fcff97439 hack/update-vendor.sh hack/verify-vendor.sh merge conflicts Kubernetes-commit: ce3b145e7369da6c1179346a4e6f4f9992d235b7	2019-08-23 15:51:45 -07:00
Kubernetes Publisher	eed36b4378	Merge remote-tracking branch 'origin/master' into release-1.16 Kubernetes-commit: ecd7e4cab747770f5c362ace9bd3487bdb97c66b	2019-08-26 12:20:12 +00:00
Davanum Srinivas	aef24b06d3	hack/pin-dependency.sh k8s.io/gengo 26a664648505d962332bda642b27306bc10d1082 Kubernetes-commit: 96998c619714f254998e69c5bae3c3a1b03fa423	2019-08-22 12:15:10 -04:00
Kubernetes Publisher	b6ff17227c	sync: update go.mod	2019-08-22 06:22:38 +00:00
Kubernetes Publisher	f1fd2be855	Merge remote-tracking branch 'origin/master' into release-1.16. Deleting CHANGELOG-1.13.md CHANGELOG-1.14.md CHANGELOG-1.15.md Kubernetes-commit: 92639f719ee353219fa2cd19128a93409bb3a1e3	2019-08-20 10:39:46 +00:00
Tim Allclair	ecd98cdbab	Bump golang.org/x/tools version for staticcheck compat Kubernetes-commit: 9a02ef7fe5eb166a53131c52b59844179c4158e9	2019-08-08 11:04:56 -07:00
Kubernetes Publisher	15f5d7d17d	Merge remote-tracking branch 'origin/master' into release-1.16 Kubernetes-commit: 4771a93d817479e76263c16473d18622f40f7c32	2019-08-16 10:36:07 +00:00
Stephen Augustus	db0892f82d	Update Azure/azure-sdk-for-go and Azure/go-autorest modules Signed-off-by: Stephen Augustus <saugustus@vmware.com> Kubernetes-commit: db855f9ba0ced2303fbb3b9776dd2a0d78b31897	2019-08-15 17:57:49 -04:00
Kubernetes Publisher	e3a1d4a530	Merge pull request #81335 from carlory/fix add missing import required by build scripts Kubernetes-commit: 8d925c7510820523665bdd5ce1916fa956b9c5fa	2019-08-16 10:36:06 +00:00
Christoph Blecker	1818f39356	Update vendor Kubernetes-commit: 5f971d6d8862de319edbd24a729a704292c560dc	2019-08-13 17:51:45 -07:00
Alvaro Aleman	031989e286	Update k8s.io/gengo to 955ffa8fcfc983717cd9de5d2a1e9f5c465f4376 Kubernetes-commit: c4fd0d4f99b672f8c44ff72a155973fae4b32032	2019-08-13 23:49:12 +02:00
Kubernetes Publisher	69bb10b2ef	Merge pull request #81164 from dims/update-to-latest-klog-0.4.0 Update to latest klog 0.4.0 Kubernetes-commit: 461b2d8b9ae818b4b08a6c74d2ec6048fe7a52b6	2019-08-16 10:36:04 +00:00
Haowei Cai	073d8c8b24	generated running hack/update-vendor.sh Kubernetes-commit: 6bed35ebd2bfc8d0de1d5fe7a6db0fd15a7abace	2019-08-14 10:46:27 +00:00
carlory	e5108e29f0	run ./hack/update-vendor.sh Kubernetes-commit: dc9bf6a9553d2381ae94e62ad5e49064d0de01e7	2019-08-13 20:20:38 +08:00
Davanum Srinivas	5b619e3f05	Update to latest klog 0.4.0 47ffc4e Add test case for detecting data race 959d342 Prevent data race in SetOutput* methods 34123a4 Test with golang 1.12.x bf4884f Fix the log duplication issue for --log-file dc5546c Backfill integration tests for selecting log destinations baef93d fix broken links 07b218b Add go modules files b33ae69 Add flag to include file's dir in logs 7c58910 correct documentation a4033db Code Hygene - glog to klog 941d47b Revert "Fix the log duplication issue for --log-file." 314f6c4 Update godoc for the default value of logtostderr 7eb35e2 Fix the log duplication issue for --log-file. Kubernetes-commit: 9a2de95601641aa1077734c76fc24ebe7b6026db	2019-08-08 10:08:27 -04:00