Skip to content

Stable 20160411 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Apr 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ebaaec8
UPSTREAM: <carry>: remove types.generated.go
liggitt Mar 10, 2016
11adcd6
UPSTREAM: <carry>: Disable UIs for Kubernetes and etcd
deads2k Aug 11, 2015
625cf5d
UPSTREAM: <carry>: Back n forth downward/metadata conversions
deads2k Oct 16, 2015
82feabe
UPSTREAM: <carry>: SCC
deads2k Oct 16, 2015
8bd08c5
UPSTREAM: <carry>: Add deprecated fields to migrate 1.0.0 k8s v1 data
liggitt Jan 23, 2016
a49ac24
UPSTREAM: <carry>: reallow the ability to post across namespaces in api
Aug 11, 2015
d120cda
UPSTREAM: <carry>: update describer for dockercfg secrets
deads2k Aug 11, 2015
2ef6536
UPSTREAM: <carry>: support pointing oc exec to old openshift server
deads2k Aug 11, 2015
a0d2a02
UPSTREAM: <carry>: v1beta3
deads2k Aug 11, 2015
8bd9fc6
UPSTREAM: <carry>: add kubelet timeouts
soltysh Dec 21, 2015
a194b91
UPSTREAM: <carry>: OpenShift 3.0.2 nodes report v1.1.0-alpha
smarterclayton Oct 30, 2015
0e1249f
UPSTREAM: <carry>: Tolerate node ExternalID changes with no cloud pro…
DirectXMan12 Jan 12, 2016
f9ff65e
UPSTREAM: <carry>: allow hostDNS to be included along with ClusterDNS…
soltysh Jan 25, 2016
ca7db12
UPSTREAM: <carry>: Add our types to kubectl get error
smarterclayton Oct 11, 2015
becd499
UPSTREAM: <carry>: horrible hack for intstr types
deads2k Feb 3, 2016
bd89afe
UPSTREAM: <carry>: Allow overriding default generators for run
liggitt Mar 16, 2016
edf8716
UPSTREAM: <carry>: Suppress aggressive output of warning
smarterclayton Mar 23, 2016
51ed619
UPSTREAM: <carry>: v1beta3: ensure only v1 appears in discovery for l…
liggitt Mar 28, 2016
62e98af
UPSTREAM: <drop>: merge multiple registrations for the same group
deads2k Feb 1, 2016
5118081
UPSTREAM: <drop>: disable kubelet image GC unit test
deads2k Feb 4, 2016
cecc543
UPSTREAM: <drop>: make etcd error determination support old client un…
deads2k Feb 5, 2016
976fa3e
UPSTREAM: 16964: Preserve int64 data when patching
liggitt Nov 7, 2015
dba5a01
UPSTREAM: 16146: Fix validate event for non-namespaced kinds
feihujiang Oct 23, 2015
c6be76b
UPSTREAM: 20847: Force a dependency order between extensions and api
smarterclayton Feb 8, 2016
17e8389
UPSTREAM: 22919: Allow starting test etcd with http
liggitt Mar 13, 2016
c16bf6e
UPSTREAM: 22857: partial - ensure DetermineEffectiveSC retains the co…
Mar 10, 2016
61d1935
UPSTREAM: <drop>: generated files missed due to non-conflicting updates
deads2k Apr 12, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions api/swagger-spec/autoscaling_v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,44 @@
"consumes": [
"*/*"
]
},
{
"type": "v1.HorizontalPodAutoscaler",
"method": "POST",
"summary": "create a HorizontalPodAutoscaler",
"nickname": "createNamespacedHorizontalPodAutoscaler",
"parameters": [
{
"type": "string",
"paramType": "query",
"name": "pretty",
"description": "If 'true', then the output is pretty printed.",
"required": false,
"allowMultiple": false
},
{
"type": "v1.HorizontalPodAutoscaler",
"paramType": "body",
"name": "body",
"description": "",
"required": true,
"allowMultiple": false
}
],
"responseMessages": [
{
"code": 200,
"message": "OK",
"responseModel": "v1.HorizontalPodAutoscaler"
}
],
"produces": [
"application/json",
"application/yaml"
],
"consumes": [
"*/*"
]
}
]
},
Expand Down
77 changes: 77 additions & 0 deletions api/swagger-spec/batch_v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,44 @@
"consumes": [
"*/*"
]
},
{
"type": "v1.Job",
"method": "POST",
"summary": "create a Job",
"nickname": "createNamespacedJob",
"parameters": [
{
"type": "string",
"paramType": "query",
"name": "pretty",
"description": "If 'true', then the output is pretty printed.",
"required": false,
"allowMultiple": false
},
{
"type": "v1.Job",
"paramType": "body",
"name": "body",
"description": "",
"required": true,
"allowMultiple": false
}
],
"responseMessages": [
{
"code": 200,
"message": "OK",
"responseModel": "v1.Job"
}
],
"produces": [
"application/json",
"application/yaml"
],
"consumes": [
"*/*"
]
}
]
},
Expand Down Expand Up @@ -1111,6 +1149,10 @@
"type": "any",
"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"
},
"host": {
"type": "string",
"description": "A request to schedule this pod onto a specific node Deprecated: Use nodeName instead."
},
"serviceAccountName": {
"type": "string",
"description": "ServiceAccountName is the name of the ServiceAccount to use to run this pod. More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md"
Expand Down Expand Up @@ -1234,6 +1276,10 @@
"configMap": {
"$ref": "v1.ConfigMapVolumeSource",
"description": "ConfigMap represents a configMap that should populate this volume"
},
"metadata": {
"$ref": "v1.MetadataVolumeSource",
"description": "Metadata represents metadata about the pod that should populate this volume Deprecated: Use downwardAPI instead."
}
}
},
Expand Down Expand Up @@ -1733,6 +1779,37 @@
}
}
},
"v1.MetadataVolumeSource": {
"id": "v1.MetadataVolumeSource",
"description": "MetadataVolumeSource represents a volume containing metadata about a pod. NOTE: Deprecated in favor of DownwardAPIVolumeSource",
"properties": {
"items": {
"type": "array",
"items": {
"$ref": "v1.MetadataFile"
},
"description": "Items is a list of metadata file name"
}
}
},
"v1.MetadataFile": {
"id": "v1.MetadataFile",
"description": "MetadataFile expresses information about a file holding pod metadata. NOTE: Deprecated in favor of DownwardAPIVolumeFile",
"required": [
"name",
"fieldRef"
],
"properties": {
"name": {
"type": "string",
"description": "Name of the file to be created"
},
"fieldRef": {
"$ref": "v1.ObjectFieldSelector",
"description": "Selects a field of the pod. Supported fields: metadata.annotations, metadata.labels, metadata.name, metadata.namespace"
}
}
},
"v1.Container": {
"id": "v1.Container",
"description": "A single application container that you want to run within a pod.",
Expand Down
Loading