mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #74800 from danielqsj/mgo
fix golint failures for some files under metrics k8s.io/metrics/pkg/apis
This commit is contained in:
commit
298b8869cf
@ -610,12 +610,8 @@ staging/src/k8s.io/kube-proxy/config/v1alpha1
|
|||||||
staging/src/k8s.io/kubelet/config/v1beta1
|
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
|
||||||
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1
|
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
|
||||||
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
|
||||||
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
|
||||||
staging/src/k8s.io/metrics/pkg/client/custom_metrics/fake
|
staging/src/k8s.io/metrics/pkg/client/custom_metrics/fake
|
||||||
staging/src/k8s.io/metrics/pkg/client/custom_metrics/scheme
|
staging/src/k8s.io/metrics/pkg/client/custom_metrics/scheme
|
||||||
|
@ -42,7 +42,7 @@ message MetricListOptions {
|
|||||||
optional string metricLabelSelector = 2;
|
optional string metricLabelSelector = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
// a metric value for some object
|
// MetricValue is a metric value for some object
|
||||||
message MetricValue {
|
message MetricValue {
|
||||||
// a reference to the described object
|
// a reference to the described object
|
||||||
optional k8s.io.api.core.v1.ObjectReference describedObject = 1;
|
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;
|
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 {
|
message MetricValueList {
|
||||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
|
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
|
||||||
|
|
||||||
|
@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
// SchemeBuilder points to a list of functions added to Scheme.
|
||||||
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs)
|
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs)
|
||||||
localSchemeBuilder = &SchemeBuilder
|
localSchemeBuilder = &SchemeBuilder
|
||||||
AddToScheme = localSchemeBuilder.AddToScheme
|
// AddToScheme applies all the stored functions to the scheme.
|
||||||
|
AddToScheme = localSchemeBuilder.AddToScheme
|
||||||
)
|
)
|
||||||
|
|
||||||
func addKnownTypes(scheme *runtime.Scheme) error {
|
func addKnownTypes(scheme *runtime.Scheme) error {
|
||||||
|
@ -24,7 +24,7 @@ import (
|
|||||||
|
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +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 {
|
type MetricValueList struct {
|
||||||
metav1.TypeMeta `json:",inline"`
|
metav1.TypeMeta `json:",inline"`
|
||||||
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
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
|
// +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 {
|
type MetricValue struct {
|
||||||
metav1.TypeMeta `json:",inline"`
|
metav1.TypeMeta `json:",inline"`
|
||||||
|
|
||||||
@ -81,6 +81,6 @@ type MetricListOptions struct {
|
|||||||
MetricLabelSelector string `json:"metricLabelSelector,omitempty" protobuf:"bytes,2,opt,name=metricLabelSelector"`
|
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
|
// for all objects matching the given label selector
|
||||||
const AllObjects = "*"
|
const AllObjects = "*"
|
||||||
|
@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
// SchemeBuilder points to a list of functions added to Scheme.
|
||||||
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
|
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
|
||||||
localSchemeBuilder = &SchemeBuilder
|
localSchemeBuilder = &SchemeBuilder
|
||||||
AddToScheme = localSchemeBuilder.AddToScheme
|
// AddToScheme applies all the stored functions to the scheme.
|
||||||
|
AddToScheme = localSchemeBuilder.AddToScheme
|
||||||
)
|
)
|
||||||
|
|
||||||
func addKnownTypes(scheme *runtime.Scheme) error {
|
func addKnownTypes(scheme *runtime.Scheme) error {
|
||||||
|
@ -29,7 +29,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
|
|||||||
// Package-wide variables from generator "generated".
|
// Package-wide variables from generator "generated".
|
||||||
option go_package = "v1beta1";
|
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.
|
// 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.
|
// For one metric there can be multiple values with different sets of labels.
|
||||||
message ExternalMetricValue {
|
message ExternalMetricValue {
|
||||||
@ -52,7 +52,7 @@ message ExternalMetricValue {
|
|||||||
optional k8s.io.apimachinery.pkg.api.resource.Quantity value = 5;
|
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 {
|
message ExternalMetricValueList {
|
||||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
|
optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
|
||||||
|
|
||||||
|
@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
// SchemeBuilder points to a list of functions added to Scheme.
|
||||||
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
|
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
|
||||||
localSchemeBuilder = &SchemeBuilder
|
localSchemeBuilder = &SchemeBuilder
|
||||||
AddToScheme = localSchemeBuilder.AddToScheme
|
// AddToScheme applies all the stored functions to the scheme.
|
||||||
|
AddToScheme = localSchemeBuilder.AddToScheme
|
||||||
)
|
)
|
||||||
|
|
||||||
func addKnownTypes(scheme *runtime.Scheme) error {
|
func addKnownTypes(scheme *runtime.Scheme) error {
|
||||||
|
@ -23,7 +23,7 @@ import (
|
|||||||
|
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +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 {
|
type ExternalMetricValueList struct {
|
||||||
metav1.TypeMeta `json:",inline"`
|
metav1.TypeMeta `json:",inline"`
|
||||||
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
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
|
// +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.
|
// 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.
|
// For one metric there can be multiple values with different sets of labels.
|
||||||
type ExternalMetricValue struct {
|
type ExternalMetricValue struct {
|
||||||
|
@ -30,7 +30,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
|
|||||||
// Package-wide variables from generator "generated".
|
// Package-wide variables from generator "generated".
|
||||||
option go_package = "v1alpha1";
|
option go_package = "v1alpha1";
|
||||||
|
|
||||||
// resource usage metrics of a container.
|
// ContainerMetrics sets resource usage metrics of a container.
|
||||||
message ContainerMetrics {
|
message ContainerMetrics {
|
||||||
// Container name corresponding to the one from pod.spec.containers.
|
// Container name corresponding to the one from pod.spec.containers.
|
||||||
optional string name = 1;
|
optional string name = 1;
|
||||||
@ -39,7 +39,7 @@ message ContainerMetrics {
|
|||||||
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> usage = 2;
|
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 {
|
message NodeMetrics {
|
||||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
||||||
|
|
||||||
@ -63,7 +63,7 @@ message NodeMetricsList {
|
|||||||
repeated NodeMetrics items = 2;
|
repeated NodeMetrics items = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
// resource usage metrics of a pod.
|
// PodMetrics sets resource usage metrics of a pod.
|
||||||
message PodMetrics {
|
message PodMetrics {
|
||||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
||||||
|
|
||||||
|
@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
// SchemeBuilder points to a list of functions added to Scheme.
|
||||||
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
|
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
|
||||||
localSchemeBuilder = &SchemeBuilder
|
localSchemeBuilder = &SchemeBuilder
|
||||||
AddToScheme = SchemeBuilder.AddToScheme
|
// AddToScheme applies all the stored functions to the scheme.
|
||||||
|
AddToScheme = SchemeBuilder.AddToScheme
|
||||||
)
|
)
|
||||||
|
|
||||||
func addKnownTypes(scheme *runtime.Scheme) error {
|
func addKnownTypes(scheme *runtime.Scheme) error {
|
||||||
|
@ -27,7 +27,7 @@ import (
|
|||||||
// +genclient:nonNamespaced
|
// +genclient:nonNamespaced
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +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 {
|
type NodeMetrics struct {
|
||||||
metav1.TypeMeta `json:",inline"`
|
metav1.TypeMeta `json:",inline"`
|
||||||
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
||||||
@ -59,7 +59,7 @@ type NodeMetricsList struct {
|
|||||||
// +genclient:readonly
|
// +genclient:readonly
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +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 {
|
type PodMetrics struct {
|
||||||
metav1.TypeMeta `json:",inline"`
|
metav1.TypeMeta `json:",inline"`
|
||||||
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
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"`
|
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 {
|
type ContainerMetrics struct {
|
||||||
// Container name corresponding to the one from pod.spec.containers.
|
// Container name corresponding to the one from pod.spec.containers.
|
||||||
Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
|
Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
|
||||||
|
@ -30,7 +30,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
|
|||||||
// Package-wide variables from generator "generated".
|
// Package-wide variables from generator "generated".
|
||||||
option go_package = "v1beta1";
|
option go_package = "v1beta1";
|
||||||
|
|
||||||
// resource usage metrics of a container.
|
// ContainerMetrics sets resource usage metrics of a container.
|
||||||
message ContainerMetrics {
|
message ContainerMetrics {
|
||||||
// Container name corresponding to the one from pod.spec.containers.
|
// Container name corresponding to the one from pod.spec.containers.
|
||||||
optional string name = 1;
|
optional string name = 1;
|
||||||
@ -39,7 +39,7 @@ message ContainerMetrics {
|
|||||||
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> usage = 2;
|
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 {
|
message NodeMetrics {
|
||||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
||||||
|
|
||||||
@ -63,7 +63,7 @@ message NodeMetricsList {
|
|||||||
repeated NodeMetrics items = 2;
|
repeated NodeMetrics items = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
// resource usage metrics of a pod.
|
// PodMetrics sets resource usage metrics of a pod.
|
||||||
message PodMetrics {
|
message PodMetrics {
|
||||||
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
|
||||||
|
|
||||||
|
@ -34,9 +34,11 @@ func Resource(resource string) schema.GroupResource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
// SchemeBuilder points to a list of functions added to Scheme.
|
||||||
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
|
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
|
||||||
localSchemeBuilder = &SchemeBuilder
|
localSchemeBuilder = &SchemeBuilder
|
||||||
AddToScheme = SchemeBuilder.AddToScheme
|
// AddToScheme applies all the stored functions to the scheme.
|
||||||
|
AddToScheme = SchemeBuilder.AddToScheme
|
||||||
)
|
)
|
||||||
|
|
||||||
func addKnownTypes(scheme *runtime.Scheme) error {
|
func addKnownTypes(scheme *runtime.Scheme) error {
|
||||||
|
@ -27,7 +27,7 @@ import (
|
|||||||
// +genclient:nonNamespaced
|
// +genclient:nonNamespaced
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +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 {
|
type NodeMetrics struct {
|
||||||
metav1.TypeMeta `json:",inline"`
|
metav1.TypeMeta `json:",inline"`
|
||||||
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
||||||
@ -59,7 +59,7 @@ type NodeMetricsList struct {
|
|||||||
// +genclient:readonly
|
// +genclient:readonly
|
||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +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 {
|
type PodMetrics struct {
|
||||||
metav1.TypeMeta `json:",inline"`
|
metav1.TypeMeta `json:",inline"`
|
||||||
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
|
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"`
|
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 {
|
type ContainerMetrics struct {
|
||||||
// Container name corresponding to the one from pod.spec.containers.
|
// Container name corresponding to the one from pod.spec.containers.
|
||||||
Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
|
Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
|
||||||
|
Loading…
Reference in New Issue
Block a user