github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Move APIs and core code to use metav1.ObjectMeta

Browse Source
This commit is contained in:
Clayton Coleman
2017-01-11 15:28:46 -05:00
parent 54d8ed001d
commit 36acd90aba
104 changed files with 486 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apis/batch/types.go
View File

@@ -29,7 +29,7 @@ type Job struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
api.ObjectMeta
metav1.ObjectMeta
// Spec is a structure defining the expected behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@@ -60,7 +60,7 @@ type JobTemplate struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
api.ObjectMeta
metav1.ObjectMeta
// Template defines jobs that will be created from this template
// http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@@ -73,7 +73,7 @@ type JobTemplateSpec struct {
// Standard object's metadata of the jobs created from this template.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
api.ObjectMeta
metav1.ObjectMeta
// Specification of the desired behavior of the job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@@ -196,7 +196,7 @@ type CronJob struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
api.ObjectMeta
metav1.ObjectMeta
// Spec is a structure defining the expected behavior of a job, including the schedule.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

19
pkg/apis/batch/v1/defaults_test.go
View File

@@ -20,6 +20,7 @@ import (
"reflect"
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/install"
@@ -39,7 +40,7 @@ func TestSetDefaultJob(t *testing.T) {
original: &Job{
Spec: JobSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -53,12 +54,12 @@ func TestSetDefaultJob(t *testing.T) {
},
"both unspecified -> sets both to 1 and no default labels": {
original: &Job{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"mylabel": "myvalue"},
},
Spec: JobSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -74,7 +75,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Parallelism: newInt32(0),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -90,7 +91,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Parallelism: newInt32(2),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -106,7 +107,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Completions: newInt32(2),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -124,7 +125,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(10),
Parallelism: newInt32(11),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -133,7 +134,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(10),
Parallelism: newInt32(11),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -145,7 +146,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(11),
Parallelism: newInt32(10),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},

2
pkg/apis/batch/v1/types.go
View File

@@ -29,7 +29,7 @@ type Job struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Spec is a structure defining the expected behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

19
pkg/apis/batch/v2alpha1/defaults_test.go
View File

@@ -20,6 +20,7 @@ import (
"reflect"
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/install"
@@ -39,7 +40,7 @@ func TestSetDefaultJob(t *testing.T) {
original: &Job{
Spec: JobSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -53,12 +54,12 @@ func TestSetDefaultJob(t *testing.T) {
},
"both unspecified -> sets both to 1 and no default labels": {
original: &Job{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"mylabel": "myvalue"},
},
Spec: JobSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -74,7 +75,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Parallelism: newInt32(0),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -90,7 +91,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Parallelism: newInt32(2),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -106,7 +107,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Completions: newInt32(2),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -124,7 +125,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(10),
Parallelism: newInt32(11),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -133,7 +134,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(10),
Parallelism: newInt32(11),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@@ -145,7 +146,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(11),
Parallelism: newInt32(10),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},

8
pkg/apis/batch/v2alpha1/types.go
View File

@@ -29,7 +29,7 @@ type Job struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Spec is a structure defining the expected behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@@ -60,7 +60,7 @@ type JobTemplate struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Template defines jobs that will be created from this template
// http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@@ -73,7 +73,7 @@ type JobTemplateSpec struct {
// Standard object's metadata of the jobs created from this template.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Specification of the desired behavior of the job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@@ -202,7 +202,7 @@ type CronJob struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Spec is a structure defining the expected behavior of a job, including the schedule.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status