Skip to content

Commit 298b886

Browse files
authored
Merge pull request kubernetes#74800 from danielqsj/mgo
fix golint failures for some files under metrics k8s.io/metrics/pkg/apis
2 parents e24e26f + 6a27a4a commit 298b886

File tree

14 files changed

+36
-30
lines changed

14 files changed

+36
-30
lines changed

hack/.golint_failures

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -610,12 +610,8 @@ staging/src/k8s.io/kube-proxy/config/v1alpha1
610610
staging/src/k8s.io/kubelet/config/v1beta1
611611
staging/src/k8s.io/metrics/pkg/apis/custom_metrics
612612
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1
613-
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2
614613
staging/src/k8s.io/metrics/pkg/apis/external_metrics
615-
staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1
616614
staging/src/k8s.io/metrics/pkg/apis/metrics
617-
staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1
618-
staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1
619615
staging/src/k8s.io/metrics/pkg/client/custom_metrics
620616
staging/src/k8s.io/metrics/pkg/client/custom_metrics/fake
621617
staging/src/k8s.io/metrics/pkg/client/custom_metrics/scheme

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/register.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
3434
}
3535

3636
var (
37+
// SchemeBuilder points to a list of functions added to Scheme.
3738
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs)
3839
localSchemeBuilder = &SchemeBuilder
39-
AddToScheme = localSchemeBuilder.AddToScheme
40+
// AddToScheme applies all the stored functions to the scheme.
41+
AddToScheme = localSchemeBuilder.AddToScheme
4042
)
4143

4244
func addKnownTypes(scheme *runtime.Scheme) error {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
2626

27-
// a list of values for a given metric for some set of objects
27+
// MetricValueList is a list of values for a given metric for some set of objects
2828
type MetricValueList struct {
2929
metav1.TypeMeta `json:",inline"`
3030
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -35,7 +35,7 @@ type MetricValueList struct {
3535

3636
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
3737

38-
// a metric value for some object
38+
// MetricValue is a metric value for some object
3939
type MetricValue struct {
4040
metav1.TypeMeta `json:",inline"`
4141

@@ -81,6 +81,6 @@ type MetricListOptions struct {
8181
MetricLabelSelector string `json:"metricLabelSelector,omitempty" protobuf:"bytes,2,opt,name=metricLabelSelector"`
8282
}
8383

84-
// allObjects is a wildcard used to select metrics
84+
// AllObjects is a wildcard used to select metrics
8585
// for all objects matching the given label selector
8686
const AllObjects = "*"

staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/register.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
3434
}
3535

3636
var (
37+
// SchemeBuilder points to a list of functions added to Scheme.
3738
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
3839
localSchemeBuilder = &SchemeBuilder
39-
AddToScheme = localSchemeBuilder.AddToScheme
40+
// AddToScheme applies all the stored functions to the scheme.
41+
AddToScheme = localSchemeBuilder.AddToScheme
4042
)
4143

4244
func addKnownTypes(scheme *runtime.Scheme) error {

staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/generated.proto

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/register.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
3434
}
3535

3636
var (
37+
// SchemeBuilder points to a list of functions added to Scheme.
3738
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
3839
localSchemeBuilder = &SchemeBuilder
39-
AddToScheme = localSchemeBuilder.AddToScheme
40+
// AddToScheme applies all the stored functions to the scheme.
41+
AddToScheme = localSchemeBuilder.AddToScheme
4042
)
4143

4244
func addKnownTypes(scheme *runtime.Scheme) error {

staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
2525

26-
// a list of values for a given metric for some set labels
26+
// ExternalMetricValueList is a list of values for a given metric for some set labels
2727
type ExternalMetricValueList struct {
2828
metav1.TypeMeta `json:",inline"`
2929
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -34,7 +34,7 @@ type ExternalMetricValueList struct {
3434

3535
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
3636

37-
// a metric value for external metric
37+
// ExternalMetricValue is a metric value for external metric
3838
// A single metric value is identified by metric name and a set of string labels.
3939
// For one metric there can be multiple values with different sets of labels.
4040
type ExternalMetricValue struct {

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

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/register.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
3434
}
3535

3636
var (
37+
// SchemeBuilder points to a list of functions added to Scheme.
3738
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
3839
localSchemeBuilder = &SchemeBuilder
39-
AddToScheme = SchemeBuilder.AddToScheme
40+
// AddToScheme applies all the stored functions to the scheme.
41+
AddToScheme = SchemeBuilder.AddToScheme
4042
)
4143

4244
func addKnownTypes(scheme *runtime.Scheme) error {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
// +genclient:nonNamespaced
2828
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
2929

30-
// resource usage metrics of a node.
30+
// NodeMetrics sets resource usage metrics of a node.
3131
type NodeMetrics struct {
3232
metav1.TypeMeta `json:",inline"`
3333
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -59,7 +59,7 @@ type NodeMetricsList struct {
5959
// +genclient:readonly
6060
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
6161

62-
// resource usage metrics of a pod.
62+
// PodMetrics sets resource usage metrics of a pod.
6363
type PodMetrics struct {
6464
metav1.TypeMeta `json:",inline"`
6565
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -86,7 +86,7 @@ type PodMetricsList struct {
8686
Items []PodMetrics `json:"items" protobuf:"bytes,2,rep,name=items"`
8787
}
8888

89-
// resource usage metrics of a container.
89+
// ContainerMetrics sets resource usage metrics of a container.
9090
type ContainerMetrics struct {
9191
// Container name corresponding to the one from pod.spec.containers.
9292
Name string `json:"name" protobuf:"bytes,1,opt,name=name"`

staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/generated.proto

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/register.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
3434
}
3535

3636
var (
37+
// SchemeBuilder points to a list of functions added to Scheme.
3738
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
3839
localSchemeBuilder = &SchemeBuilder
39-
AddToScheme = SchemeBuilder.AddToScheme
40+
// AddToScheme applies all the stored functions to the scheme.
41+
AddToScheme = SchemeBuilder.AddToScheme
4042
)
4143

4244
func addKnownTypes(scheme *runtime.Scheme) error {

staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
// +genclient:nonNamespaced
2828
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
2929

30-
// resource usage metrics of a node.
30+
// NodeMetrics sets resource usage metrics of a node.
3131
type NodeMetrics struct {
3232
metav1.TypeMeta `json:",inline"`
3333
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -59,7 +59,7 @@ type NodeMetricsList struct {
5959
// +genclient:readonly
6060
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
6161

62-
// resource usage metrics of a pod.
62+
// PodMetrics sets resource usage metrics of a pod.
6363
type PodMetrics struct {
6464
metav1.TypeMeta `json:",inline"`
6565
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@@ -86,7 +86,7 @@ type PodMetricsList struct {
8686
Items []PodMetrics `json:"items" protobuf:"bytes,2,rep,name=items"`
8787
}
8888

89-
// resource usage metrics of a container.
89+
// ContainerMetrics sets resource usage metrics of a container.
9090
type ContainerMetrics struct {
9191
// Container name corresponding to the one from pod.spec.containers.
9292
Name string `json:"name" protobuf:"bytes,1,opt,name=name"`

0 commit comments

Comments
 (0)