Commit 3294200d authored by Chao Xu's avatar Chao Xu

move metrics to staging

parent 0421dbfe
...@@ -2892,58 +2892,6 @@ ...@@ -2892,58 +2892,6 @@
"Rev": "c2ac40f1adf8c42a79badddb2a2acd673cae3bcb" "Rev": "c2ac40f1adf8c42a79badddb2a2acd673cae3bcb"
}, },
{ {
"ImportPath": "k8s.io/metrics/pkg/apis/custom_metrics",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/apis/custom_metrics/install",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/apis/metrics",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/apis/metrics/install",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/apis/metrics/v1alpha1",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/client/clientset_generated/clientset",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/client/custom_metrics",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "k8s.io/metrics/pkg/client/custom_metrics/fake",
"Rev": "fd2415bb9381a6731027b48a8c6b78f28e13f876"
},
{
"ImportPath": "vbom.ml/util/sortorder", "ImportPath": "vbom.ml/util/sortorder",
"Rev": "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394" "Rev": "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394"
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -397,6 +397,8 @@ staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregis ...@@ -397,6 +397,8 @@ staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregis
staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion
staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1 staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1
staging/src/k8s.io/kube-aggregator/pkg/controllers staging/src/k8s.io/kube-aggregator/pkg/controllers
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/install
staging/src/k8s.io/metrics/pkg/apis/metrics/install
staging/src/k8s.io/sample-apiserver staging/src/k8s.io/sample-apiserver
staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/install
test/e2e/perftype test/e2e/perftype
......
...@@ -53,6 +53,9 @@ pushd "${KUBE_ROOT}" > /dev/null ...@@ -53,6 +53,9 @@ pushd "${KUBE_ROOT}" > /dev/null
if [ ! -e "vendor/k8s.io/sample-apiserver" ]; then if [ ! -e "vendor/k8s.io/sample-apiserver" ]; then
ln -s ../../staging/src/k8s.io/sample-apiserver vendor/k8s.io/sample-apiserver ln -s ../../staging/src/k8s.io/sample-apiserver vendor/k8s.io/sample-apiserver
fi fi
if [ ! -e "vendor/k8s.io/metrics" ]; then
ln -s ../../staging/src/k8s.io/metrics vendor/k8s.io/metrics
fi
popd > /dev/null popd > /dev/null
echo "Don't forget to run hack/update-godep-licenses.sh if you added or removed a dependency!" echo "Don't forget to run hack/update-godep-licenses.sh if you added or removed a dependency!"
...@@ -39,7 +39,7 @@ function kfind() { ...@@ -39,7 +39,7 @@ function kfind() {
# include the "special" vendor directories which are actually part # include the "special" vendor directories which are actually part
# of the Kubernetes source tree - generators will use these for # of the Kubernetes source tree - generators will use these for
# including certain core API concepts. # including certain core API concepts.
find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/sample-apiserver \ find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/sample-apiserver ./vendor/k8s.io/metrics \
\( \ \( \
-not \( \ -not \( \
\( \ \( \
......
...@@ -83,6 +83,10 @@ for repo in $(ls ${KUBE_ROOT}/staging/src/k8s.io); do ...@@ -83,6 +83,10 @@ for repo in $(ls ${KUBE_ROOT}/staging/src/k8s.io); do
if [ "${repo}" == "client-go" ]; then if [ "${repo}" == "client-go" ]; then
continue continue
fi fi
# we skip metrics because it's synced to the real repo manually
if [ "${repo}" == "metrics" ]; then
continue
fi
kube::util::ensure_clean_working_dir kube::util::ensure_clean_working_dir
......
...@@ -26,7 +26,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" ...@@ -26,7 +26,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::verify_go_version kube::golang::verify_go_version
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/src/k8s.io/client-go/*vendor/*'; then if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/src/k8s.io/client-go/*vendor/*' ':(exclude)staging/src/k8s.io/metrics/*'; then
echo "!!! Some package aliases break go conventions." echo "!!! Some package aliases break go conventions."
echo "To fix these errors, do not use capitalized or underlined characters" echo "To fix these errors, do not use capitalized or underlined characters"
echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info." echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info."
......
...@@ -33,8 +33,6 @@ openapi_library( ...@@ -33,8 +33,6 @@ openapi_library(
"pkg/apis/storage/v1", "pkg/apis/storage/v1",
"pkg/apis/storage/v1beta1", "pkg/apis/storage/v1beta1",
"pkg/version", "pkg/version",
"vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1",
"vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1",
], ],
tags = ["automanaged"], tags = ["automanaged"],
vendor_targets = [ vendor_targets = [
...@@ -45,6 +43,8 @@ openapi_library( ...@@ -45,6 +43,8 @@ openapi_library(
"k8s.io/apimachinery/pkg/version", "k8s.io/apimachinery/pkg/version",
"k8s.io/apiserver/pkg/apis/example/v1", "k8s.io/apiserver/pkg/apis/example/v1",
"k8s.io/client-go/pkg/api/v1", "k8s.io/client-go/pkg/api/v1",
"k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1",
"k8s.io/metrics/pkg/apis/metrics/v1alpha1",
], ],
) )
......
...@@ -28,20 +28,3 @@ go_library( ...@@ -28,20 +28,3 @@ go_library(
"//vendor/k8s.io/client-go/pkg/api:go_default_library", "//vendor/k8s.io/client-go/pkg/api:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/install:all-srcs",
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:all-srcs",
],
tags = ["automanaged"],
)
...@@ -20,16 +20,3 @@ go_library( ...@@ -20,16 +20,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
...@@ -32,16 +32,3 @@ go_library( ...@@ -32,16 +32,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/custom_metrics:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
...@@ -15,7 +15,7 @@ limitations under the License. ...@@ -15,7 +15,7 @@ limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/metrics/pkg/apis/metrics // +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/metrics/pkg/apis/custom_metrics
// +k8s:openapi-gen=true // +k8s:openapi-gen=true
package v1alpha1 package v1alpha1
...@@ -54,6 +54,7 @@ func autoConvert_v1alpha1_MetricValue_To_custom_metrics_MetricValue(in *MetricVa ...@@ -54,6 +54,7 @@ func autoConvert_v1alpha1_MetricValue_To_custom_metrics_MetricValue(in *MetricVa
return nil return nil
} }
// Convert_v1alpha1_MetricValue_To_custom_metrics_MetricValue is an autogenerated conversion function.
func Convert_v1alpha1_MetricValue_To_custom_metrics_MetricValue(in *MetricValue, out *custom_metrics.MetricValue, s conversion.Scope) error { func Convert_v1alpha1_MetricValue_To_custom_metrics_MetricValue(in *MetricValue, out *custom_metrics.MetricValue, s conversion.Scope) error {
return autoConvert_v1alpha1_MetricValue_To_custom_metrics_MetricValue(in, out, s) return autoConvert_v1alpha1_MetricValue_To_custom_metrics_MetricValue(in, out, s)
} }
...@@ -70,26 +71,37 @@ func autoConvert_custom_metrics_MetricValue_To_v1alpha1_MetricValue(in *custom_m ...@@ -70,26 +71,37 @@ func autoConvert_custom_metrics_MetricValue_To_v1alpha1_MetricValue(in *custom_m
return nil return nil
} }
// Convert_custom_metrics_MetricValue_To_v1alpha1_MetricValue is an autogenerated conversion function.
func Convert_custom_metrics_MetricValue_To_v1alpha1_MetricValue(in *custom_metrics.MetricValue, out *MetricValue, s conversion.Scope) error { func Convert_custom_metrics_MetricValue_To_v1alpha1_MetricValue(in *custom_metrics.MetricValue, out *MetricValue, s conversion.Scope) error {
return autoConvert_custom_metrics_MetricValue_To_v1alpha1_MetricValue(in, out, s) return autoConvert_custom_metrics_MetricValue_To_v1alpha1_MetricValue(in, out, s)
} }
func autoConvert_v1alpha1_MetricValueList_To_custom_metrics_MetricValueList(in *MetricValueList, out *custom_metrics.MetricValueList, s conversion.Scope) error { func autoConvert_v1alpha1_MetricValueList_To_custom_metrics_MetricValueList(in *MetricValueList, out *custom_metrics.MetricValueList, s conversion.Scope) error {
out.ListMeta = in.ListMeta out.ListMeta = in.ListMeta
out.Items = *(*[]custom_metrics.MetricValue)(unsafe.Pointer(&in.Items)) if in.Items == nil {
out.Items = make([]custom_metrics.MetricValue, 0)
} else {
out.Items = *(*[]custom_metrics.MetricValue)(unsafe.Pointer(&in.Items))
}
return nil return nil
} }
// Convert_v1alpha1_MetricValueList_To_custom_metrics_MetricValueList is an autogenerated conversion function.
func Convert_v1alpha1_MetricValueList_To_custom_metrics_MetricValueList(in *MetricValueList, out *custom_metrics.MetricValueList, s conversion.Scope) error { func Convert_v1alpha1_MetricValueList_To_custom_metrics_MetricValueList(in *MetricValueList, out *custom_metrics.MetricValueList, s conversion.Scope) error {
return autoConvert_v1alpha1_MetricValueList_To_custom_metrics_MetricValueList(in, out, s) return autoConvert_v1alpha1_MetricValueList_To_custom_metrics_MetricValueList(in, out, s)
} }
func autoConvert_custom_metrics_MetricValueList_To_v1alpha1_MetricValueList(in *custom_metrics.MetricValueList, out *MetricValueList, s conversion.Scope) error { func autoConvert_custom_metrics_MetricValueList_To_v1alpha1_MetricValueList(in *custom_metrics.MetricValueList, out *MetricValueList, s conversion.Scope) error {
out.ListMeta = in.ListMeta out.ListMeta = in.ListMeta
out.Items = *(*[]MetricValue)(unsafe.Pointer(&in.Items)) if in.Items == nil {
out.Items = make([]MetricValue, 0)
} else {
out.Items = *(*[]MetricValue)(unsafe.Pointer(&in.Items))
}
return nil return nil
} }
// Convert_custom_metrics_MetricValueList_To_v1alpha1_MetricValueList is an autogenerated conversion function.
func Convert_custom_metrics_MetricValueList_To_v1alpha1_MetricValueList(in *custom_metrics.MetricValueList, out *MetricValueList, s conversion.Scope) error { func Convert_custom_metrics_MetricValueList_To_v1alpha1_MetricValueList(in *custom_metrics.MetricValueList, out *MetricValueList, s conversion.Scope) error {
return autoConvert_custom_metrics_MetricValueList_To_v1alpha1_MetricValueList(in, out, s) return autoConvert_custom_metrics_MetricValueList_To_v1alpha1_MetricValueList(in, out, s)
} }
...@@ -64,8 +64,10 @@ func DeepCopy_v1alpha1_MetricValueList(in interface{}, out interface{}, c *conve ...@@ -64,8 +64,10 @@ func DeepCopy_v1alpha1_MetricValueList(in interface{}, out interface{}, c *conve
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]MetricValue, len(*in)) *out = make([]MetricValue, len(*in))
for i := range *in { for i := range *in {
if err := DeepCopy_v1alpha1_MetricValue(&(*in)[i], &(*out)[i], c); err != nil { if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err return err
} else {
(*out)[i] = *newVal.(*MetricValue)
} }
} }
} }
......
...@@ -64,8 +64,10 @@ func DeepCopy_custom_metrics_MetricValueList(in interface{}, out interface{}, c ...@@ -64,8 +64,10 @@ func DeepCopy_custom_metrics_MetricValueList(in interface{}, out interface{}, c
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]MetricValue, len(*in)) *out = make([]MetricValue, len(*in))
for i := range *in { for i := range *in {
if err := DeepCopy_custom_metrics_MetricValue(&(*in)[i], &(*out)[i], c); err != nil { if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err return err
} else {
(*out)[i] = *newVal.(*MetricValue)
} }
} }
} }
......
...@@ -24,20 +24,3 @@ go_library( ...@@ -24,20 +24,3 @@ go_library(
"//vendor/k8s.io/client-go/pkg/api:go_default_library", "//vendor/k8s.io/client-go/pkg/api:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//vendor/k8s.io/metrics/pkg/apis/metrics/install:all-srcs",
"//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:all-srcs",
],
tags = ["automanaged"],
)
...@@ -21,16 +21,3 @@ go_library( ...@@ -21,16 +21,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
...@@ -31,16 +31,3 @@ go_library( ...@@ -31,16 +31,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/apis/metrics:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
...@@ -15,7 +15,7 @@ limitations under the License. ...@@ -15,7 +15,7 @@ limitations under the License.
*/ */
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/metrics/pkg/apis/custom_metrics // +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/metrics/pkg/apis/metrics
// +k8s:openapi-gen=true // +k8s:openapi-gen=true
package v1alpha1 package v1alpha1
...@@ -28,8 +28,8 @@ import ( ...@@ -28,8 +28,8 @@ import (
// resource usage metrics of a node. // 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"` metav1.ObjectMeta `json:"metadata,omitempty"`
// The following fields define time interval from which metrics were // The following fields define time interval from which metrics were
// collected from the interval [Timestamp-Window, Timestamp]. // collected from the interval [Timestamp-Window, Timestamp].
...@@ -57,8 +57,8 @@ type NodeMetricsList struct { ...@@ -57,8 +57,8 @@ type NodeMetricsList struct {
// resource usage metrics of a pod. // 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"` metav1.ObjectMeta `json:"metadata,omitempty"`
// The following fields define time interval from which metrics were // The following fields define time interval from which metrics were
// collected from the interval [Timestamp-Window, Timestamp]. // collected from the interval [Timestamp-Window, Timestamp].
......
...@@ -56,6 +56,7 @@ func autoConvert_v1alpha1_ContainerMetrics_To_metrics_ContainerMetrics(in *Conta ...@@ -56,6 +56,7 @@ func autoConvert_v1alpha1_ContainerMetrics_To_metrics_ContainerMetrics(in *Conta
return nil return nil
} }
// Convert_v1alpha1_ContainerMetrics_To_metrics_ContainerMetrics is an autogenerated conversion function.
func Convert_v1alpha1_ContainerMetrics_To_metrics_ContainerMetrics(in *ContainerMetrics, out *metrics.ContainerMetrics, s conversion.Scope) error { func Convert_v1alpha1_ContainerMetrics_To_metrics_ContainerMetrics(in *ContainerMetrics, out *metrics.ContainerMetrics, s conversion.Scope) error {
return autoConvert_v1alpha1_ContainerMetrics_To_metrics_ContainerMetrics(in, out, s) return autoConvert_v1alpha1_ContainerMetrics_To_metrics_ContainerMetrics(in, out, s)
} }
...@@ -66,6 +67,7 @@ func autoConvert_metrics_ContainerMetrics_To_v1alpha1_ContainerMetrics(in *metri ...@@ -66,6 +67,7 @@ func autoConvert_metrics_ContainerMetrics_To_v1alpha1_ContainerMetrics(in *metri
return nil return nil
} }
// Convert_metrics_ContainerMetrics_To_v1alpha1_ContainerMetrics is an autogenerated conversion function.
func Convert_metrics_ContainerMetrics_To_v1alpha1_ContainerMetrics(in *metrics.ContainerMetrics, out *ContainerMetrics, s conversion.Scope) error { func Convert_metrics_ContainerMetrics_To_v1alpha1_ContainerMetrics(in *metrics.ContainerMetrics, out *ContainerMetrics, s conversion.Scope) error {
return autoConvert_metrics_ContainerMetrics_To_v1alpha1_ContainerMetrics(in, out, s) return autoConvert_metrics_ContainerMetrics_To_v1alpha1_ContainerMetrics(in, out, s)
} }
...@@ -78,6 +80,7 @@ func autoConvert_v1alpha1_NodeMetrics_To_metrics_NodeMetrics(in *NodeMetrics, ou ...@@ -78,6 +80,7 @@ func autoConvert_v1alpha1_NodeMetrics_To_metrics_NodeMetrics(in *NodeMetrics, ou
return nil return nil
} }
// Convert_v1alpha1_NodeMetrics_To_metrics_NodeMetrics is an autogenerated conversion function.
func Convert_v1alpha1_NodeMetrics_To_metrics_NodeMetrics(in *NodeMetrics, out *metrics.NodeMetrics, s conversion.Scope) error { func Convert_v1alpha1_NodeMetrics_To_metrics_NodeMetrics(in *NodeMetrics, out *metrics.NodeMetrics, s conversion.Scope) error {
return autoConvert_v1alpha1_NodeMetrics_To_metrics_NodeMetrics(in, out, s) return autoConvert_v1alpha1_NodeMetrics_To_metrics_NodeMetrics(in, out, s)
} }
...@@ -90,6 +93,7 @@ func autoConvert_metrics_NodeMetrics_To_v1alpha1_NodeMetrics(in *metrics.NodeMet ...@@ -90,6 +93,7 @@ func autoConvert_metrics_NodeMetrics_To_v1alpha1_NodeMetrics(in *metrics.NodeMet
return nil return nil
} }
// Convert_metrics_NodeMetrics_To_v1alpha1_NodeMetrics is an autogenerated conversion function.
func Convert_metrics_NodeMetrics_To_v1alpha1_NodeMetrics(in *metrics.NodeMetrics, out *NodeMetrics, s conversion.Scope) error { func Convert_metrics_NodeMetrics_To_v1alpha1_NodeMetrics(in *metrics.NodeMetrics, out *NodeMetrics, s conversion.Scope) error {
return autoConvert_metrics_NodeMetrics_To_v1alpha1_NodeMetrics(in, out, s) return autoConvert_metrics_NodeMetrics_To_v1alpha1_NodeMetrics(in, out, s)
} }
...@@ -100,16 +104,22 @@ func autoConvert_v1alpha1_NodeMetricsList_To_metrics_NodeMetricsList(in *NodeMet ...@@ -100,16 +104,22 @@ func autoConvert_v1alpha1_NodeMetricsList_To_metrics_NodeMetricsList(in *NodeMet
return nil return nil
} }
// Convert_v1alpha1_NodeMetricsList_To_metrics_NodeMetricsList is an autogenerated conversion function.
func Convert_v1alpha1_NodeMetricsList_To_metrics_NodeMetricsList(in *NodeMetricsList, out *metrics.NodeMetricsList, s conversion.Scope) error { func Convert_v1alpha1_NodeMetricsList_To_metrics_NodeMetricsList(in *NodeMetricsList, out *metrics.NodeMetricsList, s conversion.Scope) error {
return autoConvert_v1alpha1_NodeMetricsList_To_metrics_NodeMetricsList(in, out, s) return autoConvert_v1alpha1_NodeMetricsList_To_metrics_NodeMetricsList(in, out, s)
} }
func autoConvert_metrics_NodeMetricsList_To_v1alpha1_NodeMetricsList(in *metrics.NodeMetricsList, out *NodeMetricsList, s conversion.Scope) error { func autoConvert_metrics_NodeMetricsList_To_v1alpha1_NodeMetricsList(in *metrics.NodeMetricsList, out *NodeMetricsList, s conversion.Scope) error {
out.ListMeta = in.ListMeta out.ListMeta = in.ListMeta
out.Items = *(*[]NodeMetrics)(unsafe.Pointer(&in.Items)) if in.Items == nil {
out.Items = make([]NodeMetrics, 0)
} else {
out.Items = *(*[]NodeMetrics)(unsafe.Pointer(&in.Items))
}
return nil return nil
} }
// Convert_metrics_NodeMetricsList_To_v1alpha1_NodeMetricsList is an autogenerated conversion function.
func Convert_metrics_NodeMetricsList_To_v1alpha1_NodeMetricsList(in *metrics.NodeMetricsList, out *NodeMetricsList, s conversion.Scope) error { func Convert_metrics_NodeMetricsList_To_v1alpha1_NodeMetricsList(in *metrics.NodeMetricsList, out *NodeMetricsList, s conversion.Scope) error {
return autoConvert_metrics_NodeMetricsList_To_v1alpha1_NodeMetricsList(in, out, s) return autoConvert_metrics_NodeMetricsList_To_v1alpha1_NodeMetricsList(in, out, s)
} }
...@@ -122,6 +132,7 @@ func autoConvert_v1alpha1_PodMetrics_To_metrics_PodMetrics(in *PodMetrics, out * ...@@ -122,6 +132,7 @@ func autoConvert_v1alpha1_PodMetrics_To_metrics_PodMetrics(in *PodMetrics, out *
return nil return nil
} }
// Convert_v1alpha1_PodMetrics_To_metrics_PodMetrics is an autogenerated conversion function.
func Convert_v1alpha1_PodMetrics_To_metrics_PodMetrics(in *PodMetrics, out *metrics.PodMetrics, s conversion.Scope) error { func Convert_v1alpha1_PodMetrics_To_metrics_PodMetrics(in *PodMetrics, out *metrics.PodMetrics, s conversion.Scope) error {
return autoConvert_v1alpha1_PodMetrics_To_metrics_PodMetrics(in, out, s) return autoConvert_v1alpha1_PodMetrics_To_metrics_PodMetrics(in, out, s)
} }
...@@ -130,10 +141,15 @@ func autoConvert_metrics_PodMetrics_To_v1alpha1_PodMetrics(in *metrics.PodMetric ...@@ -130,10 +141,15 @@ func autoConvert_metrics_PodMetrics_To_v1alpha1_PodMetrics(in *metrics.PodMetric
out.ObjectMeta = in.ObjectMeta out.ObjectMeta = in.ObjectMeta
out.Timestamp = in.Timestamp out.Timestamp = in.Timestamp
out.Window = in.Window out.Window = in.Window
out.Containers = *(*[]ContainerMetrics)(unsafe.Pointer(&in.Containers)) if in.Containers == nil {
out.Containers = make([]ContainerMetrics, 0)
} else {
out.Containers = *(*[]ContainerMetrics)(unsafe.Pointer(&in.Containers))
}
return nil return nil
} }
// Convert_metrics_PodMetrics_To_v1alpha1_PodMetrics is an autogenerated conversion function.
func Convert_metrics_PodMetrics_To_v1alpha1_PodMetrics(in *metrics.PodMetrics, out *PodMetrics, s conversion.Scope) error { func Convert_metrics_PodMetrics_To_v1alpha1_PodMetrics(in *metrics.PodMetrics, out *PodMetrics, s conversion.Scope) error {
return autoConvert_metrics_PodMetrics_To_v1alpha1_PodMetrics(in, out, s) return autoConvert_metrics_PodMetrics_To_v1alpha1_PodMetrics(in, out, s)
} }
...@@ -144,16 +160,22 @@ func autoConvert_v1alpha1_PodMetricsList_To_metrics_PodMetricsList(in *PodMetric ...@@ -144,16 +160,22 @@ func autoConvert_v1alpha1_PodMetricsList_To_metrics_PodMetricsList(in *PodMetric
return nil return nil
} }
// Convert_v1alpha1_PodMetricsList_To_metrics_PodMetricsList is an autogenerated conversion function.
func Convert_v1alpha1_PodMetricsList_To_metrics_PodMetricsList(in *PodMetricsList, out *metrics.PodMetricsList, s conversion.Scope) error { func Convert_v1alpha1_PodMetricsList_To_metrics_PodMetricsList(in *PodMetricsList, out *metrics.PodMetricsList, s conversion.Scope) error {
return autoConvert_v1alpha1_PodMetricsList_To_metrics_PodMetricsList(in, out, s) return autoConvert_v1alpha1_PodMetricsList_To_metrics_PodMetricsList(in, out, s)
} }
func autoConvert_metrics_PodMetricsList_To_v1alpha1_PodMetricsList(in *metrics.PodMetricsList, out *PodMetricsList, s conversion.Scope) error { func autoConvert_metrics_PodMetricsList_To_v1alpha1_PodMetricsList(in *metrics.PodMetricsList, out *PodMetricsList, s conversion.Scope) error {
out.ListMeta = in.ListMeta out.ListMeta = in.ListMeta
out.Items = *(*[]PodMetrics)(unsafe.Pointer(&in.Items)) if in.Items == nil {
out.Items = make([]PodMetrics, 0)
} else {
out.Items = *(*[]PodMetrics)(unsafe.Pointer(&in.Items))
}
return nil return nil
} }
// Convert_metrics_PodMetricsList_To_v1alpha1_PodMetricsList is an autogenerated conversion function.
func Convert_metrics_PodMetricsList_To_v1alpha1_PodMetricsList(in *metrics.PodMetricsList, out *PodMetricsList, s conversion.Scope) error { func Convert_metrics_PodMetricsList_To_v1alpha1_PodMetricsList(in *metrics.PodMetricsList, out *PodMetricsList, s conversion.Scope) error {
return autoConvert_metrics_PodMetricsList_To_v1alpha1_PodMetricsList(in, out, s) return autoConvert_metrics_PodMetricsList_To_v1alpha1_PodMetricsList(in, out, s)
} }
...@@ -91,8 +91,10 @@ func DeepCopy_v1alpha1_NodeMetricsList(in interface{}, out interface{}, c *conve ...@@ -91,8 +91,10 @@ func DeepCopy_v1alpha1_NodeMetricsList(in interface{}, out interface{}, c *conve
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]NodeMetrics, len(*in)) *out = make([]NodeMetrics, len(*in))
for i := range *in { for i := range *in {
if err := DeepCopy_v1alpha1_NodeMetrics(&(*in)[i], &(*out)[i], c); err != nil { if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err return err
} else {
(*out)[i] = *newVal.(*NodeMetrics)
} }
} }
} }
...@@ -115,8 +117,10 @@ func DeepCopy_v1alpha1_PodMetrics(in interface{}, out interface{}, c *conversion ...@@ -115,8 +117,10 @@ func DeepCopy_v1alpha1_PodMetrics(in interface{}, out interface{}, c *conversion
in, out := &in.Containers, &out.Containers in, out := &in.Containers, &out.Containers
*out = make([]ContainerMetrics, len(*in)) *out = make([]ContainerMetrics, len(*in))
for i := range *in { for i := range *in {
if err := DeepCopy_v1alpha1_ContainerMetrics(&(*in)[i], &(*out)[i], c); err != nil { if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err return err
} else {
(*out)[i] = *newVal.(*ContainerMetrics)
} }
} }
} }
...@@ -133,8 +137,10 @@ func DeepCopy_v1alpha1_PodMetricsList(in interface{}, out interface{}, c *conver ...@@ -133,8 +137,10 @@ func DeepCopy_v1alpha1_PodMetricsList(in interface{}, out interface{}, c *conver
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]PodMetrics, len(*in)) *out = make([]PodMetrics, len(*in))
for i := range *in { for i := range *in {
if err := DeepCopy_v1alpha1_PodMetrics(&(*in)[i], &(*out)[i], c); err != nil { if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err return err
} else {
(*out)[i] = *newVal.(*PodMetrics)
} }
} }
} }
......
...@@ -91,8 +91,10 @@ func DeepCopy_metrics_NodeMetricsList(in interface{}, out interface{}, c *conver ...@@ -91,8 +91,10 @@ func DeepCopy_metrics_NodeMetricsList(in interface{}, out interface{}, c *conver
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]NodeMetrics, len(*in)) *out = make([]NodeMetrics, len(*in))
for i := range *in { for i := range *in {
if err := DeepCopy_metrics_NodeMetrics(&(*in)[i], &(*out)[i], c); err != nil { if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err return err
} else {
(*out)[i] = *newVal.(*NodeMetrics)
} }
} }
} }
...@@ -115,8 +117,10 @@ func DeepCopy_metrics_PodMetrics(in interface{}, out interface{}, c *conversion. ...@@ -115,8 +117,10 @@ func DeepCopy_metrics_PodMetrics(in interface{}, out interface{}, c *conversion.
in, out := &in.Containers, &out.Containers in, out := &in.Containers, &out.Containers
*out = make([]ContainerMetrics, len(*in)) *out = make([]ContainerMetrics, len(*in))
for i := range *in { for i := range *in {
if err := DeepCopy_metrics_ContainerMetrics(&(*in)[i], &(*out)[i], c); err != nil { if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err return err
} else {
(*out)[i] = *newVal.(*ContainerMetrics)
} }
} }
} }
...@@ -133,8 +137,10 @@ func DeepCopy_metrics_PodMetricsList(in interface{}, out interface{}, c *convers ...@@ -133,8 +137,10 @@ func DeepCopy_metrics_PodMetricsList(in interface{}, out interface{}, c *convers
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]PodMetrics, len(*in)) *out = make([]PodMetrics, len(*in))
for i := range *in { for i := range *in {
if err := DeepCopy_metrics_PodMetrics(&(*in)[i], &(*out)[i], c); err != nil { if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err return err
} else {
(*out)[i] = *newVal.(*PodMetrics)
} }
} }
} }
......
...@@ -23,21 +23,3 @@ go_library( ...@@ -23,21 +23,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:all-srcs",
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme:all-srcs",
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:all-srcs",
],
tags = ["automanaged"],
)
...@@ -26,16 +26,3 @@ go_library( ...@@ -26,16 +26,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake:go_default_library", "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
...@@ -22,16 +22,3 @@ go_library( ...@@ -22,16 +22,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
...@@ -26,19 +26,3 @@ go_library( ...@@ -26,19 +26,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake:all-srcs",
],
tags = ["automanaged"],
)
...@@ -27,16 +27,3 @@ go_library( ...@@ -27,16 +27,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
...@@ -25,19 +25,3 @@ go_library( ...@@ -25,19 +25,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//vendor/k8s.io/metrics/pkg/client/custom_metrics/fake:all-srcs",
],
tags = ["automanaged"],
)
...@@ -20,16 +20,3 @@ go_library( ...@@ -20,16 +20,3 @@ go_library(
"//vendor/k8s.io/metrics/pkg/client/custom_metrics:go_default_library", "//vendor/k8s.io/metrics/pkg/client/custom_metrics:go_default_library",
], ],
) )
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
...@@ -367,10 +367,6 @@ filegroup( ...@@ -367,10 +367,6 @@ filegroup(
"//vendor/k8s.io/gengo/types:all-srcs", "//vendor/k8s.io/gengo/types:all-srcs",
"//vendor/k8s.io/heapster/metrics/api/v1/types:all-srcs", "//vendor/k8s.io/heapster/metrics/api/v1/types:all-srcs",
"//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:all-srcs", "//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:all-srcs",
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics:all-srcs",
"//vendor/k8s.io/metrics/pkg/apis/metrics:all-srcs",
"//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset:all-srcs",
"//vendor/k8s.io/metrics/pkg/client/custom_metrics:all-srcs",
"//vendor/vbom.ml/util/sortorder:all-srcs", "//vendor/vbom.ml/util/sortorder:all-srcs",
], ],
tags = ["automanaged"], tags = ["automanaged"],
......
../../staging/src/k8s.io/metrics
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment