diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index ca37dcbb30c..d3e11f5d554 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -866,18 +866,15 @@ }, { "ImportPath": "github.com/emicklei/go-restful", - "Comment": "v1.2-66-gc4afa8e", - "Rev": "c4afa8e5421428d584b32d36d7b35f2c9ae5f823" + "Rev": "89ef8af493ab468a45a42bb0d89a06fccdd2fb22" }, { "ImportPath": "github.com/emicklei/go-restful/log", - "Comment": "v1.2-66-gc4afa8e", - "Rev": "c4afa8e5421428d584b32d36d7b35f2c9ae5f823" + "Rev": "89ef8af493ab468a45a42bb0d89a06fccdd2fb22" }, { "ImportPath": "github.com/emicklei/go-restful/swagger", - "Comment": "v1.2-66-gc4afa8e", - "Rev": "c4afa8e5421428d584b32d36d7b35f2c9ae5f823" + "Rev": "89ef8af493ab468a45a42bb0d89a06fccdd2fb22" }, { "ImportPath": "github.com/evanphx/json-patch", diff --git a/api/swagger-spec/api.json b/api/swagger-spec/api.json index 11431a5a2f4..6ec7dba9c8e 100644 --- a/api/swagger-spec/api.json +++ b/api/swagger-spec/api.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/api", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/api", diff --git a/api/swagger-spec/apis.json b/api/swagger-spec/apis.json index 2f1f9d59995..dea7ec02cf7 100644 --- a/api/swagger-spec/apis.json +++ b/api/swagger-spec/apis.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis", diff --git a/api/swagger-spec/apps.json b/api/swagger-spec/apps.json index 7ae045f66ca..695f3160cef 100644 --- a/api/swagger-spec/apps.json +++ b/api/swagger-spec/apps.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/apps", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/apps", diff --git a/api/swagger-spec/apps_v1alpha1.json b/api/swagger-spec/apps_v1alpha1.json index 6675ec5a533..1fdc86fdbd1 100644 --- a/api/swagger-spec/apps_v1alpha1.json +++ b/api/swagger-spec/apps_v1alpha1.json @@ -3,6 +3,10 @@ "apiVersion": "apps/v1alpha1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/apps/v1alpha1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/apps/v1alpha1/namespaces/{namespace}/petsets", diff --git a/api/swagger-spec/authentication.k8s.io.json b/api/swagger-spec/authentication.k8s.io.json index d9e804175e1..7135929d552 100644 --- a/api/swagger-spec/authentication.k8s.io.json +++ b/api/swagger-spec/authentication.k8s.io.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/authentication.k8s.io", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/authentication.k8s.io", diff --git a/api/swagger-spec/authentication.k8s.io_v1beta1.json b/api/swagger-spec/authentication.k8s.io_v1beta1.json index 0049cbe5ba5..e27494d2c24 100644 --- a/api/swagger-spec/authentication.k8s.io_v1beta1.json +++ b/api/swagger-spec/authentication.k8s.io_v1beta1.json @@ -3,6 +3,10 @@ "apiVersion": "authentication.k8s.io/v1beta1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/authentication.k8s.io/v1beta1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/authentication.k8s.io/v1beta1/tokenreviews", diff --git a/api/swagger-spec/authorization.k8s.io.json b/api/swagger-spec/authorization.k8s.io.json index d7c9e898cd3..aedd67cd8ea 100644 --- a/api/swagger-spec/authorization.k8s.io.json +++ b/api/swagger-spec/authorization.k8s.io.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/authorization.k8s.io", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/authorization.k8s.io", diff --git a/api/swagger-spec/authorization.k8s.io_v1beta1.json b/api/swagger-spec/authorization.k8s.io_v1beta1.json index 60e2ea50187..fa0108a10e5 100644 --- a/api/swagger-spec/authorization.k8s.io_v1beta1.json +++ b/api/swagger-spec/authorization.k8s.io_v1beta1.json @@ -3,6 +3,10 @@ "apiVersion": "authorization.k8s.io/v1beta1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/authorization.k8s.io/v1beta1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/authorization.k8s.io/v1beta1/subjectaccessreviews", diff --git a/api/swagger-spec/autoscaling.json b/api/swagger-spec/autoscaling.json index 2d7356626f9..4de1765949b 100644 --- a/api/swagger-spec/autoscaling.json +++ b/api/swagger-spec/autoscaling.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/autoscaling", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/autoscaling", diff --git a/api/swagger-spec/autoscaling_v1.json b/api/swagger-spec/autoscaling_v1.json index 1783c4777db..70610f77ffb 100644 --- a/api/swagger-spec/autoscaling_v1.json +++ b/api/swagger-spec/autoscaling_v1.json @@ -3,6 +3,10 @@ "apiVersion": "autoscaling/v1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/autoscaling/v1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers", diff --git a/api/swagger-spec/batch.json b/api/swagger-spec/batch.json index 3d99488c549..1fe54f7ca9a 100644 --- a/api/swagger-spec/batch.json +++ b/api/swagger-spec/batch.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/batch", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/batch", diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index ba334774d5c..51f325c7264 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -3,6 +3,10 @@ "apiVersion": "batch/v1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/batch/v1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/batch/v1/namespaces/{namespace}/jobs", diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json index df3742a14f2..c805a3b4c26 100644 --- a/api/swagger-spec/batch_v2alpha1.json +++ b/api/swagger-spec/batch_v2alpha1.json @@ -3,6 +3,10 @@ "apiVersion": "batch/v2alpha1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/batch/v2alpha1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/batch/v2alpha1", diff --git a/api/swagger-spec/certificates.json b/api/swagger-spec/certificates.json index 015c7496d09..d96703da227 100644 --- a/api/swagger-spec/certificates.json +++ b/api/swagger-spec/certificates.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/certificates", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/certificates", diff --git a/api/swagger-spec/certificates_v1alpha1.json b/api/swagger-spec/certificates_v1alpha1.json index f212c1dda16..4dbb026c8c5 100644 --- a/api/swagger-spec/certificates_v1alpha1.json +++ b/api/swagger-spec/certificates_v1alpha1.json @@ -3,6 +3,10 @@ "apiVersion": "certificates/v1alpha1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/certificates/v1alpha1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/certificates/v1alpha1/certificatesigningrequests", @@ -866,10 +870,7 @@ ], "properties": { "request": { - "type": "array", - "items": { - "type": "integer" - }, + "type": "string", "description": "Base64-encoded PKCS#10 CSR data" }, "username": { @@ -898,10 +899,7 @@ "description": "Conditions applied to the request, such as approval or denial." }, "certificate": { - "type": "array", - "items": { - "type": "integer" - }, + "type": "string", "description": "If request was approved, the controller will place the issued certificate here." } } diff --git a/api/swagger-spec/extensions.json b/api/swagger-spec/extensions.json index 9e6eeb8b0fa..6d2375f1a61 100644 --- a/api/swagger-spec/extensions.json +++ b/api/swagger-spec/extensions.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/extensions", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/extensions", diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index a57c6501ec8..7d74ea3dae9 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -3,6 +3,10 @@ "apiVersion": "extensions/v1beta1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/extensions/v1beta1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/extensions/v1beta1/namespaces/{namespace}/daemonsets", diff --git a/api/swagger-spec/logs.json b/api/swagger-spec/logs.json index d74c43bf616..971cc9a5b70 100644 --- a/api/swagger-spec/logs.json +++ b/api/swagger-spec/logs.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/logs", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/logs/{logpath}", diff --git a/api/swagger-spec/policy.json b/api/swagger-spec/policy.json index 007c8f516fc..208c1079930 100644 --- a/api/swagger-spec/policy.json +++ b/api/swagger-spec/policy.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/policy", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/policy", diff --git a/api/swagger-spec/policy_v1alpha1.json b/api/swagger-spec/policy_v1alpha1.json index 659b71bc108..d58deddb24b 100644 --- a/api/swagger-spec/policy_v1alpha1.json +++ b/api/swagger-spec/policy_v1alpha1.json @@ -3,6 +3,10 @@ "apiVersion": "policy/v1alpha1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/policy/v1alpha1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/policy/v1alpha1/namespaces/{namespace}/poddisruptionbudgets", diff --git a/api/swagger-spec/rbac.authorization.k8s.io.json b/api/swagger-spec/rbac.authorization.k8s.io.json index 60b0398cdf7..8df6f779780 100644 --- a/api/swagger-spec/rbac.authorization.k8s.io.json +++ b/api/swagger-spec/rbac.authorization.k8s.io.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/rbac.authorization.k8s.io", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/rbac.authorization.k8s.io", diff --git a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json index fa45a90ad28..e00a71dee51 100644 --- a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json +++ b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json @@ -3,6 +3,10 @@ "apiVersion": "rbac.authorization.k8s.io/v1alpha1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/apis/rbac.authorization.k8s.io/v1alpha1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/apis/rbac.authorization.k8s.io/v1alpha1/clusterrolebindings", diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 6ce2935e05d..e503572f36a 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -3,6 +3,10 @@ "apiVersion": "v1", "basePath": "https://10.10.10.10:6443", "resourcePath": "/api/v1", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/api/v1/namespaces/{namespace}/bindings", diff --git a/api/swagger-spec/version.json b/api/swagger-spec/version.json index 59f268aa424..1b60aa14b9e 100644 --- a/api/swagger-spec/version.json +++ b/api/swagger-spec/version.json @@ -3,6 +3,10 @@ "apiVersion": "", "basePath": "https://10.10.10.10:6443", "resourcePath": "/version", + "info": { + "title": "", + "description": "" + }, "apis": [ { "path": "/version", diff --git a/docs/api-reference/certificates/v1alpha1/definitions.html b/docs/api-reference/certificates/v1alpha1/definitions.html index 9f2cf22e525..5c3a14b18fd 100755 --- a/docs/api-reference/certificates/v1alpha1/definitions.html +++ b/docs/api-reference/certificates/v1alpha1/definitions.html @@ -529,7 +529,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
request
Base64-encoded PKCS#10 CSR data
true
integer (int32) array
string
certificate
If request was approved, the controller will place the issued certificate here.
false
integer (int32) array
string