zuul/nodepool
Code Issues Proposed changes

Merge "Fix OpenShift driver typo"

Browse Source
This commit is contained in:
Zuul 2019-01-18 18:43:08 +00:00 committed by Gerrit Code Review
commit 1edeb2fe3b
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/source/configuration.rst
View File

@ -1125,7 +1125,7 @@ Selecting the kubernetes driver adds the following options to the
.. value:: namespace .. value:: namespace
Namespace labels provide an empty namespace configured Namespace labels provide an empty namespace configured
with a service account that can creates pods, services, with a service account that can create pods, services,
configmaps, etc. configmaps, etc.
.. value:: pod .. value:: pod
@ -1193,7 +1193,7 @@ Selecting the openshift driver adds the following options to the
Before using the driver, Nodepool services need a ``kube/config`` file Before using the driver, Nodepool services need a ``kube/config`` file
manually installed with self-provisioner (the service account needs to manually installed with self-provisioner (the service account needs to
be able to create project) context. be able to create projects) context.
Make sure the context is present in ``oc config get-contexts`` command Make sure the context is present in ``oc config get-contexts`` command
output. output.
@ -1240,13 +1240,13 @@ Selecting the openshift driver adds the following options to the
.. value:: project .. value:: project
Project labels provide an empty project configured Project labels provide an empty project configured
with a service account that can creates pods, services, with a service account that can create pods, services,
configmaps, etc. configmaps, etc.
.. value:: pod .. value:: pod
Pod labels provide a dedicated project with a single pod Pod labels provide a new dedicated project with a single
created using the pod created using the
:attr:`providers.[openshift].labels.image` parameter and it :attr:`providers.[openshift].labels.image` parameter and it
is configured with a service account that can exec and get is configured with a service account that can exec and get
the logs of the pod. the logs of the pod.
@ -1257,12 +1257,18 @@ Selecting the openshift driver adds the following options to the
:value:`providers.[openshift].labels.type.pod` label type; :value:`providers.[openshift].labels.type.pod` label type;
specifies the image name used by the pod. specifies the image name used by the pod.
.. attr:: image-pull
:default: IfNotPresent
:type: str
The ImagePullPolicy, can be IfNotPresent, Always or Never.
.. attr:: cpu .. attr:: cpu
:type: int :type: int
Only used by the Only used by the
:value:`providers.[openshift].labels.type.pod` label type; :value:`providers.[openshift].labels.type.pod` label type;
specifies the amount of cpu to request for the pod. specifies the number of cpu to request for the pod.
.. attr:: memory .. attr:: memory
:type: int :type: int

2
nodepool/driver/openshift/handler.py
View File

@ -118,7 +118,7 @@ class OpenshiftNodeRequestHandler(NodeRequestHandler):
node_states = [node.state for node in self.nodeset] node_states = [node.state for node in self.nodeset]
# NOTE: It very important that NodeLauncher always sets one of # NOTE: It's very important that NodeLauncher always sets one of
# these states, no matter what. # these states, no matter what.
if not all(s in (zk.READY, zk.FAILED, zk.ABORTED) if not all(s in (zk.READY, zk.FAILED, zk.ABORTED)
for s in node_states): for s in node_states):