Skip to content

Commit 18641e1

Browse files
authored
fix(backend): Replaced hardcoded ServiceAccount with default config (#11578)
Signed-off-by: Helber Belmiro <[email protected]>
1 parent d3a016d commit 18641e1

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

backend/src/apiserver/resource/resource_manager_test.go

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2347,6 +2347,40 @@ func TestCreateJob_ThroughWorkflowSpecV2(t *testing.T) {
23472347
assert.Equal(t, expectedJob.ToV1(), fetchedJob.ToV1(), "CreateJob stored invalid data in database")
23482348
}
23492349

2350+
func TestCreateJobDifferentDefaultServiceAccountName_ThroughWorkflowSpecV2(t *testing.T) {
2351+
originalDefaultServiceAccount := viper.Get(common.DefaultPipelineRunnerServiceAccountFlag)
2352+
2353+
viper.Set(common.DefaultPipelineRunnerServiceAccountFlag, "my-service-account")
2354+
defer viper.Set(common.DefaultPipelineRunnerServiceAccountFlag, originalDefaultServiceAccount)
2355+
2356+
store, manager, job := initWithJobV2(t)
2357+
defer store.Close()
2358+
expectedJob := &model.Job{
2359+
UUID: "123e4567-e89b-12d3-a456-426655440000",
2360+
DisplayName: "j1",
2361+
K8SName: "job-",
2362+
Namespace: "ns1",
2363+
ServiceAccount: "my-service-account",
2364+
Enabled: true,
2365+
ExperimentId: DefaultFakeUUID,
2366+
CreatedAtInSec: 2,
2367+
UpdatedAtInSec: 2,
2368+
Conditions: "STATUS_UNSPECIFIED",
2369+
PipelineSpec: model.PipelineSpec{
2370+
PipelineSpecManifest: v2SpecHelloWorld,
2371+
RuntimeConfig: model.RuntimeConfig{
2372+
Parameters: "{\"text\":\"world\"}",
2373+
PipelineRoot: "job-1-root",
2374+
},
2375+
},
2376+
}
2377+
expectedJob.PipelineSpec.PipelineName = job.PipelineSpec.PipelineName
2378+
require.Equal(t, expectedJob.ToV1(), job.ToV1())
2379+
fetchedJob, err := manager.GetJob(job.UUID)
2380+
require.Nil(t, err)
2381+
require.Equal(t, expectedJob.ToV1(), fetchedJob.ToV1(), "CreateJob stored invalid data in database")
2382+
}
2383+
23502384
func TestCreateJob_ThroughPipelineID(t *testing.T) {
23512385
store, manager, pipeline, _ := initWithPipeline(t)
23522386
defer store.Close()

backend/src/v2/compiler/argocompiler/argo.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"encoding/hex"
2020
"encoding/json"
2121
"fmt"
22+
"github.com/kubeflow/pipelines/backend/src/apiserver/common"
2223
"strings"
2324

2425
wfapi "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
@@ -115,7 +116,7 @@ func Compile(jobArg *pipelinespec.PipelineJob, kubernetesSpecArg *pipelinespec.S
115116
Arguments: wfapi.Arguments{
116117
Parameters: []wfapi.Parameter{},
117118
},
118-
ServiceAccountName: "pipeline-runner",
119+
ServiceAccountName: common.GetStringConfigWithDefault(common.DefaultPipelineRunnerServiceAccountFlag, common.DefaultPipelineRunnerServiceAccount),
119120
Entrypoint: tmplEntrypoint,
120121
},
121122
}

0 commit comments

Comments
 (0)