kubernetes
/
examples
mirror of https://github.com/kubernetes/examples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: move ListOptions references to metav1

This commit is contained in:
Clayton Coleman 2017-01-21 22:36:02 -05:00
parent 967f9c8a3d
commit 440421a46e
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
examples_test.go
View File

@ -26,6 +26,8 @@ import (
"testing" "testing"
"github.com/golang/glog" "github.com/golang/glog"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
@ -48,7 +50,7 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
switch t := obj.(type) { switch t := obj.(type) {
case *api.ReplicationController: case *api.ReplicationController:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = validation.ValidateReplicationController(t) errors = validation.ValidateReplicationController(t)
case *api.ReplicationControllerList: case *api.ReplicationControllerList:
@ -57,7 +59,7 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
} }
case *api.Service: case *api.Service:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = validation.ValidateService(t) errors = validation.ValidateService(t)
case *api.ServiceList: case *api.ServiceList:
@ -66,7 +68,7 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
} }
case *api.Pod: case *api.Pod:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = validation.ValidatePod(t) errors = validation.ValidatePod(t)
case *api.PodList: case *api.PodList:
@ -77,44 +79,44 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
errors = validation.ValidatePersistentVolume(t) errors = validation.ValidatePersistentVolume(t)
case *api.PersistentVolumeClaim: case *api.PersistentVolumeClaim:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = validation.ValidatePersistentVolumeClaim(t) errors = validation.ValidatePersistentVolumeClaim(t)
case *api.PodTemplate: case *api.PodTemplate:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = validation.ValidatePodTemplate(t) errors = validation.ValidatePodTemplate(t)
case *api.Endpoints: case *api.Endpoints:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = validation.ValidateEndpoints(t) errors = validation.ValidateEndpoints(t)
case *api.Namespace: case *api.Namespace:
errors = validation.ValidateNamespace(t) errors = validation.ValidateNamespace(t)
case *api.Secret: case *api.Secret:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = validation.ValidateSecret(t) errors = validation.ValidateSecret(t)
case *api.LimitRange: case *api.LimitRange:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = validation.ValidateLimitRange(t) errors = validation.ValidateLimitRange(t)
case *api.ResourceQuota: case *api.ResourceQuota:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = validation.ValidateResourceQuota(t) errors = validation.ValidateResourceQuota(t)
case *extensions.Deployment: case *extensions.Deployment:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = expvalidation.ValidateDeployment(t) errors = expvalidation.ValidateDeployment(t)
case *batch.Job: case *batch.Job:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
// Job needs generateSelector called before validation, and job.Validate does this. // Job needs generateSelector called before validation, and job.Validate does this.
// See: https://github.com/kubernetes/kubernetes/issues/20951#issuecomment-187787040 // See: https://github.com/kubernetes/kubernetes/issues/20951#issuecomment-187787040
@ -122,17 +124,17 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
errors = job.Strategy.Validate(nil, t) errors = job.Strategy.Validate(nil, t)
case *extensions.Ingress: case *extensions.Ingress:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = expvalidation.ValidateIngress(t) errors = expvalidation.ValidateIngress(t)
case *extensions.DaemonSet: case *extensions.DaemonSet:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = expvalidation.ValidateDaemonSet(t) errors = expvalidation.ValidateDaemonSet(t)
case *apps.StatefulSet: case *apps.StatefulSet:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = metav1.NamespaceDefault
} }
errors = appsvalidation.ValidateStatefulSet(t) errors = appsvalidation.ValidateStatefulSet(t)
default: default: