diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.pb.go b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.pb.go
index b720b6ec8e8..bb537bf88da 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.pb.go
+++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.pb.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: api.proto
 
-package deviceplugin
+package v1alpha
 
 import (
 	context "context"
@@ -541,45 +541,47 @@ func init() {
 func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) }
 
 var fileDescriptor_00212fb1f9d3bf1c = []byte{
-	// 595 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x5d, 0x8b, 0xd3, 0x40,
-	0x14, 0x6d, 0xd2, 0xdd, 0x6e, 0x7b, 0xb7, 0xfb, 0xc1, 0xb8, 0x48, 0x88, 0x1a, 0x96, 0x88, 0xb0,
-	0x20, 0xa6, 0x6b, 0x7d, 0x50, 0x44, 0xc4, 0x4a, 0x2b, 0x94, 0xf5, 0xa3, 0xc6, 0x07, 0x1f, 0xcb,
-	0x34, 0xbd, 0x36, 0xc1, 0x64, 0x26, 0x66, 0x26, 0x85, 0xbe, 0xf9, 0x13, 0xfc, 0x19, 0xfe, 0x94,
-	0x7d, 0xf4, 0xd1, 0x47, 0xb7, 0xfe, 0x0e, 0x41, 0x3a, 0x49, 0xfa, 0x11, 0x8a, 0x22, 0xf8, 0x96,
-	0x7b, 0xe6, 0x9e, 0xc9, 0xb9, 0x27, 0xf7, 0x04, 0x1a, 0x34, 0x0e, 0x9c, 0x38, 0xe1, 0x92, 0x93,
-	0xe6, 0x18, 0xa7, 0x81, 0x87, 0x71, 0x98, 0x4e, 0x02, 0x66, 0xde, 0x9b, 0x04, 0xd2, 0x4f, 0x47,
-	0x8e, 0xc7, 0xa3, 0xd6, 0x84, 0x4f, 0x78, 0x4b, 0x35, 0x8d, 0xd2, 0x0f, 0xaa, 0x52, 0x85, 0x7a,
-	0xca, 0xc8, 0x76, 0x08, 0x47, 0x2e, 0x4e, 0x02, 0x21, 0x31, 0x71, 0xf1, 0x53, 0x8a, 0x42, 0x12,
-	0x03, 0xf6, 0xa6, 0x98, 0x88, 0x80, 0x33, 0x43, 0x3b, 0xd5, 0xce, 0x1a, 0x6e, 0x51, 0x12, 0x13,
-	0xea, 0xc8, 0xc6, 0x31, 0x0f, 0x98, 0x34, 0x74, 0x75, 0xb4, 0xac, 0xc9, 0x6d, 0x38, 0x48, 0x50,
-	0xf0, 0x34, 0xf1, 0x70, 0xc8, 0x68, 0x84, 0x46, 0x55, 0x35, 0x34, 0x0b, 0xf0, 0x35, 0x8d, 0xd0,
-	0xde, 0x83, 0xdd, 0x5e, 0x14, 0xcb, 0x99, 0xfd, 0x02, 0x4e, 0x5e, 0x06, 0x42, 0x76, 0xd8, 0xf8,
-	0x3d, 0x95, 0x9e, 0xef, 0xa2, 0x88, 0x39, 0x13, 0x48, 0x1c, 0xd8, 0xcb, 0xa6, 0x11, 0x86, 0x76,
-	0x5a, 0x3d, 0xdb, 0x6f, 0x9f, 0x38, 0xeb, 0xd3, 0x39, 0x5d, 0x55, 0xb8, 0x45, 0x93, 0x7d, 0x0e,
-	0xb5, 0x0c, 0x22, 0x87, 0xa0, 0xf7, 0xbb, 0xb9, 0x60, 0xbd, 0xdf, 0x25, 0xd7, 0xa1, 0xe6, 0x23,
-	0x0d, 0xa5, 0x9f, 0x2b, 0xcd, 0x2b, 0xfb, 0x3e, 0x1c, 0x75, 0xc2, 0x90, 0x7b, 0x54, 0x62, 0x31,
-	0xb0, 0x05, 0x90, 0xdf, 0xd7, 0xef, 0x66, 0xef, 0x6d, 0xb8, 0x6b, 0x88, 0xfd, 0x4b, 0x87, 0xe3,
-	0x15, 0x27, 0x57, 0xfa, 0x04, 0x76, 0x90, 0x4d, 0x0b, 0x99, 0x67, 0x9b, 0x32, 0xcb, 0xdd, 0x4e,
-	0x8f, 0x4d, 0x45, 0x8f, 0xc9, 0x64, 0xe6, 0x2a, 0x16, 0xb9, 0x0b, 0xb5, 0x88, 0xa7, 0x4c, 0x0a,
-	0x43, 0x57, 0xfc, 0x6b, 0x9b, 0xfc, 0x57, 0x8b, 0x33, 0x37, 0x6f, 0x21, 0xed, 0x95, 0x29, 0x55,
-	0xd5, 0x6d, 0x6c, 0x33, 0xe5, 0x5d, 0x8c, 0xde, 0xd2, 0x18, 0xf2, 0x16, 0xf6, 0x29, 0x63, 0x5c,
-	0x52, 0x19, 0x70, 0x26, 0x8c, 0x1d, 0xc5, 0x6b, 0xfd, 0x45, 0x65, 0x67, 0xc5, 0xc8, 0xc4, 0xae,
-	0xdf, 0x61, 0x3e, 0x84, 0xc6, 0x72, 0x0c, 0x72, 0x0c, 0xd5, 0x8f, 0x38, 0xcb, 0xfd, 0x5e, 0x3c,
-	0x92, 0x13, 0xd8, 0x9d, 0xd2, 0x30, 0xc5, 0xdc, 0xef, 0xac, 0x78, 0xac, 0x3f, 0xd2, 0xcc, 0xa7,
-	0x70, 0x5c, 0xbe, 0xf9, 0x5f, 0xf8, 0xb6, 0x0f, 0xbb, 0xca, 0x10, 0x72, 0x07, 0x0e, 0x3d, 0xce,
-	0x24, 0x0d, 0x18, 0x26, 0xc3, 0x98, 0x4a, 0x3f, 0xe7, 0x1f, 0x2c, 0xd1, 0x01, 0x95, 0x3e, 0xb9,
-	0x01, 0x0d, 0x9f, 0x0b, 0x99, 0x75, 0xe4, 0x7b, 0xba, 0x00, 0x8a, 0xc3, 0x04, 0xe9, 0x78, 0xc8,
-	0x59, 0x38, 0x53, 0x3b, 0x5a, 0x77, 0xeb, 0x0b, 0xe0, 0x0d, 0x0b, 0x67, 0x76, 0x02, 0xb0, 0x32,
-	0xf3, 0xbf, 0xbc, 0xee, 0x14, 0xf6, 0x63, 0x4c, 0xa2, 0x40, 0x08, 0xf5, 0x1d, 0xb2, 0x50, 0xac,
-	0x43, 0xed, 0x01, 0x34, 0xb3, 0x04, 0x26, 0xca, 0x1f, 0xf2, 0x0c, 0xea, 0x45, 0x22, 0xc9, 0xad,
-	0xcd, 0x0f, 0x56, 0x4a, 0xaa, 0x59, 0xda, 0x9a, 0x2c, 0x5a, 0x95, 0xf6, 0x57, 0x0d, 0x9a, 0xd9,
-	0x18, 0x03, 0x75, 0x40, 0x2e, 0xa0, 0xb9, 0x9e, 0x36, 0xb2, 0x8d, 0x67, 0xda, 0x9b, 0xe0, 0xb6,
-	0x78, 0xda, 0x95, 0x73, 0x8d, 0x5c, 0x40, 0xbd, 0x58, 0x9c, 0xb2, 0xbe, 0x52, 0xb0, 0x4c, 0xeb,
-	0xcf, 0xfb, 0x66, 0x57, 0x9e, 0xdf, 0xbc, 0xbc, 0xb2, 0xb4, 0xef, 0x57, 0x56, 0xe5, 0xf3, 0xdc,
-	0xd2, 0x2e, 0xe7, 0x96, 0xf6, 0x6d, 0x6e, 0x69, 0x3f, 0xe6, 0x96, 0xf6, 0xe5, 0xa7, 0x55, 0x19,
-	0xd5, 0xd4, 0x3f, 0xea, 0xc1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x6a, 0x16, 0xa4, 0xed,
-	0x04, 0x00, 0x00,
+	// 628 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0x8d, 0x93, 0x36, 0x4d, 0x6e, 0xd3, 0x1f, 0xcd, 0x57, 0x7d, 0xb2, 0x8c, 0xb0, 0x2a, 0x23,
+	0xa4, 0x4a, 0x80, 0xdd, 0x86, 0x05, 0x15, 0x42, 0x88, 0xa2, 0x14, 0xa9, 0x94, 0x9f, 0x62, 0x16,
+	0x48, 0x6c, 0xaa, 0x89, 0x73, 0x89, 0x47, 0x71, 0x66, 0x8c, 0x67, 0x1c, 0x29, 0x3b, 0x1e, 0x81,
+	0xc7, 0xe0, 0x51, 0xba, 0x64, 0xc9, 0x92, 0x86, 0xe7, 0x40, 0x42, 0x19, 0xdb, 0xf9, 0xb1, 0x22,
+	0x10, 0x12, 0x3b, 0xdf, 0x33, 0xf7, 0x8c, 0xcf, 0x3d, 0xbe, 0xc7, 0xd0, 0xa4, 0x31, 0x73, 0xe3,
+	0x44, 0x28, 0x41, 0x5a, 0x3d, 0x1c, 0xb1, 0x00, 0xe3, 0x28, 0xed, 0x33, 0x6e, 0xdd, 0xeb, 0x33,
+	0x15, 0xa6, 0x5d, 0x37, 0x10, 0x43, 0xaf, 0x2f, 0xfa, 0xc2, 0xd3, 0x4d, 0xdd, 0xf4, 0x83, 0xae,
+	0x74, 0xa1, 0x9f, 0x32, 0xb2, 0x13, 0xc1, 0x8e, 0x8f, 0x7d, 0x26, 0x15, 0x26, 0x3e, 0x7e, 0x4c,
+	0x51, 0x2a, 0x62, 0xc2, 0xc6, 0x08, 0x13, 0xc9, 0x04, 0x37, 0x8d, 0x7d, 0xe3, 0xa0, 0xe9, 0x17,
+	0x25, 0xb1, 0xa0, 0x81, 0xbc, 0x17, 0x0b, 0xc6, 0x95, 0x59, 0xd5, 0x47, 0xb3, 0x9a, 0xdc, 0x82,
+	0xad, 0x04, 0xa5, 0x48, 0x93, 0x00, 0x2f, 0x39, 0x1d, 0xa2, 0x59, 0xd3, 0x0d, 0xad, 0x02, 0x7c,
+	0x45, 0x87, 0xe8, 0x6c, 0xc0, 0xfa, 0xe9, 0x30, 0x56, 0x63, 0xe7, 0x19, 0xec, 0xbd, 0x60, 0x52,
+	0x9d, 0xf0, 0xde, 0x3b, 0xaa, 0x82, 0xd0, 0x47, 0x19, 0x0b, 0x2e, 0x91, 0xb8, 0xb0, 0x91, 0x4d,
+	0x23, 0x4d, 0x63, 0xbf, 0x76, 0xb0, 0xd9, 0xde, 0x73, 0x17, 0xa7, 0x73, 0x3b, 0xba, 0xf0, 0x8b,
+	0x26, 0xe7, 0x10, 0xea, 0x19, 0x44, 0xb6, 0xa1, 0x7a, 0xd6, 0xc9, 0x05, 0x57, 0xcf, 0x3a, 0xe4,
+	0x7f, 0xa8, 0x87, 0x48, 0x23, 0x15, 0xe6, 0x4a, 0xf3, 0xca, 0x39, 0x82, 0x9d, 0x93, 0x28, 0x12,
+	0x01, 0x55, 0x58, 0x0c, 0x6c, 0x03, 0xe4, 0xf7, 0x9d, 0x75, 0xb2, 0xf7, 0x36, 0xfd, 0x05, 0xc4,
+	0xf9, 0x59, 0x85, 0xdd, 0x39, 0x27, 0x57, 0xfa, 0x08, 0xd6, 0x90, 0x8f, 0x0a, 0x99, 0x07, 0xcb,
+	0x32, 0xcb, 0xdd, 0xee, 0x29, 0x1f, 0xc9, 0x53, 0xae, 0x92, 0xb1, 0xaf, 0x59, 0xe4, 0x0e, 0xd4,
+	0x87, 0x22, 0xe5, 0x4a, 0x9a, 0x55, 0xcd, 0xff, 0x6f, 0x99, 0xff, 0x72, 0x7a, 0xe6, 0xe7, 0x2d,
+	0xa4, 0x3d, 0x37, 0xa5, 0xa6, 0xbb, 0xcd, 0x55, 0xa6, 0xbc, 0x8d, 0x31, 0x98, 0x19, 0x43, 0xde,
+	0xc0, 0x26, 0xe5, 0x5c, 0x28, 0xaa, 0x98, 0xe0, 0xd2, 0x5c, 0xd3, 0x3c, 0xef, 0x0f, 0x2a, 0x4f,
+	0xe6, 0x8c, 0x4c, 0xec, 0xe2, 0x1d, 0xd6, 0x03, 0x68, 0xce, 0xc6, 0x20, 0xbb, 0x50, 0x1b, 0xe0,
+	0x38, 0xf7, 0x7b, 0xfa, 0x48, 0xf6, 0x60, 0x7d, 0x44, 0xa3, 0x14, 0x73, 0xbf, 0xb3, 0xe2, 0x61,
+	0xf5, 0xd8, 0xb0, 0x1e, 0xc3, 0x6e, 0xf9, 0xe6, 0xbf, 0xe1, 0x3b, 0x21, 0xac, 0x6b, 0x43, 0xc8,
+	0x6d, 0xd8, 0x0e, 0x04, 0x57, 0x94, 0x71, 0x4c, 0x2e, 0x63, 0xaa, 0xc2, 0x9c, 0xbf, 0x35, 0x43,
+	0x2f, 0xa8, 0x0a, 0xc9, 0x0d, 0x68, 0x86, 0x42, 0xaa, 0xac, 0x23, 0xdf, 0xd3, 0x29, 0x50, 0x1c,
+	0x26, 0x48, 0x7b, 0x97, 0x82, 0x47, 0x63, 0xbd, 0xa3, 0x0d, 0xbf, 0x31, 0x05, 0x5e, 0xf3, 0x68,
+	0xec, 0x24, 0x00, 0x73, 0x33, 0xff, 0xc9, 0xeb, 0xf6, 0x61, 0x33, 0xc6, 0x64, 0xc8, 0xa4, 0xd4,
+	0xdf, 0x21, 0x0b, 0xc5, 0x22, 0xd4, 0xbe, 0x80, 0x56, 0x96, 0xc0, 0x44, 0xfb, 0x43, 0x9e, 0x40,
+	0xa3, 0x48, 0x24, 0xb9, 0xb9, 0xfc, 0xc1, 0x4a, 0x49, 0xb5, 0x4a, 0x5b, 0x93, 0x45, 0xab, 0xd2,
+	0xfe, 0x62, 0x40, 0x2b, 0x1b, 0xe3, 0x42, 0x1f, 0x90, 0x73, 0x68, 0x2d, 0xa6, 0x8d, 0xac, 0xe2,
+	0x59, 0xce, 0x32, 0xb8, 0x2a, 0x9e, 0x4e, 0xe5, 0xd0, 0x20, 0xe7, 0xd0, 0x28, 0x16, 0xa7, 0xac,
+	0xaf, 0x14, 0x2c, 0xcb, 0xfe, 0xfd, 0xbe, 0x39, 0x95, 0xa7, 0xcf, 0xaf, 0xae, 0x6d, 0xe3, 0xdb,
+	0xb5, 0x5d, 0xf9, 0x34, 0xb1, 0x8d, 0xab, 0x89, 0x6d, 0x7c, 0x9d, 0xd8, 0xc6, 0xf7, 0x89, 0x6d,
+	0x7c, 0xfe, 0x61, 0x57, 0xde, 0xdf, 0x1d, 0x1c, 0x4b, 0x97, 0x09, 0x6f, 0x90, 0x76, 0x31, 0x42,
+	0xe5, 0xc5, 0x83, 0xbe, 0x47, 0x63, 0x26, 0xbd, 0xc5, 0x6b, 0xbd, 0xd1, 0x11, 0x8d, 0xe2, 0x90,
+	0x76, 0xeb, 0xfa, 0x8f, 0x76, 0xff, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x41, 0x95, 0x28, 0xc9,
+	0x1b, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto
index 201a4cb7cb8..ecea6b91aa4 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto
+++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto
@@ -1,7 +1,8 @@
 // To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
 syntax = "proto3";
 
-package deviceplugin;
+package deviceplugin; // This should have been v1alpha.
+option go_package = "k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/constants.go b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/constants.go
index 7c1ebdfa2dc..1b03f609ef8 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/constants.go
+++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/constants.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package deviceplugin
+package v1alpha
 
 const (
 	// Healthy means that the device is healthy
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.pb.go b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.pb.go
index 4f183239ca4..a24d42881f3 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.pb.go
+++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.pb.go
@@ -1101,71 +1101,73 @@ func init() {
 func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) }
 
 var fileDescriptor_00212fb1f9d3bf1c = []byte{
-	// 1014 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x5f, 0x6f, 0x1b, 0x45,
-	0x10, 0xcf, 0xc5, 0x4d, 0x62, 0x8f, 0x5d, 0x27, 0xdd, 0x84, 0xc8, 0xb9, 0x04, 0x37, 0xdd, 0x14,
-	0x1a, 0xa4, 0xc6, 0x21, 0x2e, 0x6a, 0x11, 0x0f, 0x08, 0x17, 0x07, 0xb0, 0x42, 0x53, 0xeb, 0x42,
-	0xc5, 0x03, 0x88, 0xd3, 0xf9, 0x6e, 0x63, 0x9f, 0x38, 0xef, 0x1e, 0xb7, 0x6b, 0x4b, 0xae, 0x84,
-	0xc4, 0x03, 0x1f, 0xa0, 0xdf, 0x01, 0xbe, 0x02, 0xdf, 0xa1, 0x8f, 0x3c, 0xf2, 0x84, 0xa8, 0xf9,
-	0x22, 0xe8, 0x76, 0xef, 0x9f, 0x2e, 0x17, 0x2b, 0x95, 0x78, 0xf3, 0xce, 0xcc, 0x6f, 0xfe, 0xfc,
-	0x66, 0x3c, 0x73, 0x50, 0xb1, 0x7c, 0xb7, 0xe5, 0x07, 0x4c, 0x30, 0xb4, 0x36, 0x3d, 0x19, 0x10,
-	0x61, 0x9d, 0xe8, 0x47, 0x43, 0x57, 0x8c, 0x26, 0x83, 0x96, 0xcd, 0xc6, 0xc7, 0x43, 0x36, 0x64,
-	0xc7, 0x52, 0x3f, 0x98, 0x5c, 0xca, 0x97, 0x7c, 0xc8, 0x5f, 0x0a, 0x87, 0x5f, 0x69, 0xb0, 0xd9,
-	0x25, 0x53, 0xd7, 0x26, 0x7d, 0x6f, 0x32, 0x74, 0xe9, 0x73, 0x5f, 0xb8, 0x8c, 0x72, 0xf4, 0x10,
-	0x90, 0x1f, 0x10, 0x93, 0x0b, 0x2b, 0x10, 0x66, 0x40, 0x7e, 0x9a, 0xb8, 0x01, 0x71, 0x1a, 0xda,
-	0xbe, 0x76, 0x58, 0x36, 0x36, 0xfc, 0x80, 0x5c, 0x84, 0x0a, 0x23, 0x92, 0xa3, 0x33, 0xc0, 0x43,
-	0x22, 0x4c, 0x3f, 0x20, 0x97, 0x24, 0x08, 0x88, 0x63, 0x5a, 0x9e, 0xc7, 0x6c, 0x2b, 0x74, 0x65,
-	0x5a, 0x53, 0xcb, 0xf5, 0xac, 0x81, 0x47, 0x1a, 0xcb, 0x12, 0x7d, 0x77, 0x48, 0x44, 0x3f, 0x36,
-	0xec, 0x24, 0x76, 0x9d, 0xd8, 0x0c, 0xff, 0xae, 0xc1, 0xba, 0x41, 0x86, 0x2e, 0x17, 0x24, 0x08,
-	0x23, 0x10, 0x2e, 0x50, 0x03, 0xd6, 0xa6, 0x24, 0xe0, 0x2e, 0xa3, 0x32, 0x87, 0x8a, 0x11, 0x3f,
-	0x91, 0x0e, 0x65, 0x42, 0x1d, 0x9f, 0xb9, 0x54, 0xc8, 0x00, 0x15, 0x23, 0x79, 0xa3, 0x03, 0xb8,
-	0x1d, 0x10, 0xce, 0x26, 0x81, 0x4d, 0x4c, 0x6a, 0x8d, 0x49, 0xa3, 0x24, 0x0d, 0x6a, 0xb1, 0xf0,
-	0xdc, 0x1a, 0x13, 0xf4, 0x18, 0xd6, 0x98, 0x2a, 0xba, 0x71, 0x6b, 0x5f, 0x3b, 0xac, 0xb6, 0xf7,
-	0x5a, 0x11, 0x97, 0xad, 0x02, 0x62, 0x8c, 0xd8, 0x18, 0xaf, 0xc1, 0xca, 0xe9, 0xd8, 0x17, 0x33,
-	0xdc, 0x81, 0xad, 0xaf, 0x5d, 0x2e, 0x3a, 0xd4, 0xf9, 0xd6, 0x12, 0xf6, 0xc8, 0x20, 0xdc, 0x67,
-	0x94, 0x13, 0xf4, 0x01, 0xac, 0x39, 0xd2, 0x01, 0x6f, 0x68, 0xfb, 0xa5, 0xc3, 0x6a, 0x7b, 0x3d,
-	0xe7, 0xd8, 0x88, 0xf5, 0xf8, 0x09, 0xd4, 0xbe, 0x61, 0x3e, 0xf3, 0xd8, 0x70, 0xd6, 0xa3, 0x97,
-	0x0c, 0x3d, 0x80, 0x15, 0xca, 0x9c, 0x04, 0x78, 0x27, 0x01, 0x9e, 0xbf, 0x78, 0xd6, 0x39, 0x67,
-	0x0e, 0x31, 0x94, 0x1e, 0xeb, 0x50, 0x8e, 0x45, 0xa8, 0x0e, 0xcb, 0xbd, 0xae, 0xa4, 0xa7, 0x64,
-	0x2c, 0xf7, 0xba, 0xd8, 0x86, 0x55, 0x15, 0x27, 0xa3, 0xa9, 0x84, 0x1a, 0xb4, 0x0d, 0xab, 0x23,
-	0x62, 0x79, 0x62, 0x14, 0x31, 0x16, 0xbd, 0xd0, 0x09, 0x94, 0x45, 0x94, 0x86, 0xa4, 0xaa, 0xda,
-	0x7e, 0x27, 0x89, 0x9c, 0xcd, 0xcf, 0x48, 0xcc, 0xf0, 0x19, 0x34, 0xfa, 0xd1, 0x34, 0x7c, 0xce,
-	0xa8, 0xb0, 0x5c, 0x9a, 0x36, 0xed, 0x18, 0xaa, 0x51, 0x81, 0xa6, 0xeb, 0xa8, 0x5a, 0x2a, 0x4f,
-	0xeb, 0xf3, 0xbf, 0xef, 0x82, 0xca, 0x8b, 0xf7, 0xba, 0xdc, 0x80, 0xc8, 0xa4, 0xe7, 0x70, 0xbc,
-	0x0b, 0x3b, 0x05, 0xce, 0x14, 0x9d, 0x78, 0x06, 0x7a, 0xc1, 0xd8, 0xc4, 0xb1, 0xbe, 0x03, 0x64,
-	0xc7, 0x10, 0x39, 0xaf, 0x84, 0x8b, 0x98, 0xbe, 0x87, 0x49, 0x11, 0x89, 0xd7, 0xeb, 0x3d, 0x19,
-	0x77, 0xec, 0x5c, 0x1d, 0x1c, 0xff, 0xa1, 0xc1, 0xc1, 0x0d, 0xa0, 0xe8, 0x18, 0x36, 0x93, 0x69,
-	0x37, 0x55, 0x5d, 0xbd, 0x6e, 0x54, 0xb8, 0x81, 0x12, 0x55, 0x37, 0xd6, 0xa0, 0x8f, 0x60, 0x7b,
-	0x3c, 0xe1, 0xc2, 0x74, 0xa9, 0xed, 0x4d, 0x9c, 0x2c, 0x66, 0x59, 0x62, 0xb6, 0x42, 0x6d, 0x4f,
-	0x29, 0x53, 0xd4, 0x03, 0x58, 0xcf, 0xfc, 0xbf, 0xb8, 0xfb, 0x52, 0x0d, 0xf6, 0x8a, 0x51, 0x4f,
-	0xc5, 0x17, 0xee, 0x4b, 0x82, 0x7f, 0x86, 0xdd, 0xc2, 0x6c, 0xa3, 0x01, 0xfd, 0x01, 0x36, 0xb3,
-	0x9c, 0x29, 0x69, 0x4c, 0xda, 0xd1, 0x0d, 0x49, 0x53, 0x28, 0x03, 0xd9, 0xf9, 0x86, 0x71, 0xdc,
-	0x85, 0xfb, 0x37, 0xc1, 0xa2, 0x3d, 0xa8, 0xe4, 0xc9, 0x4a, 0x05, 0xd8, 0x86, 0xf5, 0x08, 0x43,
-	0x62, 0x9e, 0xfb, 0x0b, 0x9a, 0x7d, 0xef, 0x6a, 0xde, 0x39, 0x78, 0x51, 0x87, 0xcf, 0xa0, 0x71,
-	0x9d, 0xf9, 0xdb, 0x8f, 0xf1, 0x10, 0x36, 0x52, 0x1f, 0x51, 0x8d, 0x17, 0x8b, 0xb8, 0xc6, 0x8b,
-	0x72, 0x5e, 0x40, 0xf0, 0xaf, 0x25, 0xd8, 0xb9, 0x16, 0x81, 0x3e, 0x83, 0x5b, 0x84, 0x4e, 0x17,
-	0xfc, 0x09, 0xf2, 0x88, 0xd6, 0x29, 0x9d, 0xf2, 0x53, 0x2a, 0x82, 0x99, 0x21, 0x91, 0xe8, 0x7d,
-	0x58, 0x1d, 0xb3, 0x09, 0x15, 0x6a, 0x1c, 0xab, 0xed, 0x7a, 0xe2, 0xe3, 0x59, 0x28, 0x36, 0x22,
-	0x2d, 0x3a, 0x4a, 0x37, 0x5d, 0x49, 0x1a, 0x6e, 0xe6, 0x36, 0xdd, 0x85, 0x4f, 0xec, 0x64, 0xdb,
-	0xa1, 0x17, 0x50, 0xb5, 0x28, 0x65, 0xc2, 0x8a, 0xb7, 0x6e, 0x08, 0x79, 0x74, 0x83, 0xfc, 0x3a,
-	0x29, 0x4a, 0xa5, 0x99, 0xf5, 0xa3, 0x3f, 0x81, 0x4a, 0x52, 0x00, 0xda, 0x80, 0xd2, 0x8f, 0x64,
-	0x16, 0xed, 0xbc, 0xf0, 0x27, 0xda, 0x82, 0x95, 0xa9, 0xe5, 0x4d, 0x48, 0xb4, 0xf3, 0xd4, 0xe3,
-	0x93, 0xe5, 0x8f, 0x35, 0xfd, 0x53, 0xd8, 0xc8, 0x7b, 0x7e, 0x1b, 0x3c, 0x1e, 0xc1, 0x8a, 0xe4,
-	0x03, 0xbd, 0x07, 0xf5, 0xb4, 0xc9, 0xbe, 0x25, 0x46, 0x11, 0xfe, 0x76, 0x22, 0xed, 0x5b, 0x62,
-	0x84, 0x76, 0xa1, 0x32, 0x62, 0x5c, 0x28, 0x8b, 0xe8, 0x66, 0x85, 0x82, 0x58, 0x19, 0x10, 0xcb,
-	0x31, 0x19, 0xf5, 0xd4, 0x12, 0x2e, 0x1b, 0xe5, 0x50, 0xf0, 0x9c, 0x7a, 0x33, 0x1c, 0x00, 0xa4,
-	0x84, 0xfe, 0x2f, 0xe1, 0xf6, 0xa1, 0xea, 0x93, 0x60, 0xec, 0x72, 0x2e, 0x7b, 0xa1, 0x0e, 0x64,
-	0x56, 0xd4, 0xfe, 0x02, 0x6a, 0xea, 0x1a, 0x07, 0x92, 0x1f, 0xf4, 0x18, 0xca, 0xf1, 0x75, 0x46,
-	0x8d, 0xa4, 0x69, 0xb9, 0x83, 0xad, 0xa7, 0xa3, 0xa2, 0x8e, 0xe4, 0x52, 0xfb, 0xb7, 0x12, 0xd4,
-	0xb2, 0x07, 0x15, 0x7d, 0x05, 0xdb, 0x5f, 0x12, 0x51, 0xf4, 0xf1, 0x91, 0x03, 0xeb, 0x0b, 0x2f,
-	0x32, 0x5e, 0x42, 0x1d, 0xa8, 0x65, 0x2f, 0xf0, 0x15, 0xfc, 0xbb, 0xc9, 0xbb, 0xe8, 0x50, 0xe3,
-	0xa5, 0x0f, 0x35, 0x44, 0x64, 0x32, 0x05, 0x5b, 0x0a, 0x1d, 0x24, 0xe0, 0xeb, 0x37, 0xbf, 0x7e,
-	0x7f, 0xb1, 0x51, 0x1c, 0x08, 0x75, 0xa0, 0x1c, 0x4f, 0x75, 0x86, 0xbc, 0xdc, 0xc6, 0xd1, 0x77,
-	0x0a, 0x34, 0x89, 0x8b, 0xef, 0xe1, 0xce, 0x95, 0x23, 0x89, 0xee, 0x65, 0xe3, 0x17, 0x5e, 0x63,
-	0x1d, 0x2f, 0x32, 0x89, 0xbd, 0x3f, 0xdd, 0x7b, 0xfd, 0xa6, 0xa9, 0xfd, 0xf5, 0xa6, 0xb9, 0xf4,
-	0xcb, 0xbc, 0xa9, 0xbd, 0x9e, 0x37, 0xb5, 0x3f, 0xe7, 0x4d, 0xed, 0x9f, 0x79, 0x53, 0x7b, 0xf5,
-	0x6f, 0x73, 0x69, 0xb0, 0x2a, 0x3f, 0x1a, 0x1f, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x2d,
-	0xfa, 0x93, 0x79, 0x0a, 0x00, 0x00,
+	// 1044 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x6e, 0x1b, 0x45,
+	0x14, 0xce, 0xc6, 0x4d, 0x62, 0x1f, 0xa7, 0xf9, 0x99, 0x84, 0xc8, 0xd9, 0x14, 0x37, 0x9d, 0x14,
+	0x1a, 0xa4, 0xc4, 0x26, 0x2e, 0x6a, 0x2b, 0x2e, 0x10, 0x2e, 0x0e, 0x60, 0x42, 0xd3, 0x68, 0x43,
+	0x85, 0x04, 0x08, 0x6b, 0xbc, 0x3b, 0xb1, 0x57, 0x59, 0xcf, 0x2c, 0x3b, 0x63, 0x4b, 0xae, 0x84,
+	0xc4, 0x05, 0x0f, 0xd0, 0x77, 0x80, 0x57, 0xe0, 0x1d, 0x7a, 0xc9, 0x25, 0x57, 0x88, 0x9a, 0x17,
+	0x41, 0x9e, 0xd9, 0x3f, 0x6d, 0x36, 0x56, 0x2a, 0x71, 0xe7, 0x39, 0xe7, 0x7c, 0xe7, 0xe7, 0x3b,
+	0x67, 0xcf, 0x31, 0x94, 0x88, 0xef, 0xd6, 0xfc, 0x80, 0x4b, 0x8e, 0x96, 0x46, 0x47, 0x5d, 0x2a,
+	0xc9, 0x91, 0x79, 0xd8, 0x73, 0x65, 0x7f, 0xd8, 0xad, 0xd9, 0x7c, 0x50, 0xef, 0xf1, 0x1e, 0xaf,
+	0x2b, 0x7d, 0x77, 0x78, 0xa1, 0x5e, 0xea, 0xa1, 0x7e, 0x69, 0x1c, 0x7e, 0x65, 0xc0, 0x46, 0x8b,
+	0x8e, 0x5c, 0x9b, 0x9e, 0x79, 0xc3, 0x9e, 0xcb, 0x9e, 0xfb, 0xd2, 0xe5, 0x4c, 0xa0, 0x03, 0x40,
+	0x7e, 0x40, 0x3b, 0x42, 0x92, 0x40, 0x76, 0x02, 0xfa, 0xd3, 0xd0, 0x0d, 0xa8, 0x53, 0x31, 0x76,
+	0x8d, 0xfd, 0xa2, 0xb5, 0xe6, 0x07, 0xf4, 0x7c, 0xaa, 0xb0, 0x42, 0x39, 0x3a, 0x01, 0xdc, 0xa3,
+	0xb2, 0xe3, 0x07, 0xf4, 0x82, 0x06, 0x01, 0x75, 0x3a, 0xc4, 0xf3, 0xb8, 0x4d, 0xa6, 0xae, 0x3a,
+	0x64, 0x44, 0x5c, 0x8f, 0x74, 0x3d, 0x5a, 0x99, 0x57, 0xe8, 0xbb, 0x3d, 0x2a, 0xcf, 0x22, 0xc3,
+	0x66, 0x6c, 0xd7, 0x8c, 0xcc, 0xf0, 0xef, 0x06, 0xac, 0x5a, 0xb4, 0xe7, 0x0a, 0x49, 0x83, 0x69,
+	0x04, 0x2a, 0x24, 0xaa, 0xc0, 0xd2, 0x88, 0x06, 0xc2, 0xe5, 0x4c, 0xe5, 0x50, 0xb2, 0xa2, 0x27,
+	0x32, 0xa1, 0x48, 0x99, 0xe3, 0x73, 0x97, 0x49, 0x15, 0xa0, 0x64, 0xc5, 0x6f, 0xb4, 0x07, 0xb7,
+	0x03, 0x2a, 0xf8, 0x30, 0xb0, 0x69, 0x87, 0x91, 0x01, 0xad, 0x14, 0x94, 0xc1, 0x72, 0x24, 0x3c,
+	0x25, 0x03, 0x8a, 0x1e, 0xc1, 0x12, 0xd7, 0x45, 0x57, 0x6e, 0xed, 0x1a, 0xfb, 0xe5, 0xc6, 0x9d,
+	0x5a, 0xc8, 0x65, 0x2d, 0x87, 0x18, 0x2b, 0x32, 0xc6, 0x4b, 0xb0, 0x70, 0x3c, 0xf0, 0xe5, 0x18,
+	0x37, 0x61, 0xf3, 0x6b, 0x57, 0xc8, 0x26, 0x73, 0xbe, 0x25, 0xd2, 0xee, 0x5b, 0x54, 0xf8, 0x9c,
+	0x09, 0x8a, 0x3e, 0x80, 0x25, 0x47, 0x39, 0x10, 0x15, 0x63, 0xb7, 0xb0, 0x5f, 0x6e, 0xac, 0x66,
+	0x1c, 0x5b, 0x91, 0x1e, 0x3f, 0x86, 0xe5, 0x6f, 0xb8, 0xcf, 0x3d, 0xde, 0x1b, 0xb7, 0xd9, 0x05,
+	0x47, 0x0f, 0x60, 0x81, 0x71, 0x27, 0x06, 0xae, 0xc7, 0xc0, 0xd3, 0x17, 0xcf, 0x9a, 0xa7, 0xdc,
+	0xa1, 0x96, 0xd6, 0x63, 0x13, 0x8a, 0x91, 0x08, 0xad, 0xc0, 0x7c, 0xbb, 0xa5, 0xe8, 0x29, 0x58,
+	0xf3, 0xed, 0x16, 0xb6, 0x61, 0x51, 0xc7, 0x49, 0x69, 0x4a, 0x53, 0x0d, 0xda, 0x82, 0xc5, 0x3e,
+	0x25, 0x9e, 0xec, 0x87, 0x8c, 0x85, 0x2f, 0x74, 0x04, 0x45, 0x19, 0xa6, 0xa1, 0xa8, 0x2a, 0x37,
+	0xde, 0x89, 0x23, 0xa7, 0xf3, 0xb3, 0x62, 0x33, 0x7c, 0x02, 0x95, 0xb3, 0x70, 0x1a, 0x3e, 0xe3,
+	0x4c, 0x12, 0x97, 0x25, 0x4d, 0xab, 0x43, 0x39, 0x2c, 0xb0, 0xe3, 0x3a, 0xba, 0x96, 0xd2, 0xd3,
+	0x95, 0xc9, 0xdf, 0x77, 0x41, 0xe7, 0x25, 0xda, 0x2d, 0x61, 0x41, 0x68, 0xd2, 0x76, 0x04, 0xde,
+	0x81, 0xed, 0x1c, 0x67, 0x9a, 0x4e, 0x3c, 0x06, 0x33, 0x67, 0x6c, 0xa2, 0x58, 0xdf, 0x03, 0xb2,
+	0x23, 0x88, 0x9a, 0x57, 0x2a, 0x64, 0x44, 0xdf, 0x41, 0x5c, 0x44, 0xec, 0xf5, 0x7a, 0x4f, 0xd6,
+	0xba, 0x9d, 0xa9, 0x43, 0xe0, 0x3f, 0x0c, 0xd8, 0xbb, 0x01, 0x14, 0xd5, 0x61, 0x23, 0x9e, 0xf6,
+	0x8e, 0xae, 0xab, 0xdd, 0x0a, 0x0b, 0xb7, 0x50, 0xac, 0x6a, 0x45, 0x1a, 0xf4, 0x11, 0x6c, 0x0d,
+	0x86, 0x42, 0x76, 0x5c, 0x66, 0x7b, 0x43, 0x27, 0x8d, 0x99, 0x57, 0x98, 0xcd, 0xa9, 0xb6, 0xad,
+	0x95, 0x09, 0xea, 0x01, 0xac, 0xa6, 0xbe, 0x2f, 0xe1, 0xbe, 0xd4, 0x83, 0xbd, 0x60, 0xad, 0x24,
+	0xe2, 0x73, 0xf7, 0x25, 0xc5, 0x3f, 0xc3, 0x4e, 0x6e, 0xb6, 0xe1, 0x80, 0xfe, 0x08, 0x1b, 0x69,
+	0xce, 0xb4, 0x34, 0x22, 0xed, 0xf0, 0x86, 0xa4, 0x69, 0x94, 0x85, 0xec, 0x6c, 0xc3, 0x04, 0x6e,
+	0xc1, 0xfd, 0x9b, 0x60, 0xd1, 0x1d, 0x28, 0x65, 0xc9, 0x4a, 0x04, 0xd8, 0x86, 0xd5, 0x10, 0x43,
+	0x23, 0x9e, 0xcf, 0x66, 0x34, 0xfb, 0xde, 0xd5, 0xbc, 0x33, 0xf0, 0xbc, 0x0e, 0x9f, 0x40, 0xe5,
+	0x3a, 0xf3, 0xb7, 0x1f, 0xe3, 0x1e, 0xac, 0x25, 0x3e, 0xc2, 0x1a, 0xcf, 0x67, 0x71, 0x8d, 0x67,
+	0xe5, 0x3c, 0x83, 0xe0, 0x5f, 0x0b, 0xb0, 0x7d, 0x2d, 0x02, 0x7d, 0x0a, 0xb7, 0x28, 0x1b, 0xcd,
+	0xf8, 0x08, 0xb2, 0x88, 0xda, 0x31, 0x1b, 0x89, 0x63, 0x26, 0x83, 0xb1, 0xa5, 0x90, 0xe8, 0x7d,
+	0x58, 0x1c, 0xf0, 0x21, 0x93, 0x7a, 0x1c, 0xcb, 0x8d, 0x95, 0xd8, 0xc7, 0xb3, 0xa9, 0xd8, 0x0a,
+	0xb5, 0xe8, 0x30, 0xd9, 0x74, 0x05, 0x65, 0xb8, 0x91, 0xd9, 0x74, 0xe7, 0x3e, 0xb5, 0xe3, 0x6d,
+	0x87, 0x5e, 0x40, 0x99, 0x30, 0xc6, 0x25, 0x89, 0xb6, 0xee, 0x14, 0xf2, 0xf0, 0x06, 0xf9, 0x35,
+	0x13, 0x94, 0x4e, 0x33, 0xed, 0xc7, 0x7c, 0x0c, 0xa5, 0xb8, 0x00, 0xb4, 0x06, 0x85, 0x4b, 0x3a,
+	0x0e, 0x77, 0xde, 0xf4, 0x27, 0xda, 0x84, 0x85, 0x11, 0xf1, 0x86, 0x34, 0xdc, 0x79, 0xfa, 0xf1,
+	0xf1, 0xfc, 0x13, 0xc3, 0xfc, 0x04, 0xd6, 0xb2, 0x9e, 0xdf, 0x06, 0x8f, 0xfb, 0xb0, 0xa0, 0xf8,
+	0x40, 0xef, 0xc1, 0x4a, 0xd2, 0x64, 0x9f, 0xc8, 0x7e, 0x88, 0xbf, 0x1d, 0x4b, 0xcf, 0x88, 0xec,
+	0xa3, 0x1d, 0x28, 0xf5, 0xb9, 0x90, 0xda, 0x22, 0xbc, 0x59, 0x53, 0x41, 0xa4, 0x0c, 0x28, 0x71,
+	0x3a, 0x9c, 0x79, 0x7a, 0x09, 0x17, 0xad, 0xe2, 0x54, 0xf0, 0x9c, 0x79, 0x63, 0x1c, 0x00, 0x24,
+	0x84, 0xfe, 0x2f, 0xe1, 0x76, 0xa1, 0xec, 0xd3, 0x60, 0xe0, 0x0a, 0xa1, 0x7a, 0xa1, 0x0f, 0x64,
+	0x5a, 0xd4, 0xf8, 0x1c, 0x96, 0xf5, 0x35, 0x0e, 0x14, 0x3f, 0xe8, 0x11, 0x14, 0xa3, 0xeb, 0x8c,
+	0x2a, 0x71, 0xd3, 0x32, 0x07, 0xdb, 0x4c, 0x46, 0x45, 0x1f, 0xc9, 0xb9, 0xc6, 0x6f, 0x05, 0x58,
+	0x4e, 0x1f, 0x54, 0xf4, 0x25, 0x6c, 0x7d, 0x41, 0x65, 0xde, 0x9f, 0x8f, 0x0c, 0xd8, 0x9c, 0x79,
+	0x91, 0xf1, 0x1c, 0x6a, 0xc2, 0x72, 0xfa, 0x02, 0x5f, 0xc1, 0xbf, 0x1b, 0xbf, 0xf3, 0x0e, 0x35,
+	0x9e, 0xfb, 0xd0, 0x40, 0x54, 0x25, 0x93, 0xb3, 0xa5, 0xd0, 0x5e, 0x0c, 0xbe, 0x7e, 0xf3, 0x9b,
+	0xf7, 0x67, 0x1b, 0x45, 0x81, 0x50, 0x13, 0x8a, 0xd1, 0x54, 0xa7, 0xc8, 0xcb, 0x6c, 0x1c, 0x73,
+	0x3b, 0x47, 0x13, 0xbb, 0xf8, 0x01, 0xd6, 0xaf, 0x1c, 0x49, 0x74, 0x2f, 0x1d, 0x3f, 0xf7, 0x1a,
+	0x9b, 0x78, 0x96, 0x49, 0xe4, 0xfd, 0xe9, 0x57, 0xaf, 0xdf, 0x54, 0x8d, 0xbf, 0xde, 0x54, 0xe7,
+	0x7e, 0x99, 0x54, 0x8d, 0xd7, 0x93, 0xaa, 0xf1, 0xe7, 0xa4, 0x6a, 0xfc, 0x33, 0xa9, 0x1a, 0xaf,
+	0xfe, 0xad, 0xce, 0x7d, 0x77, 0x70, 0xf9, 0x44, 0xd4, 0x5c, 0x5e, 0xbf, 0x1c, 0x76, 0xa9, 0x47,
+	0x65, 0xdd, 0xbf, 0xec, 0xd5, 0x89, 0xef, 0x8a, 0xba, 0xfe, 0xb4, 0x7d, 0xd5, 0x97, 0x7a, 0x18,
+	0xa7, 0xbb, 0xa8, 0xfe, 0x62, 0x3e, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xe2, 0xf2, 0x09, 0x79,
+	0xa7, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto
index dbf608b810d..f44e7cebd2d 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto
+++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto
@@ -2,6 +2,7 @@
 syntax = "proto3";
 
 package v1beta1;
+option go_package = "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";