openstack
/
magnum
Code Issues Proposed changes

Merge "Document use of kube_tag label"

This commit is contained in:
Zuul 2018-02-14 12:52:04 +00:00 committed by Gerrit Code Review
parent 7aa0c0a285 11e7f330fb
commit c6e7b290ab
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/user/index.rst
View File

@ -336,6 +336,8 @@ the table are linked to more details elsewhere in the user guide.
+---------------------------------------+--------------------+---------------+
| `grafana_admin_passwd`_ | (any string) | "admin" |
+---------------------------------------+--------------------+---------------+
| `kube_tag`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
| `kube_dashboard_enabled`_ | - true | true |
| | - false | |
+---------------------------------------+--------------------+---------------+
@ -1087,6 +1089,7 @@ _`container_infra_prefix`
which assumes an operator has cloned all expected images in
myregistry.example.com/mycloud.
Images that must be mirrored:
* docker.io/coredns/coredns:011
* docker.io/grafana/grafana:latest
* docker.io/openstackmagnum/kubernetes-apiserver
@ -1099,6 +1102,13 @@ _`container_infra_prefix`
* gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
* gcr.io/google_containers/pause:3.0
_`kube_tag`
This label allows users to select `a specific Kubernetes release,
based on its container tag
<https://hub.docker.com/r/openstackmagnum/kubernetes-apiserver/tags/>`_.
If unset, the current Magnum version's default Kubernetes release is
installed.
_`kube_dashboard_enabled`
This label triggers the deployment of the kubernetes dashboard.
The default value is 1, meaning it will be enabled.

2
specs/containers-service.rst
View File

@ -175,7 +175,7 @@ with the Containers Service, and can be controlled only by a Nova virt driver.
|           +-------+ |  | +-----+                   |
|                     |  |                           |
+-----------+---------+  +---------------+-----------+
            |                            |            
            |                            |
+-----------+----+ Compute Host ---------|-----------+
|                                    +---+---+       |
|                               +----+ Relay +---+   |