github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74800 from danielqsj/mgo 

fix golint failures for some files under metrics k8s.io/metrics/pkg/apis
pull/564/head
Kubernetes Prow Robot 2019-03-05 06:51:20 -08:00 committed by GitHub
parent e24e26fac8 6a27a4a5b9
commit 298b8869cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/.golint_failures
View File

@ -610,12 +610,8 @@ staging/src/k8s.io/kube-proxy/config/v1alpha1
staging/src/k8s.io/kubelet/config/v1beta1
staging/src/k8s.io/metrics/pkg/apis/custom_metrics
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2
staging/src/k8s.io/metrics/pkg/apis/external_metrics
staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1
staging/src/k8s.io/metrics/pkg/apis/metrics
staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1
staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1
staging/src/k8s.io/metrics/pkg/client/custom_metrics
staging/src/k8s.io/metrics/pkg/client/custom_metrics/fake
staging/src/k8s.io/metrics/pkg/client/custom_metrics/scheme

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

@ -42,7 +42,7 @@ message MetricListOptions {
optional string metricLabelSelector = 2;
}
// a metric value for some object
// MetricValue is a metric value for some object
message MetricValue {
// a reference to the described object
optional k8s.io.api.core.v1.ObjectReference describedObject = 1;
@ -70,7 +70,7 @@ message MetricValue {
optional k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector selector = 6;
}
// a list of values for a given metric for some set of objects
// MetricValueList is a list of values for a given metric for some set of objects
message MetricValueList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;

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

@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
}
var (
// SchemeBuilder points to a list of functions added to Scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs)
localSchemeBuilder = &SchemeBuilder
AddToScheme = localSchemeBuilder.AddToScheme
// AddToScheme applies all the stored functions to the scheme.
AddToScheme = localSchemeBuilder.AddToScheme
)
func addKnownTypes(scheme *runtime.Scheme) error {

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

@ -24,7 +24,7 @@ import (
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// a list of values for a given metric for some set of objects
// MetricValueList is a list of values for a given metric for some set of objects
type MetricValueList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -35,7 +35,7 @@ type MetricValueList struct {
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// a metric value for some object
// MetricValue is a metric value for some object
type MetricValue struct {
metav1.TypeMeta `json:",inline"`
@ -81,6 +81,6 @@ type MetricListOptions struct {
MetricLabelSelector string `json:"metricLabelSelector,omitempty" protobuf:"bytes,2,opt,name=metricLabelSelector"`
}
// allObjects is a wildcard used to select metrics
// AllObjects is a wildcard used to select metrics
// for all objects matching the given label selector
const AllObjects = "*"

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

@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
}
var (
// SchemeBuilder points to a list of functions added to Scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
localSchemeBuilder = &SchemeBuilder
AddToScheme = localSchemeBuilder.AddToScheme
// AddToScheme applies all the stored functions to the scheme.
AddToScheme = localSchemeBuilder.AddToScheme
)
func addKnownTypes(scheme *runtime.Scheme) error {

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

@ -29,7 +29,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
// Package-wide variables from generator "generated".
option go_package = "v1beta1";
// a metric value for external metric
// ExternalMetricValue is a metric value for external metric
// A single metric value is identified by metric name and a set of string labels.
// For one metric there can be multiple values with different sets of labels.
message ExternalMetricValue {
@ -52,7 +52,7 @@ message ExternalMetricValue {
optional k8s.io.apimachinery.pkg.api.resource.Quantity value = 5;
}
// a list of values for a given metric for some set labels
// ExternalMetricValueList is a list of values for a given metric for some set labels
message ExternalMetricValueList {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;

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

@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
}
var (
// SchemeBuilder points to a list of functions added to Scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
localSchemeBuilder = &SchemeBuilder
AddToScheme = localSchemeBuilder.AddToScheme
// AddToScheme applies all the stored functions to the scheme.
AddToScheme = localSchemeBuilder.AddToScheme
)
func addKnownTypes(scheme *runtime.Scheme) error {

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

@ -23,7 +23,7 @@ import (
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// a list of values for a given metric for some set labels
// ExternalMetricValueList is a list of values for a given metric for some set labels
type ExternalMetricValueList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -34,7 +34,7 @@ type ExternalMetricValueList struct {
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// a metric value for external metric
// ExternalMetricValue is a metric value for external metric
// A single metric value is identified by metric name and a set of string labels.
// For one metric there can be multiple values with different sets of labels.
type ExternalMetricValue struct {

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

@ -30,7 +30,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
// Package-wide variables from generator "generated".
option go_package = "v1alpha1";
// resource usage metrics of a container.
// ContainerMetrics sets resource usage metrics of a container.
message ContainerMetrics {
// Container name corresponding to the one from pod.spec.containers.
optional string name = 1;
@ -39,7 +39,7 @@ message ContainerMetrics {
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> usage = 2;
}
// resource usage metrics of a node.
// NodeMetrics sets resource usage metrics of a node.
message NodeMetrics {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
@ -63,7 +63,7 @@ message NodeMetricsList {
repeated NodeMetrics items = 2;
}
// resource usage metrics of a pod.
// PodMetrics sets resource usage metrics of a pod.
message PodMetrics {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;

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

@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
}
var (
// SchemeBuilder points to a list of functions added to Scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
localSchemeBuilder = &SchemeBuilder
AddToScheme = SchemeBuilder.AddToScheme
// AddToScheme applies all the stored functions to the scheme.
AddToScheme = SchemeBuilder.AddToScheme
)
func addKnownTypes(scheme *runtime.Scheme) error {

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

@ -27,7 +27,7 @@ import (
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// resource usage metrics of a node.
// NodeMetrics sets resource usage metrics of a node.
type NodeMetrics struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -59,7 +59,7 @@ type NodeMetricsList struct {
// +genclient:readonly
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// resource usage metrics of a pod.
// PodMetrics sets resource usage metrics of a pod.
type PodMetrics struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -86,7 +86,7 @@ type PodMetricsList struct {
Items []PodMetrics `json:"items" protobuf:"bytes,2,rep,name=items"`
}
// resource usage metrics of a container.
// ContainerMetrics sets resource usage metrics of a container.
type ContainerMetrics struct {
// Container name corresponding to the one from pod.spec.containers.
Name string `json:"name" protobuf:"bytes,1,opt,name=name"`

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

@ -30,7 +30,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
// Package-wide variables from generator "generated".
option go_package = "v1beta1";
// resource usage metrics of a container.
// ContainerMetrics sets resource usage metrics of a container.
message ContainerMetrics {
// Container name corresponding to the one from pod.spec.containers.
optional string name = 1;
@ -39,7 +39,7 @@ message ContainerMetrics {
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> usage = 2;
}
// resource usage metrics of a node.
// NodeMetrics sets resource usage metrics of a node.
message NodeMetrics {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
@ -63,7 +63,7 @@ message NodeMetricsList {
repeated NodeMetrics items = 2;
}
// resource usage metrics of a pod.
// PodMetrics sets resource usage metrics of a pod.
message PodMetrics {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;

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

@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
}
var (
// SchemeBuilder points to a list of functions added to Scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
localSchemeBuilder = &SchemeBuilder
AddToScheme = SchemeBuilder.AddToScheme
// AddToScheme applies all the stored functions to the scheme.
AddToScheme = SchemeBuilder.AddToScheme
)
func addKnownTypes(scheme *runtime.Scheme) error {

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

@ -27,7 +27,7 @@ import (
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// resource usage metrics of a node.
// NodeMetrics sets resource usage metrics of a node.
type NodeMetrics struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -59,7 +59,7 @@ type NodeMetricsList struct {
// +genclient:readonly
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// resource usage metrics of a pod.
// PodMetrics sets resource usage metrics of a pod.
type PodMetrics struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -86,7 +86,7 @@ type PodMetricsList struct {
Items []PodMetrics `json:"items" protobuf:"bytes,2,rep,name=items"`
}
// resource usage metrics of a container.
// ContainerMetrics sets resource usage metrics of a container.
type ContainerMetrics struct {
// Container name corresponding to the one from pod.spec.containers.
Name string `json:"name" protobuf:"bytes,1,opt,name=name"`