refactor: use metav1.ObjectMeta in other types

This commit is contained in:
Clayton Coleman
2017-01-16 22:38:19 -05:00
parent 5a5d31555b
commit 9a2a50cda7
822 changed files with 11914 additions and 9290 deletions

View File

@@ -32,6 +32,7 @@ go_test(
"//pkg/api/resource:go_default_library",
"//pkg/api/v1:go_default_library",
"//vendor:github.com/stretchr/testify/assert",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
],
)

View File

@@ -22,6 +22,7 @@ import (
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
)
@@ -44,7 +45,7 @@ func TestExtractFieldPathAsString(t *testing.T) {
name: "ok - namespace",
fieldPath: "metadata.namespace",
obj: &v1.Pod{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: "object-namespace",
},
},
@@ -54,7 +55,7 @@ func TestExtractFieldPathAsString(t *testing.T) {
name: "ok - name",
fieldPath: "metadata.name",
obj: &v1.Pod{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "object-name",
},
},
@@ -64,7 +65,7 @@ func TestExtractFieldPathAsString(t *testing.T) {
name: "ok - labels",
fieldPath: "metadata.labels",
obj: &v1.Pod{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"key": "value"},
},
},
@@ -74,7 +75,7 @@ func TestExtractFieldPathAsString(t *testing.T) {
name: "ok - labels bslash n",
fieldPath: "metadata.labels",
obj: &v1.Pod{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"key": "value\n"},
},
},
@@ -84,7 +85,7 @@ func TestExtractFieldPathAsString(t *testing.T) {
name: "ok - annotations",
fieldPath: "metadata.annotations",
obj: &v1.Pod{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"builder": "john-doe"},
},
},
@@ -95,7 +96,7 @@ func TestExtractFieldPathAsString(t *testing.T) {
name: "invalid expression",
fieldPath: "metadata.whoops",
obj: &v1.Pod{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: "object-namespace",
},
},