2017-10-19 17:32:12 +08:00
|
|
|
/*
|
|
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
you may not use this file except in compliance with the License.
|
|
|
|
You may obtain a copy of the License at
|
|
|
|
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
See the License for the specific language governing permissions and
|
|
|
|
limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
package v1
|
|
|
|
|
|
|
|
import (
|
|
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
|
|
"k8s.io/apimachinery/pkg/types"
|
|
|
|
)
|
|
|
|
|
|
|
|
// TODO: move this, Object, List, and Type to a different package
|
|
|
|
type ObjectMetaAccessor interface {
|
|
|
|
GetObjectMeta() Object
|
|
|
|
}
|
|
|
|
|
|
|
|
// Object lets you work with object metadata from any of the versioned or
|
|
|
|
// internal API objects. Attempting to set or retrieve a field on an object that does
|
|
|
|
// not support that field (Name, UID, Namespace on lists) will be a no-op and return
|
|
|
|
// a default value.
|
|
|
|
type Object interface {
|
|
|
|
GetNamespace() string
|
|
|
|
SetNamespace(namespace string)
|
|
|
|
GetName() string
|
|
|
|
SetName(name string)
|
|
|
|
GetGenerateName() string
|
|
|
|
SetGenerateName(name string)
|
|
|
|
GetUID() types.UID
|
|
|
|
SetUID(uid types.UID)
|
|
|
|
GetResourceVersion() string
|
|
|
|
SetResourceVersion(version string)
|
|
|
|
GetGeneration() int64
|
|
|
|
SetGeneration(generation int64)
|
|
|
|
GetSelfLink() string
|
|
|
|
SetSelfLink(selfLink string)
|
|
|
|
GetCreationTimestamp() Time
|
|
|
|
SetCreationTimestamp(timestamp Time)
|
|
|
|
GetDeletionTimestamp() *Time
|
|
|
|
SetDeletionTimestamp(timestamp *Time)
|
|
|
|
GetDeletionGracePeriodSeconds() *int64
|
|
|
|
SetDeletionGracePeriodSeconds(*int64)
|
|
|
|
GetLabels() map[string]string
|
|
|
|
SetLabels(labels map[string]string)
|
|
|
|
GetAnnotations() map[string]string
|
|
|
|
SetAnnotations(annotations map[string]string)
|
|
|
|
GetInitializers() *Initializers
|
|
|
|
SetInitializers(initializers *Initializers)
|
|
|
|
GetFinalizers() []string
|
|
|
|
SetFinalizers(finalizers []string)
|
|
|
|
GetOwnerReferences() []OwnerReference
|
|
|
|
SetOwnerReferences([]OwnerReference)
|
|
|
|
GetClusterName() string
|
|
|
|
SetClusterName(clusterName string)
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListMetaAccessor retrieves the list interface from an object
|
|
|
|
type ListMetaAccessor interface {
|
|
|
|
GetListMeta() ListInterface
|
|
|
|
}
|
|
|
|
|
|
|
|
// Common lets you work with core metadata from any of the versioned or
|
|
|
|
// internal API objects. Attempting to set or retrieve a field on an object that does
|
|
|
|
// not support that field will be a no-op and return a default value.
|
|
|
|
// TODO: move this, and TypeMeta and ListMeta, to a different package
|
|
|
|
type Common interface {
|
|
|
|
GetResourceVersion() string
|
|
|
|
SetResourceVersion(version string)
|
|
|
|
GetSelfLink() string
|
|
|
|
SetSelfLink(selfLink string)
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListInterface lets you work with list metadata from any of the versioned or
|
|
|
|
// internal API objects. Attempting to set or retrieve a field on an object that does
|
|
|
|
// not support that field will be a no-op and return a default value.
|
|
|
|
// TODO: move this, and TypeMeta and ListMeta, to a different package
|
|
|
|
type ListInterface interface {
|
|
|
|
GetResourceVersion() string
|
|
|
|
SetResourceVersion(version string)
|
|
|
|
GetSelfLink() string
|
|
|
|
SetSelfLink(selfLink string)
|
|
|
|
GetContinue() string
|
|
|
|
SetContinue(c string)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Type exposes the type and APIVersion of versioned or internal API objects.
|
|
|
|
// TODO: move this, and TypeMeta and ListMeta, to a different package
|
|
|
|
type Type interface {
|
|
|
|
GetAPIVersion() string
|
|
|
|
SetAPIVersion(version string)
|
|
|
|
GetKind() string
|
|
|
|
SetKind(kind string)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (meta *ListMeta) GetResourceVersion() string { return meta.ResourceVersion }
|
|
|
|
func (meta *ListMeta) SetResourceVersion(version string) { meta.ResourceVersion = version }
|
|
|
|
func (meta *ListMeta) GetSelfLink() string { return meta.SelfLink }
|
|
|
|
func (meta *ListMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink }
|
|
|
|
func (meta *ListMeta) GetContinue() string { return meta.Continue }
|
|
|
|
func (meta *ListMeta) SetContinue(c string) { meta.Continue = c }
|
|
|
|
|
|
|
|
func (obj *TypeMeta) GetObjectKind() schema.ObjectKind { return obj }
|
|
|
|
|
|
|
|
// SetGroupVersionKind satisfies the ObjectKind interface for all objects that embed TypeMeta
|
|
|
|
func (obj *TypeMeta) SetGroupVersionKind(gvk schema.GroupVersionKind) {
|
|
|
|
obj.APIVersion, obj.Kind = gvk.ToAPIVersionAndKind()
|
|
|
|
}
|
|
|
|
|
|
|
|
// GroupVersionKind satisfies the ObjectKind interface for all objects that embed TypeMeta
|
|
|
|
func (obj *TypeMeta) GroupVersionKind() schema.GroupVersionKind {
|
|
|
|
return schema.FromAPIVersionAndKind(obj.APIVersion, obj.Kind)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (obj *ListMeta) GetListMeta() ListInterface { return obj }
|
|
|
|
|
|
|
|
func (obj *ObjectMeta) GetObjectMeta() Object { return obj }
|
|
|
|
|
|
|
|
// Namespace implements metav1.Object for any object with an ObjectMeta typed field. Allows
|
|
|
|
// fast, direct access to metadata fields for API objects.
|
|
|
|
func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace }
|
|
|
|
func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace }
|
|
|
|
func (meta *ObjectMeta) GetName() string { return meta.Name }
|
|
|
|
func (meta *ObjectMeta) SetName(name string) { meta.Name = name }
|
|
|
|
func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName }
|
|
|
|
func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName }
|
|
|
|
func (meta *ObjectMeta) GetUID() types.UID { return meta.UID }
|
|
|
|
func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid }
|
|
|
|
func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion }
|
|
|
|
func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version }
|
|
|
|
func (meta *ObjectMeta) GetGeneration() int64 { return meta.Generation }
|
|
|
|
func (meta *ObjectMeta) SetGeneration(generation int64) { meta.Generation = generation }
|
|
|
|
func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink }
|
|
|
|
func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink }
|
|
|
|
func (meta *ObjectMeta) GetCreationTimestamp() Time { return meta.CreationTimestamp }
|
|
|
|
func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp Time) {
|
|
|
|
meta.CreationTimestamp = creationTimestamp
|
|
|
|
}
|
|
|
|
func (meta *ObjectMeta) GetDeletionTimestamp() *Time { return meta.DeletionTimestamp }
|
|
|
|
func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *Time) {
|
|
|
|
meta.DeletionTimestamp = deletionTimestamp
|
|
|
|
}
|
|
|
|
func (meta *ObjectMeta) GetDeletionGracePeriodSeconds() *int64 { return meta.DeletionGracePeriodSeconds }
|
|
|
|
func (meta *ObjectMeta) SetDeletionGracePeriodSeconds(deletionGracePeriodSeconds *int64) {
|
|
|
|
meta.DeletionGracePeriodSeconds = deletionGracePeriodSeconds
|
|
|
|
}
|
|
|
|
func (meta *ObjectMeta) GetLabels() map[string]string { return meta.Labels }
|
|
|
|
func (meta *ObjectMeta) SetLabels(labels map[string]string) { meta.Labels = labels }
|
|
|
|
func (meta *ObjectMeta) GetAnnotations() map[string]string { return meta.Annotations }
|
|
|
|
func (meta *ObjectMeta) SetAnnotations(annotations map[string]string) { meta.Annotations = annotations }
|
|
|
|
func (meta *ObjectMeta) GetInitializers() *Initializers { return meta.Initializers }
|
|
|
|
func (meta *ObjectMeta) SetInitializers(initializers *Initializers) { meta.Initializers = initializers }
|
|
|
|
func (meta *ObjectMeta) GetFinalizers() []string { return meta.Finalizers }
|
|
|
|
func (meta *ObjectMeta) SetFinalizers(finalizers []string) { meta.Finalizers = finalizers }
|
Merge pull request #65256 from liggitt/crd-schema-openapi
Automatic merge from submit-queue (batch tested with PRs 65256, 64236, 64919, 64879, 57932). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
Fix CRD OpenAPI schema
fixes #65243
depends on https://github.com/kubernetes/kube-openapi/pull/84
without this PR, kubectl complains about creating this CRD with a validation schema (which worked in 1.10):
```yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: resources.mygroup.example.com
spec:
group: mygroup.example.com
version: v1alpha1
scope: Namespaced
names:
plural: resources
singular: resource
kind: Kind
listKind: KindList
validation:
openAPIV3Schema:
properties:
spec:
type: array
items:
type: number
```
> error: error validating "/Users/jliggitt/projects/snippets/crd/crd.yaml": error validating data: [ValidationError(CustomResourceDefinition.spec.validation.openAPIV3Schema.properties.spec.items): unknown field "type" in io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray, ValidationError(CustomResourceDefinition.spec.validation.openAPIV3Schema.properties.spec.items): missing required field "Schema" in io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray, ValidationError(CustomResourceDefinition.spec.validation.openAPIV3Schema.properties.spec.items): missing required field "JSONSchemas" in io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray]; if you choose to ignore these errors, turn validation off with --validate=false
that is because the types used to serialize JSONSchema require custom marshaling/unmarshaling, and the OpenAPI generator was not informed of that, so it produced this:
```json
{
"io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray": {
"description": "JSONSchemaPropsOrArray represents a value that can either be a JSONSchemaProps or an array of JSONSchemaProps. Mainly here for serialization purposes.",
"required": [
"Schema",
"JSONSchemas"
],
"properties": {
"JSONSchemas": {
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps"
}
},
"Schema": {
"$ref": "#/definitions/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps"
}
}
}
}
```
OpenAPI isn't able to represent oneOf/anyOf types correctly currently. Until it can, we definitely shouldn't publish a schema containing required fields which aren't even part of the JSON serialization. This PR implements custom openapi type functions, which omit the properties/required/schema attributes for four specific JSONSchema types. This allows kubectl to continue creating these objects without complaining.
/sig api-machinery
/assign @sttts
```release-note
fixed incorrect OpenAPI schema for CustomResourceDefinition objects
```
Kubernetes-commit: ed6c8b7326bd1a1b845719f4bfb302073a18f03f
2018-06-21 08:22:08 +08:00
|
|
|
func (meta *ObjectMeta) GetOwnerReferences() []OwnerReference { return meta.OwnerReferences }
|
2017-10-19 17:32:12 +08:00
|
|
|
func (meta *ObjectMeta) SetOwnerReferences(references []OwnerReference) {
|
Merge pull request #65256 from liggitt/crd-schema-openapi
Automatic merge from submit-queue (batch tested with PRs 65256, 64236, 64919, 64879, 57932). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
Fix CRD OpenAPI schema
fixes #65243
depends on https://github.com/kubernetes/kube-openapi/pull/84
without this PR, kubectl complains about creating this CRD with a validation schema (which worked in 1.10):
```yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: resources.mygroup.example.com
spec:
group: mygroup.example.com
version: v1alpha1
scope: Namespaced
names:
plural: resources
singular: resource
kind: Kind
listKind: KindList
validation:
openAPIV3Schema:
properties:
spec:
type: array
items:
type: number
```
> error: error validating "/Users/jliggitt/projects/snippets/crd/crd.yaml": error validating data: [ValidationError(CustomResourceDefinition.spec.validation.openAPIV3Schema.properties.spec.items): unknown field "type" in io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray, ValidationError(CustomResourceDefinition.spec.validation.openAPIV3Schema.properties.spec.items): missing required field "Schema" in io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray, ValidationError(CustomResourceDefinition.spec.validation.openAPIV3Schema.properties.spec.items): missing required field "JSONSchemas" in io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray]; if you choose to ignore these errors, turn validation off with --validate=false
that is because the types used to serialize JSONSchema require custom marshaling/unmarshaling, and the OpenAPI generator was not informed of that, so it produced this:
```json
{
"io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray": {
"description": "JSONSchemaPropsOrArray represents a value that can either be a JSONSchemaProps or an array of JSONSchemaProps. Mainly here for serialization purposes.",
"required": [
"Schema",
"JSONSchemas"
],
"properties": {
"JSONSchemas": {
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps"
}
},
"Schema": {
"$ref": "#/definitions/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps"
}
}
}
}
```
OpenAPI isn't able to represent oneOf/anyOf types correctly currently. Until it can, we definitely shouldn't publish a schema containing required fields which aren't even part of the JSON serialization. This PR implements custom openapi type functions, which omit the properties/required/schema attributes for four specific JSONSchema types. This allows kubectl to continue creating these objects without complaining.
/sig api-machinery
/assign @sttts
```release-note
fixed incorrect OpenAPI schema for CustomResourceDefinition objects
```
Kubernetes-commit: ed6c8b7326bd1a1b845719f4bfb302073a18f03f
2018-06-21 08:22:08 +08:00
|
|
|
meta.OwnerReferences = references
|
2017-10-19 17:32:12 +08:00
|
|
|
}
|
Merge pull request #65256 from liggitt/crd-schema-openapi
Automatic merge from submit-queue (batch tested with PRs 65256, 64236, 64919, 64879, 57932). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
Fix CRD OpenAPI schema
fixes #65243
depends on https://github.com/kubernetes/kube-openapi/pull/84
without this PR, kubectl complains about creating this CRD with a validation schema (which worked in 1.10):
```yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: resources.mygroup.example.com
spec:
group: mygroup.example.com
version: v1alpha1
scope: Namespaced
names:
plural: resources
singular: resource
kind: Kind
listKind: KindList
validation:
openAPIV3Schema:
properties:
spec:
type: array
items:
type: number
```
> error: error validating "/Users/jliggitt/projects/snippets/crd/crd.yaml": error validating data: [ValidationError(CustomResourceDefinition.spec.validation.openAPIV3Schema.properties.spec.items): unknown field "type" in io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray, ValidationError(CustomResourceDefinition.spec.validation.openAPIV3Schema.properties.spec.items): missing required field "Schema" in io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray, ValidationError(CustomResourceDefinition.spec.validation.openAPIV3Schema.properties.spec.items): missing required field "JSONSchemas" in io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray]; if you choose to ignore these errors, turn validation off with --validate=false
that is because the types used to serialize JSONSchema require custom marshaling/unmarshaling, and the OpenAPI generator was not informed of that, so it produced this:
```json
{
"io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaPropsOrArray": {
"description": "JSONSchemaPropsOrArray represents a value that can either be a JSONSchemaProps or an array of JSONSchemaProps. Mainly here for serialization purposes.",
"required": [
"Schema",
"JSONSchemas"
],
"properties": {
"JSONSchemas": {
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps"
}
},
"Schema": {
"$ref": "#/definitions/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps"
}
}
}
}
```
OpenAPI isn't able to represent oneOf/anyOf types correctly currently. Until it can, we definitely shouldn't publish a schema containing required fields which aren't even part of the JSON serialization. This PR implements custom openapi type functions, which omit the properties/required/schema attributes for four specific JSONSchema types. This allows kubectl to continue creating these objects without complaining.
/sig api-machinery
/assign @sttts
```release-note
fixed incorrect OpenAPI schema for CustomResourceDefinition objects
```
Kubernetes-commit: ed6c8b7326bd1a1b845719f4bfb302073a18f03f
2018-06-21 08:22:08 +08:00
|
|
|
func (meta *ObjectMeta) GetClusterName() string { return meta.ClusterName }
|
|
|
|
func (meta *ObjectMeta) SetClusterName(clusterName string) { meta.ClusterName = clusterName }
|