Vendor: Update k8s version

Signed-off-by: Michał Żyłowski <michal.zylowski@intel.com>
This commit is contained in:
Michał Żyłowski 2017-02-03 14:41:32 +01:00
parent dfa93414c5
commit 52baf68d50
3756 changed files with 113013 additions and 92675 deletions

View file

@ -20,6 +20,7 @@ import (
"reflect"
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api"
)
@ -41,7 +42,7 @@ func TestQuotaGenerate(t *testing.T) {
"hard": hard,
},
expected: &api.ResourceQuota{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
},
Spec: api.ResourceQuotaSpec{Hard: resourceQuotaSpecList},
@ -61,7 +62,7 @@ func TestQuotaGenerate(t *testing.T) {
"scopes": "BestEffort,NotTerminating",
},
expected: &api.ResourceQuota{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
},
Spec: api.ResourceQuotaSpec{
@ -81,7 +82,7 @@ func TestQuotaGenerate(t *testing.T) {
"scopes": "",
},
expected: &api.ResourceQuota{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
},
Spec: api.ResourceQuotaSpec{Hard: resourceQuotaSpecList},