Merge pull request #112 from keithcallenberg/patch-1

fix service account setting
jupyterhub · Dec 9, 2017 · aa03c5c · aa03c5c
2 parents db33084 + cb20653
commit aa03c5c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/kubespawner/objects.py b/kubespawner/objects.py
@@ -191,7 +191,7 @@ def make_pod(
         hack_volumes = []
         hack_volume_mounts = []
 
-        pod.service_account_name = service_account
+        pod.spec.service_account_name = service_account
 
     if run_privileged:
         container_security_context = V1SecurityContext()

diff --git a/tests/test_objects.py b/tests/test_objects.py
@@ -795,3 +795,47 @@ def test_make_resources_all():
             }
         }
     }
+
+
+def test_make_pod_with_service_account():
+    """
+    Test specification of the simplest possible pod specification with non-default service account
+    """
+    assert api_client.sanitize_for_serialization(make_pod(
+        name='test',
+        image_spec='jupyter/singleuser:latest',
+        cmd=['jupyterhub-singleuser'],
+        port=8888,
+        image_pull_policy='IfNotPresent',
+        service_account='test'
+    )) == {
+        "metadata": {
+            "name": "test",
+            "labels": {},
+        },
+        "spec": {
+            "securityContext": {},
+            "containers": [
+                {
+                    "env": [],
+                    "name": "notebook",
+                    "image": "jupyter/singleuser:latest",
+                    "imagePullPolicy": "IfNotPresent",
+                    "args": ["jupyterhub-singleuser"],
+                    "ports": [{
+                        "name": "notebook-port",
+                        "containerPort": 8888
+                    }],
+                    'volumeMounts': [],
+                    "resources": {
+                        "limits": {},
+                        "requests": {}
+                    }
+                }
+            ],
+            'volumes': [],
+            'serviceAccountName': 'test'
+        },
+        "kind": "Pod",
+        "apiVersion": "v1"
+    }