diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index de9ea3f8..ea5b0b25 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -240,747 +240,747 @@ }, { "ImportPath": "k8s.io/api/admissionregistration/v1alpha1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/admissionregistration/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/apps/v1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/apps/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/apps/v1beta2", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/authentication/v1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/authentication/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/authorization/v1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/authorization/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/autoscaling/v1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/autoscaling/v2beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/batch/v1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/batch/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/batch/v2alpha1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/certificates/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/core/v1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/events/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/extensions/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/networking/v1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/policy/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/rbac/v1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/rbac/v1alpha1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/rbac/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/scheduling/v1alpha1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/settings/v1alpha1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/storage/v1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/storage/v1alpha1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/api/storage/v1beta1", - "Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5" + "Rev": "b1791847a747642131ccc7d25ef0264b638dfd66" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/cache", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/clock", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "5250765d28a6a1e07c6f09fe814a4b58ad74cc11" + "Rev": "e7ad5e783d5cc59c1aa137f0b13c51baee6ee7c1" }, { "ImportPath": "k8s.io/client-go/discovery", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/discovery/fake", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/admissionregistration", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/apps", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/apps/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/apps/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/apps/v1beta2", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/autoscaling", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/autoscaling/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/batch", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/batch/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/batch/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/batch/v2alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/certificates", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/certificates/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/core", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/core/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/events", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/events/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/extensions", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/extensions/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/internalinterfaces", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/networking", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/networking/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/policy", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/policy/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/rbac", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/rbac/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/rbac/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/scheduling", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/settings", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/settings/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/storage", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/storage/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/storage/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/informers/storage/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/scheme", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/apps/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/apps/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/apps/v1beta2", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/autoscaling/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/batch/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/batch/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/batch/v2alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/certificates/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/core/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/events/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/extensions/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/networking/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/policy/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/rbac/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/rbac/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/settings/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/storage/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/storage/v1alpha1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/listers/storage/v1beta1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/pkg/version", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/rest", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/rest/watch", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/testing", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/auth", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/cache", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/clientcmd", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/clientcmd/api", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/metrics", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/pager", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/record", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/tools/reference", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/transport", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/util/buffer", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/util/cert", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/util/flowcontrol", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/util/homedir", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/util/integer", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/client-go/util/workqueue", - "Rev": "17dfc2579839ade675e779b6540fba06b3a57e0c" + "Rev": "f4d24c8a47016d9ffcc8a44c4011d153cb413367" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", diff --git a/pkg/apis/samplecontroller/v1alpha1/register.go b/pkg/apis/samplecontroller/v1alpha1/register.go index babd488d..df5695eb 100644 --- a/pkg/apis/samplecontroller/v1alpha1/register.go +++ b/pkg/apis/samplecontroller/v1alpha1/register.go @@ -17,6 +17,7 @@ limitations under the License. package v1alpha1 import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -47,5 +48,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Foo{}, &FooList{}, ) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/vendor/k8s.io/api/core/v1/generated.proto b/vendor/k8s.io/api/core/v1/generated.proto index 2cf7941e..ab42a130 100644 --- a/vendor/k8s.io/api/core/v1/generated.proto +++ b/vendor/k8s.io/api/core/v1/generated.proto @@ -618,7 +618,7 @@ message Container { // Describe a container image message ContainerImage { // Names by which this image is known. - // e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] + // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] repeated string names = 1; // The size of the image in bytes. diff --git a/vendor/k8s.io/api/core/v1/types.go b/vendor/k8s.io/api/core/v1/types.go index 8eab4552..6cfbfc8e 100644 --- a/vendor/k8s.io/api/core/v1/types.go +++ b/vendor/k8s.io/api/core/v1/types.go @@ -2459,7 +2459,11 @@ const ( // parameters such as nameservers and search paths should be defined via // DNSConfig. DNSNone DNSPolicy = "None" +) +const ( + // DefaultTerminationGracePeriodSeconds indicates the default duration in + // seconds a pod needs to terminate gracefully. DefaultTerminationGracePeriodSeconds = 30 ) @@ -3906,7 +3910,7 @@ type PodSignature struct { // Describe a container image type ContainerImage struct { // Names by which this image is known. - // e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] + // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] Names []string `json:"names" protobuf:"bytes,1,rep,name=names"` // The size of the image in bytes. // +optional diff --git a/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go b/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go index 80cacc97..d89be951 100644 --- a/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -308,7 +308,7 @@ func (Container) SwaggerDoc() map[string]string { var map_ContainerImage = map[string]string{ "": "Describe a container image", - "names": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", + "names": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", "sizeBytes": "The size of the image in bytes.", } diff --git a/vendor/k8s.io/apimachinery/pkg/util/yaml/decoder.go b/vendor/k8s.io/apimachinery/pkg/util/yaml/decoder.go index 6ebfaea7..56de33a7 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/yaml/decoder.go +++ b/vendor/k8s.io/apimachinery/pkg/util/yaml/decoder.go @@ -122,7 +122,7 @@ func (d *YAMLDecoder) Read(data []byte) (n int, err error) { if left <= len(data) { copy(data, d.remaining) d.remaining = nil - return len(d.remaining), nil + return left, nil } // caller will need to reread diff --git a/vendor/k8s.io/client-go/transport/cache.go b/vendor/k8s.io/client-go/transport/cache.go index da22cdee..7c40848c 100644 --- a/vendor/k8s.io/client-go/transport/cache.go +++ b/vendor/k8s.io/client-go/transport/cache.go @@ -31,12 +31,28 @@ import ( // the config has no custom TLS options, http.DefaultTransport is returned. type tlsTransportCache struct { mu sync.Mutex - transports map[string]*http.Transport + transports map[tlsCacheKey]*http.Transport } const idleConnsPerHost = 25 -var tlsCache = &tlsTransportCache{transports: make(map[string]*http.Transport)} +var tlsCache = &tlsTransportCache{transports: make(map[tlsCacheKey]*http.Transport)} + +type tlsCacheKey struct { + insecure bool + caData string + certData string + keyData string + serverName string +} + +func (t tlsCacheKey) String() string { + keyText := "" + if len(t.keyData) > 0 { + keyText = "" + } + return fmt.Sprintf("insecure:%v, caData:%#v, certData:%#v, keyData:%s, serverName:%s", t.insecure, t.caData, t.certData, keyText, t.serverName) +} func (c *tlsTransportCache) get(config *Config) (http.RoundTripper, error) { key, err := tlsConfigKey(config) @@ -82,11 +98,16 @@ func (c *tlsTransportCache) get(config *Config) (http.RoundTripper, error) { } // tlsConfigKey returns a unique key for tls.Config objects returned from TLSConfigFor -func tlsConfigKey(c *Config) (string, error) { +func tlsConfigKey(c *Config) (tlsCacheKey, error) { // Make sure ca/key/cert content is loaded if err := loadTLSFiles(c); err != nil { - return "", err + return tlsCacheKey{}, err } - // Only include the things that actually affect the tls.Config - return fmt.Sprintf("%v/%x/%x/%x/%v", c.TLS.Insecure, c.TLS.CAData, c.TLS.CertData, c.TLS.KeyData, c.TLS.ServerName), nil + return tlsCacheKey{ + insecure: c.TLS.Insecure, + caData: string(c.TLS.CAData), + certData: string(c.TLS.CertData), + keyData: string(c.TLS.KeyData), + serverName: c.TLS.ServerName, + }, nil }