Fix dependencies to point to kubernetes-1.15.1 tag

Merge remote-tracking branch 'origin/master' into release-1.15
Kubernetes-commit: 6127bfb1bbd447e15fd839f3987abe1b8e5188b3
2026-02-04 00:06:14 +08:00 · 2019-07-18 18:48:20 +00:00 · 2019-06-12 21:16:27 +00:00 · 2019-06-12 10:27:41 +02:00 · 2019-05-31 03:04:30 +00:00 · 2019-05-31 13:48:59 +00:00
6 changed files with 32 additions and 23 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -58,6 +58,10 @@
 			"ImportPath": "github.com/google/btree",
 			"Rev": "7d79101e329e"
 		},
+		{
+			"ImportPath": "github.com/google/go-cmp",
+			"Rev": "v0.3.0"
+		},
 		{
 			"ImportPath": "github.com/google/gofuzz",
 			"Rev": "24818f796faf"
@@ -212,19 +216,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "181e1f9c52c1"
+			"Rev": "b59d8169aab5"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "17f84483f500"
+			"Rev": "1799e75a0719"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "65184652c889"
+			"Rev": "8e956561bbf5"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "ff26e7842f9d"
+			"Rev": "18da4a14b22b"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -232,7 +236,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/klog",
-			"Rev": "v0.3.0"
+			"Rev": "v0.3.1"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
--- a/go.mod
+++ b/go.mod
@@ -5,21 +5,21 @@ module k8s.io/sample-controller
 go 1.12

 require (
-	k8s.io/api v0.0.0-20190425012535-181e1f9c52c1
-	k8s.io/apimachinery v0.0.0-20190425132440-17f84483f500
-	k8s.io/client-go v0.0.0-20190425172711-65184652c889
-	k8s.io/code-generator v0.0.0-20190419212335-ff26e7842f9d
-	k8s.io/klog v0.3.0
+	k8s.io/api v0.0.0-20190718183219-b59d8169aab5
+	k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
+	k8s.io/client-go v0.0.0-20190718183610-8e956561bbf5
+	k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
+	k8s.io/klog v0.3.1
 )

 replace (
 	golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
-	k8s.io/api => k8s.io/api v0.0.0-20190425012535-181e1f9c52c1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190425132440-17f84483f500
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190425172711-65184652c889
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190419212335-ff26e7842f9d
+	k8s.io/api => k8s.io/api v0.0.0-20190718183219-b59d8169aab5
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190718183610-8e956561bbf5
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
 )

-replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190424053038-9fe063da3132
+replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190612210728-f40f68634749
--- a/go.sum
+++ b/go.sum
@@ -17,6 +17,8 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -92,14 +94,14 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-k8s.io/api v0.0.0-20190425012535-181e1f9c52c1/go.mod h1:AhUc3Ph6fhRc0SCpt0Hwv0E+Q8QiEAASkXKwfmT2JwU=
-k8s.io/apimachinery v0.0.0-20190425132440-17f84483f500/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
-k8s.io/client-go v0.0.0-20190425172711-65184652c889/go.mod h1:PeVFCnjeDy6EwLN+wdDIZd1DwDY6jnkpQt9psMo5YRU=
-k8s.io/code-generator v0.0.0-20190419212335-ff26e7842f9d/go.mod h1:rVrFWfTVftGH7bb972nWC6N4QkJ4LU7FOXu8GH2UkJo=
+k8s.io/api v0.0.0-20190718183219-b59d8169aab5/go.mod h1:TBhBqb1AWbBQbW3XRusr7n7E4v2+5ZY8r8sAMnyFC5A=
+k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
+k8s.io/client-go v0.0.0-20190718183610-8e956561bbf5/go.mod h1:ozblAqkW495yoAX60QZyxQBq5W0YixE9Ffn4F91RO0g=
+k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
-k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
+k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=
 k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
--- a/pkg/apis/samplecontroller/register.go
+++ b/pkg/apis/samplecontroller/register.go
@@ -16,6 +16,7 @@ limitations under the License.

 package samplecontroller

+// GroupName is the group name used in this package
 const (
 	GroupName = "samplecontroller.k8s.io"
 )
--- a/pkg/apis/samplecontroller/v1alpha1/register.go
+++ b/pkg/apis/samplecontroller/v1alpha1/register.go
@@ -38,8 +38,10 @@ func Resource(resource string) schema.GroupResource {
 }

 var (
+	// SchemeBuilder initializes a scheme builder
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
+	// AddToScheme is a global function that registers this API group & version to a scheme
+	AddToScheme = SchemeBuilder.AddToScheme
 )

 // Adds the list of known types to Scheme.
--- a/pkg/apis/samplecontroller/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/samplecontroller/v1alpha1/zz_generated.deepcopy.go
@@ -56,7 +56,7 @@ func (in *Foo) DeepCopyObject() runtime.Object {
 func (in *FooList) DeepCopyInto(out *FooList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
-	out.ListMeta = in.ListMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
 		*out = make([]Foo, len(*in))
Author	SHA1	Message	Date
Kubernetes Publisher	732eab031d	Fix dependencies to point to kubernetes-1.15.1 tag	2019-07-18 18:48:20 +00:00
Kubernetes Publisher	efb1d42b6e	Merge remote-tracking branch 'origin/master' into release-1.15 Kubernetes-commit: 6127bfb1bbd447e15fd839f3987abe1b8e5188b3	2019-06-12 21:16:27 +00:00
Krzysztof Siedlecki	4d7aa1c825	Revert "Bump klog to v0.3.2" Kubernetes-commit: 7dcec919a2e5e8e23da3d0dd61276d86c9b0e4b6	2019-06-12 10:27:41 +02:00
Kubernetes Publisher	66d59e8570	Merge remote-tracking branch 'origin/master' into release-1.15 Kubernetes-commit: 6be12759ea726aa785ba3a5937bbc75e479c1efd	2019-05-31 03:04:30 +00:00
Kubernetes Publisher	5fd4c3c898	Merge pull request #78465 from yuwenma/bump-klog Bump klog to v0.3.2 Kubernetes-commit: b094dd9bc3a4617b587b04993931a6110691ddc0	2019-05-31 13:48:59 +00:00
Kubernetes Publisher	5735651eb7	Merge remote-tracking branch 'origin/master' into release-1.15 Kubernetes-commit: 67f7c9f6ff8e61b44bd62db9ba6e0660b38c0617	2019-05-31 13:48:58 +00:00
yuwenma	a571520cc8	Bump klog to v0.3.2 Kubernetes-commit: 5cef37433e55827226f20981598ddfa2c6511809	2019-05-28 22:45:19 -07:00
Chao Xu	5377b2aaa3	generated Kubernetes-commit: 369314959c1bf096c1d3502f10b28a00c3d12691	2019-05-24 17:46:39 -07:00
Kubernetes Publisher	01c477d05a	Merge remote-tracking branch 'origin/master' into release-1.15. Deleting CHANGELOG-1.14.md Kubernetes-commit: 5991262b24f5e834654716148c939624536cce3a	2019-05-28 16:05:40 +00:00
Michael Taufen	282a604802	Update klog to v0.3.1 Includes recent fixes, notably https://github.com/kubernetes/klog/pull/66 Kubernetes-commit: ee7bcc53a206f669b057e38a477b51b3477aab23	2019-05-22 10:51:33 -07:00
Kubernetes Publisher	f2c12c5b4e	Merge remote-tracking branch 'origin/master' into release-1.15 Kubernetes-commit: 5d5e3fbd84b30d8bf59bfdf4c14d01196869b92f	2019-05-16 03:34:24 +00:00
Kubernetes Publisher	b5c3a6f215	Merge pull request #77751 from baasbank/fix-lint-errors-staging/src/k8s.io Fix lint errors staging/src/k8s.io Kubernetes-commit: 6a40ed1005f085365ada73ce7c5e00df5046a1ad	2019-05-28 16:05:38 +00:00
Baasbank	2a290468a5	fixes golint error in staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1 fixes golint error in staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller fixes golint errors in staging/src/k8s.io/sample-apiserver/pkg/cmd/server fixex golint errors in staging/src/k8s.io/sample-apiserver/pkg/apiserver Kubernetes-commit: 55d45867e6a8b6336be0c56da0b4843dd552b1b0	2019-05-03 23:10:40 +01:00
Mike Danese	a82c208f8f	vendor github.com/google/go-cmp Kubernetes-commit: 76f683a8f3dc2977846e16b2ea14208a51c2cb6b	2019-04-22 21:41:46 -07:00
Jordan Liggitt	32f55218cc	generated files Kubernetes-commit: eb82dddfdd504c2956ec438b739e01230067e90f	2019-05-14 18:52:14 +00:00