GET /api/v1/namespaces/{name}/status
+PUT /api/v1/namespaces/{name}/finalize
diff --git a/_data/overrides.yml b/_data/overrides.yml index 2506ba82f7..d38226e61b 100644 --- a/_data/overrides.yml +++ b/_data/overrides.yml @@ -8,11 +8,11 @@ overrides: - path: docs/admin/kube-proxy.md - path: docs/admin/kube-scheduler.md - path: docs/admin/kubelet.md -- path: federation/docs/api-reference - changedpath: docs/api-reference/extensions/v1beta1/definitions.html _includes/v1.4/extensions-v1beta1-definitions.html - changedpath: docs/api-reference/extensions/v1beta1/operations.html _includes/v1.4/extensions-v1beta1-operations.html - changedpath: docs/api-reference/v1/definitions.html _includes/v1.4/v1-definitions.html - changedpath: docs/api-reference/v1/operations.html _includes/v1.4/v1-operations.html +- copypath: k8s/federation/docs/api-reference/ docs/federation/ - copypath: k8s/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml docs/getting-started-guides/fluentd-gcp.yaml - copypath: k8s/examples/blog-logging/counter-pod.yaml docs/getting-started-guides/counter-pod.yaml - copypath: k8s/examples/blog-logging/counter-pod.yaml docs/user-guide/counter-pod.yaml diff --git a/_data/reference.yml b/_data/reference.yml index f9de6e8f04..dca3bb90ef 100644 --- a/_data/reference.yml +++ b/_data/reference.yml @@ -250,5 +250,13 @@ toc: - title: Federation section: - - title: User guide + - title: User guide path: /docs/user-guide/federation/ + - title: Federation API + path: /docs/federation/api-reference/README/ + - title: Federation Components + section: + - title: federation-apiserver + path: /docs/admin/federation-apiserver.md + - title : federation-controller-mananger + path: /docs/admin/federation-controller-manager.md diff --git a/docs/api-reference/README.md b/docs/api-reference/README.md index 3e47db14f5..905b267947 100644 --- a/docs/api-reference/README.md +++ b/docs/api-reference/README.md @@ -5,10 +5,10 @@ Use the following reference docs to understand the kubernetes REST API for various API group versions: -* v1: [operations](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/release-1.4/docs/api-reference/v1/operations.html), [model definitions](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/release-1.4/docs/api-reference/v1/definitions.html) -* extensions/v1beta1: [operations](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/release-1.4/docs/api-reference/extensions/v1beta1/operations.html), [model definitions](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/release-1.4/docs/api-reference/extensions/v1beta1/definitions.html) -* batch/v1: [operations](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/release-1.4/docs/api-reference/batch/v1/operations.html), [model definitions](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/release-1.4/docs/api-reference/batch/v1/definitions.html) -* autoscaling/v1: [operations](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/release-1.4/docs/api-reference/autoscaling/v1/operations.html), [model definitions](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/release-1.4/docs/api-reference/autoscaling/v1/definitions.html) +* v1: [operations](/docs/api-reference/v1/operations.html), [model definitions](/docs/api-reference/v1/definitions.html) +* extensions/v1beta1: [operations](/docs/api-reference/extensions/v1beta1/operations.html), [model definitions](/docs/api-reference/extensions/v1beta1/definitions.html) +* batch/v1: [operations](/docs/api-reference/batch/v1/operations.html), [model definitions](/docs/api-reference/batch/v1/definitions.html) +* autoscaling/v1: [operations](/docs/api-reference/autoscaling/v1/operations.html), [model definitions](/docs/api-reference/autoscaling/v1/definitions.html) diff --git a/docs/federation/api-reference/README.md b/docs/federation/api-reference/README.md new file mode 100644 index 0000000000..18f9c4f63d --- /dev/null +++ b/docs/federation/api-reference/README.md @@ -0,0 +1,19 @@ +--- +--- + +# API Reference + +Federation API server supports the following group versions: + +* federation/v1beta1: [operations](/docs/federation/api-reference/federation/v1beta1/operations.html), [model definitions](/docs/federation/api-reference/federation/v1beta1/definitions.html) +* v1: [operations](/docs/federation/api-reference/v1/operations.html), [model definitions](/docs/federation/api-reference/v1/definitions.html) +* extensions/v1beta1: [operations](/docs/federation/api-reference/extensions/v1beta1/operations.html), [model definitions](/docs/federation/api-reference/extensions/v1beta1/definitions.html) + + + + + + + +[]() + diff --git a/federation/docs/api-reference/extensions/v1beta1/definitions.html b/docs/federation/api-reference/extensions/v1beta1/definitions.html similarity index 89% rename from federation/docs/api-reference/extensions/v1beta1/definitions.html rename to docs/federation/api-reference/extensions/v1beta1/definitions.html index 0e267b46c2..f1049e94d9 100755 --- a/federation/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/federation/api-reference/extensions/v1beta1/definitions.html @@ -1,3 +1,5 @@ +--- +---
@@ -5,360 +7,6 @@targetWWNs
Required: FC target world wide names (WWNs)
Required: FC target worldwide names (WWNs)
true
string array
FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plugin. This is an alpha feature and may change in future.
+FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future.
flexVolume |
-FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plugin. This is an alpha feature and may change in future. |
+FlexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. This is an alpha feature and may change in future. |
false |
@@ -4813,7 +4461,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i diff --git a/federation/docs/api-reference/extensions/v1beta1/operations.html b/docs/federation/api-reference/extensions/v1beta1/operations.html similarity index 84% rename from federation/docs/api-reference/extensions/v1beta1/operations.html rename to docs/federation/api-reference/extensions/v1beta1/operations.html index 2c5c8326f9..7589c04418 100755 --- a/federation/docs/api-reference/extensions/v1beta1/operations.html +++ b/docs/federation/api-reference/extensions/v1beta1/operations.html @@ -1,3 +1,5 @@ +--- +--- @@ -5,360 +7,6 @@ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
BodyParameter |
+body |
++ | true |
++ | + | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
PathParameter |
name |
name of the Namespace |
@@ -4792,10 +4448,10 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
BodyParameter |
-body |
-- | true |
-- | - | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
PathParameter |
name |
name of the Namespace |
@@ -4911,6 +4559,125 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
| Type | +Name | +Description | +Required | +Schema | +Default | +
|---|---|---|---|---|---|
QueryParameter |
+pretty |
+If true, then the output is pretty printed. |
+false |
+string |
++ |
BodyParameter |
+body |
++ | true |
++ | + |
PathParameter |
+name |
+name of the Namespace |
+true |
+string |
++ |
| HTTP Code | +Description | +Schema | +
|---|---|---|
200 |
+success |
++ |
/
+application/json
+application/yaml
+application/vnd.kubernetes.protobuf
+apiv1
+| Type | -Name | -Description | -Required | -Schema | -Default | -
|---|---|---|---|---|---|
QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
-- |
QueryParameter |
-labelSelector |
-A selector to restrict the list of returned objects by their labels. Defaults to everything. |
-false |
-string |
-- |
QueryParameter |
-fieldSelector |
-A selector to restrict the list of returned objects by their fields. Defaults to everything. |
-false |
-string |
-- |
QueryParameter |
-watch |
-Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion. |
-false |
-boolean |
-- |
QueryParameter |
-resourceVersion |
-When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. |
-false |
-string |
-- |
QueryParameter |
-timeoutSeconds |
-Timeout for the list/watch call. |
-false |
-integer (int32) |
-- |
| HTTP Code | -Description | -Schema | -
|---|---|---|
200 |
-success |
-- |
/
-GET /api/v1/services+
GET /api/v1/secrets
200
success
GET /api/v1/watch/events+
GET /api/v1/services
200
success
application/json
application/json;stream=watch
+application/yaml
application/vnd.kubernetes.protobuf
application/vnd.kubernetes.protobuf;stream=watch
-GET /api/v1/watch/namespaces+
GET /api/v1/watch/events
GET /api/v1/watch/namespaces+
| Type | +Name | +Description | +Required | +Schema | +Default | +
|---|---|---|---|---|---|
QueryParameter |
+pretty |
+If true, then the output is pretty printed. |
+false |
+string |
++ |
QueryParameter |
+labelSelector |
+A selector to restrict the list of returned objects by their labels. Defaults to everything. |
+false |
+string |
++ |
QueryParameter |
+fieldSelector |
+A selector to restrict the list of returned objects by their fields. Defaults to everything. |
+false |
+string |
++ |
QueryParameter |
+watch |
+Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion. |
+false |
+boolean |
++ |
QueryParameter |
+resourceVersion |
+When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. |
+false |
+string |
++ |
QueryParameter |
+timeoutSeconds |
+Timeout for the list/watch call. |
+false |
+integer (int32) |
++ |
| HTTP Code | +Description | +Schema | +
|---|---|---|
200 |
+success |
++ |
/
+application/json
+application/json;stream=watch
+application/vnd.kubernetes.protobuf
+application/vnd.kubernetes.protobuf;stream=watch
+apiv1
+| HTTP Code | -Description | -Schema | -
|---|---|---|
200 |
-success |
-- |
/
-application/json
-application/json;stream=watch
-application/vnd.kubernetes.protobuf
-application/vnd.kubernetes.protobuf;stream=watch
-apiv1
-GET /api/v1/watch/secrets-
| Type | -Name | -Description | -Required | -Schema | -Default | -
|---|---|---|---|---|---|
QueryParameter |
-pretty |
-If true, then the output is pretty printed. |
-false |
-string |
-- |
QueryParameter |
-labelSelector |
-A selector to restrict the list of returned objects by their labels. Defaults to everything. |
-false |
-string |
-- |
QueryParameter |
-fieldSelector |
-A selector to restrict the list of returned objects by their fields. Defaults to everything. |
-false |
-string |
-- |
QueryParameter |
-watch |
-Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion. |
-false |
-boolean |
-- |
QueryParameter |
-resourceVersion |
-When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. |
-false |
-string |
-- |
QueryParameter |
-timeoutSeconds |
-Timeout for the list/watch call. |
-false |
-integer (int32) |
-- |
GET /api/v1/watch/services+
GET /api/v1/watch/secrets
GET /api/v1/watch/services+
| Type | +Name | +Description | +Required | +Schema | +Default | +
|---|---|---|---|---|---|
QueryParameter |
+pretty |
+If true, then the output is pretty printed. |
+false |
+string |
++ |
QueryParameter |
+labelSelector |
+A selector to restrict the list of returned objects by their labels. Defaults to everything. |
+false |
+string |
++ |
QueryParameter |
+fieldSelector |
+A selector to restrict the list of returned objects by their fields. Defaults to everything. |
+false |
+string |
++ |
QueryParameter |
+watch |
+Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion. |
+false |
+boolean |
++ |
QueryParameter |
+resourceVersion |
+When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history. |
+false |
+string |
++ |
QueryParameter |
+timeoutSeconds |
+Timeout for the list/watch call. |
+false |
+integer (int32) |
++ |
| HTTP Code | +Description | +Schema | +
|---|---|---|
200 |
+success |
++ |
/
+application/json
+application/json;stream=watch
+application/vnd.kubernetes.protobuf
+application/vnd.kubernetes.protobuf;stream=watch
+apiv1
+