Merge pull request #45319 from ericchiang/fix-protobuf-names

staging/src/k8s.io/api/authorization/v1/generated.proto

@@ -153,7 +153,7 @@ message SubjectAccessReviewSpec {
   // User is the user you're testing for.
   // If you specify "User" but not "Groups", then is it interpreted as "What if User were not a member of any groups
   // +optional
-  optional string verb = 3;
+  optional string user = 3;
 
   // Groups is the groups you're testing for.
   // +optional

staging/src/k8s.io/api/authorization/v1/types.go

@@ -134,7 +134,7 @@ type SubjectAccessReviewSpec struct {
 	// User is the user you're testing for.
 	// If you specify "User" but not "Groups", then is it interpreted as "What if User were not a member of any groups
 	// +optional
-	User string `json:"user,omitempty" protobuf:"bytes,3,opt,name=verb"`
+	User string `json:"user,omitempty" protobuf:"bytes,3,opt,name=user"`
 	// Groups is the groups you're testing for.
 	// +optional
 	Groups []string `json:"groups,omitempty" protobuf:"bytes,4,rep,name=groups"`

staging/src/k8s.io/api/authorization/v1beta1/generated.proto

@@ -153,7 +153,7 @@ message SubjectAccessReviewSpec {
   // User is the user you're testing for.
   // If you specify "User" but not "Group", then is it interpreted as "What if User were not a member of any groups
   // +optional
-  optional string verb = 3;
+  optional string user = 3;
 
   // Groups is the groups you're testing for.
   // +optional

staging/src/k8s.io/api/authorization/v1beta1/types.go

@@ -134,7 +134,7 @@ type SubjectAccessReviewSpec struct {
 	// User is the user you're testing for.
 	// If you specify "User" but not "Group", then is it interpreted as "What if User were not a member of any groups
 	// +optional
-	User string `json:"user,omitempty" protobuf:"bytes,3,opt,name=verb"`
+	User string `json:"user,omitempty" protobuf:"bytes,3,opt,name=user"`
 	// Groups is the groups you're testing for.
 	// +optional
 	Groups []string `json:"group,omitempty" protobuf:"bytes,4,rep,name=group"`

staging/src/k8s.io/api/certificates/v1beta1/generated.proto

@@ -78,7 +78,7 @@ message CertificateSigningRequestSpec {
   // valid for.
   // See: https://tools.ietf.org/html/rfc5280#section-4.2.1.3
   //      https://tools.ietf.org/html/rfc5280#section-4.2.1.12
-  repeated string keyUsage = 5;
+  repeated string usages = 5;
 
   // Information about the requesting user.
   // See user.Info interface for details.

staging/src/k8s.io/api/certificates/v1beta1/types.go

@@ -52,7 +52,7 @@ type CertificateSigningRequestSpec struct {
 	// valid for.
 	// See: https://tools.ietf.org/html/rfc5280#section-4.2.1.3
 	//      https://tools.ietf.org/html/rfc5280#section-4.2.1.12
-	Usages []KeyUsage `json:"usages,omitempty" protobuf:"bytes,5,opt,name=keyUsage"`
+	Usages []KeyUsage `json:"usages,omitempty" protobuf:"bytes,5,opt,name=usages"`
 
 	// Information about the requesting user.
 	// See user.Info interface for details.

staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/generated.pb.go

@@ -665,40 +665,40 @@ func init() {
 }
 
 var fileDescriptorGenerated = []byte{
-	// 546 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4f, 0x8f, 0xd2, 0x40,
-	0x18, 0xc6, 0xe9, 0x22, 0x09, 0x0c, 0x21, 0xb8, 0xbd, 0xd8, 0x70, 0x28, 0x04, 0x2f, 0xc4, 0xc4,
-	0x99, 0x80, 0x46, 0x3d, 0x78, 0x6a, 0xbc, 0x98, 0x88, 0xc6, 0xee, 0x46, 0x8d, 0x9a, 0x98, 0x61,
-	0xfa, 0x52, 0x46, 0x68, 0xa7, 0x99, 0x99, 0xb2, 0xd9, 0x9b, 0x1f, 0xc1, 0x83, 0x1f, 0x8a, 0xe3,
-	0xc6, 0xd3, 0x9e, 0x88, 0xd4, 0x2f, 0x62, 0x5a, 0x5a, 0xfe, 0x2c, 0xae, 0xee, 0xde, 0x3a, 0x33,
-	0xef, 0xf3, 0x9b, 0xe7, 0x79, 0xdf, 0x29, 0xfa, 0x30, 0x7d, 0xa6, 0x30, 0x17, 0x64, 0x1a, 0x8f,
-	0x40, 0x86, 0xa0, 0x41, 0x91, 0x39, 0x84, 0x9e, 0x90, 0x24, 0x3f, 0x08, 0x40, 0x4b, 0xce, 0x14,
-	0x89, 0xa6, 0x3e, 0xa1, 0x11, 0x57, 0x84, 0xc5, 0x4a, 0x8b, 0xe0, 0x4b, 0xb1, 0x3f, 0xef, 0xd3,
-	0x59, 0x34, 0xa1, 0x7d, 0xe2, 0x43, 0x08, 0x92, 0x6a, 0xf0, 0x70, 0x24, 0x85, 0x16, 0x66, 0x0e,
-	0xc0, 0x79, 0x21, 0x8e, 0xa6, 0x3e, 0x4e, 0x01, 0x78, 0x1f, 0x80, 0x0b, 0x40, 0xeb, 0xa1, 0xcf,
-	0xf5, 0x24, 0x1e, 0x61, 0x26, 0x02, 0xe2, 0x0b, 0x5f, 0x90, 0x8c, 0x33, 0x8a, 0xc7, 0xd9, 0x2a,
-	0x5b, 0x64, 0x5f, 0x6b, 0x7e, 0xab, 0x9b, 0x1b, 0xa4, 0x11, 0x27, 0x4c, 0x48, 0x20, 0xf3, 0x03,
-	0x0f, 0xad, 0xc7, 0xdb, 0x9a, 0x80, 0xb2, 0x09, 0x0f, 0x41, 0x9e, 0x17, 0x49, 0x88, 0x04, 0x25,
-	0x62, 0xc9, 0xe0, 0x56, 0x2a, 0x95, 0x36, 0x84, 0xfe, 0xed, 0x2e, 0x72, 0x9d, 0x4a, 0xc6, 0xa1,
-	0xe6, 0xc1, 0xe1, 0x35, 0x4f, 0xfe, 0x27, 0x50, 0x6c, 0x02, 0x01, 0x3d, 0xd0, 0x3d, 0xba, 0x4e,
-	0x17, 0x6b, 0x3e, 0x23, 0x3c, 0xd4, 0x4a, 0xcb, 0xab, 0xa2, 0xee, 0x8f, 0x32, 0xaa, 0x0f, 0xb3,
-	0x8e, 0xbf, 0xa3, 0xb3, 0x18, 0xcc, 0x31, 0x6a, 0x7a, 0xa0, 0x98, 0xe4, 0x23, 0xf0, 0xde, 0x8c,
-	0xbe, 0x02, 0xd3, 0x96, 0xd1, 0x31, 0x7a, 0xf5, 0xc1, 0x7d, 0x9c, 0xcf, 0x8d, 0x46, 0x1c, 0xa7,
-	0x7d, 0xc5, 0xf3, 0x3e, 0x5e, 0x57, 0xb8, 0x30, 0x06, 0x09, 0x21, 0x03, 0xe7, 0xde, 0x62, 0xd9,
-	0x2e, 0x25, 0xcb, 0x76, 0xf3, 0xc5, 0x3e, 0xc3, 0xbd, 0x0a, 0x35, 0x07, 0x08, 0xad, 0x07, 0xfd,
-	0x9a, 0x06, 0x60, 0x1d, 0x75, 0x8c, 0x5e, 0xcd, 0x31, 0x73, 0x35, 0x1a, 0x6e, 0x4e, 0xdc, 0x9d,
-	0x2a, 0xf3, 0x13, 0xaa, 0xa5, 0xf9, 0x95, 0xa6, 0x41, 0x64, 0x95, 0x33, 0x57, 0x0f, 0x76, 0x5c,
-	0x6d, 0x42, 0x6f, 0x9f, 0x54, 0x3a, 0x93, 0xd4, 0xe7, 0x29, 0x0f, 0xc0, 0x39, 0xce, 0xf1, 0xb5,
-	0xd3, 0x02, 0xe2, 0x6e, 0x79, 0xe6, 0x53, 0xd4, 0x38, 0xe3, 0xa1, 0x27, 0xce, 0x4e, 0x80, 0x89,
-	0xd0, 0x53, 0xd6, 0x9d, 0x8e, 0xd1, 0x2b, 0x3b, 0xc7, 0xc9, 0xb2, 0xdd, 0x78, 0xbf, 0x7b, 0xe0,
-	0xee, 0xd7, 0x99, 0x27, 0xa8, 0x32, 0x4f, 0x5b, 0x67, 0x55, 0x32, 0x47, 0xf8, 0x5f, 0x8e, 0x70,
-	0xf1, 0xb6, 0xf0, 0xdb, 0x98, 0x86, 0x9a, 0xeb, 0x73, 0xa7, 0x91, 0xbb, 0xaa, 0x64, 0xfd, 0x77,
-	0xd7, 0xac, 0xee, 0x4f, 0x03, 0x35, 0x77, 0xc6, 0xf2, 0x8a, 0x2b, 0x6d, 0x7e, 0x46, 0xd5, 0x34,
-	0x8f, 0x47, 0x35, 0xcd, 0x67, 0x82, 0x6f, 0x96, 0x3e, 0x55, 0x0f, 0x41, 0x53, 0xe7, 0x6e, 0x7e,
-	0x57, 0xb5, 0xd8, 0x71, 0x37, 0x44, 0x93, 0xa2, 0x0a, 0xd7, 0x10, 0x28, 0xeb, 0xa8, 0x53, 0xee,
-	0xd5, 0x07, 0xcf, 0xf1, 0x2d, 0x7f, 0x53, 0xbc, 0x63, 0x77, 0x1b, 0xea, 0x65, 0x8a, 0x74, 0xd7,
-	0x64, 0x07, 0x2f, 0x56, 0x76, 0xe9, 0x62, 0x65, 0x97, 0x2e, 0x57, 0x76, 0xe9, 0x5b, 0x62, 0x1b,
-	0x8b, 0xc4, 0x36, 0x2e, 0x12, 0xdb, 0xb8, 0x4c, 0x6c, 0xe3, 0x57, 0x62, 0x1b, 0xdf, 0x7f, 0xdb,
-	0xa5, 0x8f, 0xd5, 0x82, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0xd1, 0xbe, 0x07, 0xe1, 0x84, 0x04,
-	0x00, 0x00,
+	// 545 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xc1, 0x6f, 0xd3, 0x30,
+	0x14, 0xc6, 0x9b, 0x95, 0xa2, 0xcd, 0xd5, 0x54, 0x96, 0x0b, 0x51, 0x0f, 0x69, 0x55, 0x2e, 0x05,
+	0x09, 0x5b, 0x2d, 0x08, 0x71, 0xe0, 0x14, 0x71, 0x41, 0xa2, 0x20, 0xb2, 0x09, 0x10, 0x20, 0x21,
+	0xd7, 0x79, 0x4d, 0x4d, 0x9b, 0x38, 0xb2, 0x9d, 0x4e, 0xbb, 0x71, 0xe2, 0xcc, 0x9f, 0xd5, 0xe3,
+	0xc4, 0x69, 0xa7, 0x8a, 0x86, 0x7f, 0x04, 0x25, 0x75, 0xda, 0x6e, 0x65, 0xc0, 0x6e, 0xb1, 0xfd,
+	0xbe, 0x9f, 0xbf, 0xef, 0x3d, 0x07, 0xbd, 0x9f, 0x3c, 0x55, 0x98, 0x0b, 0x32, 0x49, 0x87, 0x20,
+	0x63, 0xd0, 0xa0, 0xc8, 0x0c, 0xe2, 0x40, 0x48, 0x62, 0x0e, 0x22, 0xd0, 0x92, 0x33, 0x45, 0x92,
+	0x49, 0x48, 0x68, 0xc2, 0x15, 0x61, 0xa9, 0xd2, 0x22, 0xfa, 0x5c, 0xee, 0xcf, 0x7a, 0x74, 0x9a,
+	0x8c, 0x69, 0x8f, 0x84, 0x10, 0x83, 0xa4, 0x1a, 0x02, 0x9c, 0x48, 0xa1, 0x85, 0x6d, 0x00, 0xd8,
+	0x14, 0xe2, 0x64, 0x12, 0xe2, 0x1c, 0x80, 0x2f, 0x03, 0x70, 0x09, 0x68, 0x3e, 0x0c, 0xb9, 0x1e,
+	0xa7, 0x43, 0xcc, 0x44, 0x44, 0x42, 0x11, 0x0a, 0x52, 0x70, 0x86, 0xe9, 0xa8, 0x58, 0x15, 0x8b,
+	0xe2, 0x6b, 0xc5, 0x6f, 0x76, 0x8c, 0x41, 0x9a, 0x70, 0xc2, 0x84, 0x04, 0x32, 0xdb, 0xf1, 0xd0,
+	0x7c, 0xbc, 0xa9, 0x89, 0x28, 0x1b, 0xf3, 0x18, 0xe4, 0x59, 0x99, 0x84, 0x48, 0x50, 0x22, 0x95,
+	0x0c, 0x6e, 0xa4, 0x52, 0x79, 0x43, 0xe8, 0x9f, 0xee, 0x22, 0xd7, 0xa9, 0x64, 0x1a, 0x6b, 0x1e,
+	0xed, 0x5e, 0xf3, 0xe4, 0x5f, 0x02, 0xc5, 0xc6, 0x10, 0xd1, 0x1d, 0xdd, 0xa3, 0xeb, 0x74, 0xa9,
+	0xe6, 0x53, 0xc2, 0x63, 0xad, 0xb4, 0xbc, 0x2a, 0xea, 0x7c, 0xab, 0xa2, 0xfa, 0xa0, 0xe8, 0xf8,
+	0x5b, 0x3a, 0x4d, 0xc1, 0x1e, 0xa1, 0x46, 0x00, 0x8a, 0x49, 0x3e, 0x84, 0xe0, 0xf5, 0xf0, 0x0b,
+	0x30, 0xed, 0x58, 0x6d, 0xab, 0x5b, 0xef, 0xdf, 0xc3, 0x66, 0x6e, 0x34, 0xe1, 0x38, 0xef, 0x2b,
+	0x9e, 0xf5, 0xf0, 0xaa, 0xc2, 0x87, 0x11, 0x48, 0x88, 0x19, 0x78, 0x77, 0xe7, 0x8b, 0x56, 0x25,
+	0x5b, 0xb4, 0x1a, 0xcf, 0x2f, 0x33, 0xfc, 0xab, 0x50, 0xbb, 0x8f, 0xd0, 0x6a, 0xd0, 0xaf, 0x68,
+	0x04, 0xce, 0x5e, 0xdb, 0xea, 0x1e, 0x78, 0xb6, 0x51, 0xa3, 0xc1, 0xfa, 0xc4, 0xdf, 0xaa, 0xb2,
+	0x3f, 0xa2, 0x83, 0x3c, 0xbf, 0xd2, 0x34, 0x4a, 0x9c, 0x6a, 0xe1, 0xea, 0xc1, 0x96, 0xab, 0x75,
+	0xe8, 0xcd, 0x93, 0xca, 0x67, 0x92, 0xfb, 0x3c, 0xe1, 0x11, 0x78, 0x47, 0x06, 0x7f, 0x70, 0x52,
+	0x42, 0xfc, 0x0d, 0xcf, 0xbe, 0x8f, 0x6e, 0x9f, 0xf2, 0x38, 0x10, 0xa7, 0xce, 0xad, 0xb6, 0xd5,
+	0xad, 0x7a, 0x47, 0xd9, 0xa2, 0x75, 0xf8, 0xae, 0xd8, 0x39, 0x06, 0x26, 0xe2, 0x40, 0xf9, 0xa6,
+	0xc0, 0x3e, 0x46, 0xb5, 0x59, 0xde, 0x2c, 0xa7, 0x56, 0x78, 0xc0, 0x7f, 0xf3, 0x80, 0xcb, 0xd7,
+	0x84, 0xdf, 0xa4, 0x34, 0xd6, 0x5c, 0x9f, 0x79, 0x87, 0xc6, 0x47, 0xad, 0xe8, 0xb8, 0xbf, 0x62,
+	0x75, 0x7e, 0x58, 0xa8, 0xb1, 0x35, 0x88, 0x97, 0x5c, 0x69, 0xfb, 0x13, 0xda, 0xcf, 0x13, 0x04,
+	0x54, 0x53, 0x33, 0x05, 0xfc, 0x7f, 0x79, 0x73, 0xf5, 0x00, 0x34, 0xf5, 0xee, 0x98, 0xbb, 0xf6,
+	0xcb, 0x1d, 0x7f, 0x4d, 0xb4, 0x29, 0xaa, 0x71, 0x0d, 0x91, 0x72, 0xf6, 0xda, 0xd5, 0x6e, 0xbd,
+	0xff, 0x0c, 0xdf, 0xf0, 0xc7, 0xc4, 0x5b, 0x76, 0x37, 0xa1, 0x5e, 0xe4, 0x48, 0x7f, 0x45, 0xf6,
+	0xf0, 0x7c, 0xe9, 0x56, 0xce, 0x97, 0x6e, 0xe5, 0x62, 0xe9, 0x56, 0xbe, 0x66, 0xae, 0x35, 0xcf,
+	0x5c, 0xeb, 0x3c, 0x73, 0xad, 0x8b, 0xcc, 0xb5, 0x7e, 0x66, 0xae, 0xf5, 0xfd, 0x97, 0x5b, 0xf9,
+	0xb0, 0x5f, 0x12, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x80, 0xcc, 0x75, 0x01, 0x76, 0x04, 0x00,
+	0x00,
 }

staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/generated.proto

@@ -46,7 +46,7 @@ message MetricValue {
   // which these metrics were calculated, when returning rate
   // metrics calculated from cumulative metrics (or zero for
   // non-calculated instantaneous metrics).
-  optional int64 windowSeconds = 4;
+  optional int64 window = 4;
 
   // the value of the metric for this
   optional k8s.io.apimachinery.pkg.api.resource.Quantity value = 5;

staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go

@@ -52,7 +52,7 @@ type MetricValue struct {
 	// which these metrics were calculated, when returning rate
 	// metrics calculated from cumulative metrics (or zero for
 	// non-calculated instantaneous metrics).
-	WindowSeconds *int64 `json:"window,omitempty" protobuf:"bytes,4,opt,name=windowSeconds"`
+	WindowSeconds *int64 `json:"window,omitempty" protobuf:"bytes,4,opt,name=window"`
 
 	// the value of the metric for this
 	Value resource.Quantity `json:"value" protobuf:"bytes,5,name=value"`