Browse Source

Merge "Fix OpenShift driver typo"

tags/3.5.0
Zuul 5 months ago
parent
commit
1edeb2fe3b
2 changed files with 13 additions and 7 deletions
  1. 12
    6
      doc/source/configuration.rst
  2. 1
    1
      nodepool/driver/openshift/handler.py

+ 12
- 6
doc/source/configuration.rst View File

@@ -1125,7 +1125,7 @@ Selecting the kubernetes driver adds the following options to the
1125 1125
          .. value:: namespace
1126 1126
 
1127 1127
             Namespace labels provide an empty namespace configured
1128
-            with a service account that can creates pods, services,
1128
+            with a service account that can create pods, services,
1129 1129
             configmaps, etc.
1130 1130
 
1131 1131
          .. value:: pod
@@ -1193,7 +1193,7 @@ Selecting the openshift driver adds the following options to the
1193 1193
 
1194 1194
       Before using the driver, Nodepool services need a ``kube/config`` file
1195 1195
       manually installed with self-provisioner (the service account needs to
1196
-      be able to create project) context.
1196
+      be able to create projects) context.
1197 1197
       Make sure the context is present in ``oc config get-contexts`` command
1198 1198
       output.
1199 1199
 
@@ -1240,13 +1240,13 @@ Selecting the openshift driver adds the following options to the
1240 1240
          .. value:: project
1241 1241
 
1242 1242
             Project labels provide an empty project configured
1243
-            with a service account that can creates pods, services,
1243
+            with a service account that can create pods, services,
1244 1244
             configmaps, etc.
1245 1245
 
1246 1246
          .. value:: pod
1247 1247
 
1248
-            Pod labels provide a dedicated project with a single pod
1249
-            created using the
1248
+            Pod labels provide a new dedicated project with a single
1249
+            pod created using the
1250 1250
             :attr:`providers.[openshift].labels.image` parameter and it
1251 1251
             is configured with a service account that can exec and get
1252 1252
             the logs of the pod.
@@ -1257,12 +1257,18 @@ Selecting the openshift driver adds the following options to the
1257 1257
          :value:`providers.[openshift].labels.type.pod` label type;
1258 1258
          specifies the image name used by the pod.
1259 1259
 
1260
+      .. attr:: image-pull
1261
+         :default: IfNotPresent
1262
+         :type: str
1263
+
1264
+         The ImagePullPolicy, can be IfNotPresent, Always or Never.
1265
+
1260 1266
       .. attr:: cpu
1261 1267
          :type: int
1262 1268
 
1263 1269
          Only used by the
1264 1270
          :value:`providers.[openshift].labels.type.pod` label type;
1265
-         specifies the amount of cpu to request for the pod.
1271
+         specifies the number of cpu to request for the pod.
1266 1272
 
1267 1273
       .. attr:: memory
1268 1274
          :type: int

+ 1
- 1
nodepool/driver/openshift/handler.py View File

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

Loading…
Cancel
Save