Merge pull request #1623 from smarterclayton/rename_jsonbase

Rename JSONBase -> TypeMeta in preparation for v1beta3
This commit is contained in:
Daniel Smith
2014-10-07 10:50:28 -07:00
70 changed files with 466 additions and 466 deletions

View File

@@ -41,14 +41,14 @@ func validateObject(obj runtime.Object) (errors []error) {
errors = append(errors, validateObject(&t.Items[i])...)
}
case *api.Service:
api.ValidNamespace(ctx, &t.JSONBase)
api.ValidNamespace(ctx, &t.TypeMeta)
errors = validation.ValidateService(t)
case *api.ServiceList:
for i := range t.Items {
errors = append(errors, validateObject(&t.Items[i])...)
}
case *api.Pod:
api.ValidNamespace(ctx, &t.JSONBase)
api.ValidNamespace(ctx, &t.TypeMeta)
errors = validation.ValidateManifest(&t.DesiredState.Manifest)
case *api.PodList:
for i := range t.Items {