Skip to content

Commit

Permalink
Merge pull request #22897 from nikhiljindal/swaggerObject
Browse files Browse the repository at this point in the history 
Automatic merge from submit-queue

Updating go-restful to generate "type":"object" instead of "type":"any" in swagger-spec (breaks kubectl 1.1)

Updating go-restful to include emicklei/go-restful#270 (replacing type "any" by type "object". Ref swagger-api/swagger-codegen#2347 on why we want to do that)
Ref #4700 (comment)

First commit generated using:
```
godep restore
go get -u github.com/emicklei/go-restful
godep update github.com/emicklei/go-restful
```

Second commit generated by running 
```
./hack/update-swagger-spec.sh
```

Third commit generated by running:
```
./hack/update-api-reference-docs.sh
```

cc @kubernetes/sig-api-machinery @bgrant0607
  • Loading branch information
k8s-merge-robot committed Apr 15, 2016
2 parents 6320e41 + 6eae11e commit f4473af
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 158 deletions.
4 changes: 2 additions & 2 deletions api/swagger-spec/autoscaling_v1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,11 +967,11 @@
"description": "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only."
},
"labels": {
"type": "any",
"type": "object",
"description": "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md"
},
"annotations": {
"type": "any",
"type": "object",
"description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://releases.k8s.io/HEAD/docs/user-guide/annotations.md"
}
}
Expand Down
20 changes: 8 additions & 12 deletions api/swagger-spec/batch_v1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,11 +967,11 @@
"description": "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only."
},
"labels": {
"type": "any",
"type": "object",
"description": "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md"
},
"annotations": {
"type": "any",
"type": "object",
"description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://releases.k8s.io/HEAD/docs/user-guide/annotations.md"
}
}
Expand Down Expand Up @@ -1017,7 +1017,7 @@
"description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.",
"properties": {
"matchLabels": {
"type": "any",
"type": "object",
"description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed."
},
"matchExpressions": {
Expand Down Expand Up @@ -1108,7 +1108,7 @@
"description": "Set DNS policy for containers within the pod. One of 'ClusterFirst' or 'Default'. Defaults to \"ClusterFirst\"."
},
"nodeSelector": {
"type": "any",
"type": "object",
"description": "NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node's labels for the pod to be scheduled on that node. More info: http://releases.k8s.io/HEAD/docs/user-guide/node-selection/README.md"
},
"serviceAccountName": {
Expand Down Expand Up @@ -1523,7 +1523,7 @@
"description": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts."
},
"options": {
"type": "any",
"type": "object",
"description": "Optional: Extra command options if any."
}
}
Expand Down Expand Up @@ -1938,11 +1938,11 @@
"description": "ResourceRequirements describes the compute resource requirements.",
"properties": {
"limits": {
"type": "any",
"type": "object",
"description": "Limits describes the maximum amount of compute resources allowed. More info: http://releases.k8s.io/HEAD/docs/design/resources.md#resource-specifications"
},
"requests": {
"type": "any",
"type": "object",
"description": "Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: http://releases.k8s.io/HEAD/docs/design/resources.md#resource-specifications"
}
}
Expand Down Expand Up @@ -2217,7 +2217,7 @@
"supplementalGroups": {
"type": "array",
"items": {
"$ref": "integer"
"type": "integer"
},
"description": "A list of groups applied to the first process run in each container, in addition to the container's primary GID. If unspecified, no groups will be added to any container."
},
Expand All @@ -2228,10 +2228,6 @@
}
}
},
"integer": {
"id": "integer",
"properties": {}
},
"v1.JobStatus": {
"id": "v1.JobStatus",
"description": "JobStatus represents the current state of a Job.",
Expand Down
24 changes: 10 additions & 14 deletions api/swagger-spec/extensions_v1beta1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6403,11 +6403,11 @@
"description": "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only."
},
"labels": {
"type": "any",
"type": "object",
"description": "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md"
},
"annotations": {
"type": "any",
"type": "object",
"description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://releases.k8s.io/HEAD/docs/user-guide/annotations.md"
}
}
Expand All @@ -6434,7 +6434,7 @@
"description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.",
"properties": {
"matchLabels": {
"type": "any",
"type": "object",
"description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed."
},
"matchExpressions": {
Expand Down Expand Up @@ -6525,7 +6525,7 @@
"description": "Set DNS policy for containers within the pod. One of 'ClusterFirst' or 'Default'. Defaults to \"ClusterFirst\"."
},
"nodeSelector": {
"type": "any",
"type": "object",
"description": "NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node's labels for the pod to be scheduled on that node. More info: http://releases.k8s.io/HEAD/docs/user-guide/node-selection/README.md"
},
"serviceAccountName": {
Expand Down Expand Up @@ -6940,7 +6940,7 @@
"description": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts."
},
"options": {
"type": "any",
"type": "object",
"description": "Optional: Extra command options if any."
}
}
Expand Down Expand Up @@ -7355,11 +7355,11 @@
"description": "ResourceRequirements describes the compute resource requirements.",
"properties": {
"limits": {
"type": "any",
"type": "object",
"description": "Limits describes the maximum amount of compute resources allowed. More info: http://releases.k8s.io/HEAD/docs/design/resources.md#resource-specifications"
},
"requests": {
"type": "any",
"type": "object",
"description": "Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: http://releases.k8s.io/HEAD/docs/design/resources.md#resource-specifications"
}
}
Expand Down Expand Up @@ -7634,7 +7634,7 @@
"supplementalGroups": {
"type": "array",
"items": {
"$ref": "integer"
"type": "integer"
},
"description": "A list of groups applied to the first process run in each container, in addition to the container's primary GID. If unspecified, no groups will be added to any container."
},
Expand All @@ -7645,10 +7645,6 @@
}
}
},
"integer": {
"id": "integer",
"properties": {}
},
"v1beta1.DaemonSetStatus": {
"id": "v1beta1.DaemonSetStatus",
"description": "DaemonSetStatus represents the current status of a daemon set.",
Expand Down Expand Up @@ -7996,7 +7992,7 @@
"description": "Required: This must match the Name of a deployment."
},
"updatedAnnotations": {
"type": "any",
"type": "object",
"description": "The annotations to be updated to a deployment"
},
"rollbackTo": {
Expand Down Expand Up @@ -8055,7 +8051,7 @@
"description": "actual number of observed instances of the scaled object."
},
"selector": {
"type": "any",
"type": "object",
"description": "label query over pods that should match the replicas count. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors"
},
"targetSelector": {
Expand Down
50 changes: 23 additions & 27 deletions api/swagger-spec/v1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14827,11 +14827,11 @@
"description": "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only."
},
"labels": {
"type": "any",
"type": "object",
"description": "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md"
},
"annotations": {
"type": "any",
"type": "object",
"description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://releases.k8s.io/HEAD/docs/user-guide/annotations.md"
}
}
Expand Down Expand Up @@ -15005,7 +15005,7 @@
"description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"
},
"data": {
"type": "any",
"type": "object",
"description": "Data contains the configuration data. Each key must be a valid DNS_SUBDOMAIN with an optional leading dot."
}
}
Expand Down Expand Up @@ -15437,23 +15437,23 @@
"description": "Type of resource that this limit applies to."
},
"max": {
"type": "any",
"type": "object",
"description": "Max usage constraints on this kind by resource name."
},
"min": {
"type": "any",
"type": "object",
"description": "Min usage constraints on this kind by resource name."
},
"default": {
"type": "any",
"type": "object",
"description": "Default resource requirement limit value by resource name if resource limit is omitted."
},
"defaultRequest": {
"type": "any",
"type": "object",
"description": "DefaultRequest is the default resource requirement request value by resource name if resource request is omitted."
},
"maxLimitRequestRatio": {
"type": "any",
"type": "object",
"description": "MaxLimitRequestRatio if specified, the named resource must have a request and limit that are both non-zero where limit divided by request is less than or equal to the enumerated value; this represents the max burst for the named resource."
}
}
Expand Down Expand Up @@ -15620,11 +15620,11 @@
"description": "NodeStatus is information about the current status of a node.",
"properties": {
"capacity": {
"type": "any",
"type": "object",
"description": "Capacity represents the total resources of a node. More info: http://releases.k8s.io/HEAD/docs/user-guide/persistent-volumes.md#capacity for more details."
},
"allocatable": {
"type": "any",
"type": "object",
"description": "Allocatable represents the resources of a node that are available for scheduling. Defaults to Capacity."
},
"phase": {
Expand Down Expand Up @@ -15891,11 +15891,11 @@
"description": "ResourceRequirements describes the compute resource requirements.",
"properties": {
"limits": {
"type": "any",
"type": "object",
"description": "Limits describes the maximum amount of compute resources allowed. More info: http://releases.k8s.io/HEAD/docs/design/resources.md#resource-specifications"
},
"requests": {
"type": "any",
"type": "object",
"description": "Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: http://releases.k8s.io/HEAD/docs/design/resources.md#resource-specifications"
}
}
Expand All @@ -15916,7 +15916,7 @@
"description": "AccessModes contains the actual access modes the volume backing the PVC has. More info: http://releases.k8s.io/HEAD/docs/user-guide/persistent-volumes.md#access-modes-1"
},
"capacity": {
"type": "any",
"type": "object",
"description": "Represents the actual resources of the underlying volume."
}
}
Expand Down Expand Up @@ -15980,7 +15980,7 @@
"description": "PersistentVolumeSpec is the specification of a persistent volume.",
"properties": {
"capacity": {
"type": "any",
"type": "object",
"description": "A description of the persistent volume's resources and capacity. More info: http://releases.k8s.io/HEAD/docs/user-guide/persistent-volumes.md#capacity"
},
"gcePersistentDisk": {
Expand Down Expand Up @@ -16380,7 +16380,7 @@
"description": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts."
},
"options": {
"type": "any",
"type": "object",
"description": "Optional: Extra command options if any."
}
}
Expand Down Expand Up @@ -16519,7 +16519,7 @@
"description": "Set DNS policy for containers within the pod. One of 'ClusterFirst' or 'Default'. Defaults to \"ClusterFirst\"."
},
"nodeSelector": {
"type": "any",
"type": "object",
"description": "NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node's labels for the pod to be scheduled on that node. More info: http://releases.k8s.io/HEAD/docs/user-guide/node-selection/README.md"
},
"serviceAccountName": {
Expand Down Expand Up @@ -17259,7 +17259,7 @@
"supplementalGroups": {
"type": "array",
"items": {
"$ref": "integer"
"type": "integer"
},
"description": "A list of groups applied to the first process run in each container, in addition to the container's primary GID. If unspecified, no groups will be added to any container."
},
Expand All @@ -17270,10 +17270,6 @@
}
}
},
"integer": {
"id": "integer",
"properties": {}
},
"v1.PodStatus": {
"id": "v1.PodStatus",
"description": "PodStatus represents information about the status of a pod. Status may trail the actual state of a system.",
Expand Down Expand Up @@ -17607,7 +17603,7 @@
"description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: http://releases.k8s.io/HEAD/docs/user-guide/replication-controller.md#what-is-a-replication-controller"
},
"selector": {
"type": "any",
"type": "object",
"description": "Selector is a label query over pods that should match the Replicas count. If Selector is empty, it is defaulted to the labels present on the Pod template. Label keys and values that must match in order to be controlled by this replication controller, if empty defaulted to labels on Pod template. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors"
},
"template": {
Expand Down Expand Up @@ -17754,7 +17750,7 @@
"description": "ResourceQuotaSpec defines the desired hard limits to enforce for Quota.",
"properties": {
"hard": {
"type": "any",
"type": "object",
"description": "Hard is the set of desired hard limits for each named resource. More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota"
},
"scopes": {
Expand All @@ -17775,11 +17771,11 @@
"description": "ResourceQuotaStatus defines the enforced hard limits and observed use.",
"properties": {
"hard": {
"type": "any",
"type": "object",
"description": "Hard is the set of enforced hard limits for each named resource. More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota"
},
"used": {
"type": "any",
"type": "object",
"description": "Used is the current observed total usage of the resource in the namespace."
}
}
Expand Down Expand Up @@ -17829,7 +17825,7 @@
"description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"
},
"data": {
"type": "any",
"type": "object",
"description": "Data contains the secret data. Each key must be a valid DNS_SUBDOMAIN or leading dot followed by valid DNS_SUBDOMAIN. The serialized form of the secret data is a base64 encoded string, representing the arbitrary (possibly non-string) data value here. Described in https://tools.ietf.org/html/rfc4648#section-4"
},
"type": {
Expand Down Expand Up @@ -17967,7 +17963,7 @@
"description": "The list of ports that are exposed by this service. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#virtual-ips-and-service-proxies"
},
"selector": {
"type": "any",
"type": "object",
"description": "This service will route traffic to pods having labels matching this selector. Label keys and values that must match in order to receive traffic for this service. If empty, all pods are selected, if not specified, endpoints must be manually specified. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview"
},
"clusterIP": {
Expand Down

1 comment on commit f4473af

@k8s-teamcity-mesosphere
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity OSS :: Kubernetes Mesos :: 4 - Smoke Tests Build 21499 outcome was SUCCESS
Summary: Tests passed: 1, ignored: 276 Build time: 00:12:13

Please sign in to comment.