@@ -2330,51 +2330,38 @@ def test_should_add_component_specific_labels(self):
23302330class TestWorkerServiceAccount :
23312331 """Tests worker service account."""
23322332
2333- def test_should_add_component_specific_labels (self ):
2333+ def test_should_not_create_worker_service_account_for_local_executor (self ):
23342334 docs = render_chart (
23352335 values = {
2336- "executor" : "CeleryExecutor" ,
2337- "workers" : {
2338- "serviceAccount" : {"create" : True },
2339- "labels" : {"test_label" : "test_label_value" },
2340- },
2336+ "executor" : "LocalExecutor" ,
2337+ "workers" : {"serviceAccount" : {"create" : True }},
23412338 },
23422339 show_only = ["templates/workers/worker-serviceaccount.yaml" ],
23432340 )
23442341
2345- assert "test_label" in jmespath .search ("metadata.labels" , docs [0 ])
2346- assert jmespath .search ("metadata.labels" , docs [0 ])["test_label" ] == "test_label_value"
2342+ assert len (docs ) == 0
23472343
23482344 @pytest .mark .parametrize (
2349- ( "executor" , "creates_service_account" ) ,
2345+ "executor" ,
23502346 [
2351- ("LocalExecutor" , False ),
2352- ("CeleryExecutor" , True ),
2353- ("CeleryKubernetesExecutor" , True ),
2354- ("CeleryExecutor,KubernetesExecutor" , True ),
2355- ("KubernetesExecutor" , True ),
2356- ("LocalKubernetesExecutor" , True ),
2347+ "CeleryExecutor" ,
2348+ "CeleryKubernetesExecutor" ,
2349+ "CeleryExecutor,KubernetesExecutor" ,
2350+ "KubernetesExecutor" ,
2351+ "LocalKubernetesExecutor" ,
23572352 ],
23582353 )
2359- def test_should_create_worker_service_account_for_specific_executors (
2360- self , executor , creates_service_account
2361- ):
2354+ def test_should_create_worker_service_account_for_specific_executors (self , executor ):
23622355 docs = render_chart (
23632356 values = {
23642357 "executor" : executor ,
2365- "workers" : {
2366- "serviceAccount" : {"create" : True },
2367- "labels" : {"test_label" : "test_label_value" },
2368- },
2358+ "workers" : {"serviceAccount" : {"create" : True }},
23692359 },
23702360 show_only = ["templates/workers/worker-serviceaccount.yaml" ],
23712361 )
2372- if creates_service_account :
2373- assert jmespath .search ("kind" , docs [0 ]) == "ServiceAccount"
2374- assert "test_label" in jmespath .search ("metadata.labels" , docs [0 ])
2375- assert jmespath .search ("metadata.labels" , docs [0 ])["test_label" ] == "test_label_value"
2376- else :
2377- assert docs == []
2362+
2363+ assert len (docs ) == 1
2364+ assert jmespath .search ("kind" , docs [0 ]) == "ServiceAccount"
23782365
23792366 def test_default_automount_service_account_token (self ):
23802367 docs = render_chart (
@@ -2387,7 +2374,7 @@ def test_default_automount_service_account_token(self):
23872374 )
23882375 assert jmespath .search ("automountServiceAccountToken" , docs [0 ]) is True
23892376
2390- def test_overridden_automount_service_account_token (self ):
2377+ def test_override_automount_service_account_token (self ):
23912378 docs = render_chart (
23922379 values = {
23932380 "workers" : {
@@ -2396,4 +2383,32 @@ def test_overridden_automount_service_account_token(self):
23962383 },
23972384 show_only = ["templates/workers/worker-serviceaccount.yaml" ],
23982385 )
2386+
23992387 assert jmespath .search ("automountServiceAccountToken" , docs [0 ]) is False
2388+
2389+ def test_override_name (self ):
2390+ docs = render_chart (
2391+ values = {
2392+ "workers" : {
2393+ "serviceAccount" : {"create" : True , "name" : "test" },
2394+ },
2395+ },
2396+ show_only = ["templates/workers/worker-serviceaccount.yaml" ],
2397+ )
2398+
2399+ assert jmespath .search ("metadata.name" , docs [0 ]) == "test"
2400+
2401+ def test_should_add_component_specific_labels (self ):
2402+ docs = render_chart (
2403+ values = {
2404+ "executor" : "CeleryExecutor" ,
2405+ "workers" : {
2406+ "serviceAccount" : {"create" : True },
2407+ "labels" : {"test_label" : "test_label_value" },
2408+ },
2409+ },
2410+ show_only = ["templates/workers/worker-serviceaccount.yaml" ],
2411+ )
2412+
2413+ assert "test_label" in jmespath .search ("metadata.labels" , docs [0 ])
2414+ assert jmespath .search ("metadata.labels" , docs [0 ])["test_label" ] == "test_label_value"
0 commit comments