From 36c771826e028facdce5111aa39c184d9a6ea160 Mon Sep 17 00:00:00 2001 From: Eric Chiang Date: Mon, 17 Jul 2017 15:32:44 -0700 Subject: [PATCH] api types: fix protobuf names that are different from JSON name --- staging/src/k8s.io/api/authorization/v1/types.go | 2 +- staging/src/k8s.io/api/authorization/v1beta1/types.go | 2 +- staging/src/k8s.io/api/certificates/v1beta1/types.go | 2 +- .../k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/api/authorization/v1/types.go b/staging/src/k8s.io/api/authorization/v1/types.go index 38c314ffcfb..fbcc3df5212 100644 --- a/staging/src/k8s.io/api/authorization/v1/types.go +++ b/staging/src/k8s.io/api/authorization/v1/types.go @@ -131,7 +131,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"` diff --git a/staging/src/k8s.io/api/authorization/v1beta1/types.go b/staging/src/k8s.io/api/authorization/v1beta1/types.go index 8a1727423b8..f5bd86d9e36 100644 --- a/staging/src/k8s.io/api/authorization/v1beta1/types.go +++ b/staging/src/k8s.io/api/authorization/v1beta1/types.go @@ -131,7 +131,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"` diff --git a/staging/src/k8s.io/api/certificates/v1beta1/types.go b/staging/src/k8s.io/api/certificates/v1beta1/types.go index a9149ba8dff..88f47dbe94f 100644 --- a/staging/src/k8s.io/api/certificates/v1beta1/types.go +++ b/staging/src/k8s.io/api/certificates/v1beta1/types.go @@ -51,7 +51,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. diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go index 1e80ae16820..fe51f6015fd 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go +++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go @@ -48,7 +48,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"`