Skip to content

Commit b8d339a

Browse files
hbelmiromprahl
authored andcommitted
UPSTREAM: 11578: fix(backend): Replaced hardcoded ServiceAccount with default config
Signed-off-by: Helber Belmiro <[email protected]>
1 parent 5d90e7b commit b8d339a

File tree

2 files changed

+37
-2
lines changed

2 files changed

+37
-2
lines changed

backend/src/apiserver/resource/resource_manager_test.go

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

2404+
func TestCreateJobDifferentDefaultServiceAccountName_ThroughWorkflowSpecV2(t *testing.T) {
2405+
originalDefaultServiceAccount := viper.Get(common.DefaultPipelineRunnerServiceAccountFlag)
2406+
2407+
viper.Set(common.DefaultPipelineRunnerServiceAccountFlag, "my-service-account")
2408+
defer viper.Set(common.DefaultPipelineRunnerServiceAccountFlag, originalDefaultServiceAccount)
2409+
2410+
store, manager, job := initWithJobV2(t)
2411+
defer store.Close()
2412+
expectedJob := &model.Job{
2413+
UUID: "123e4567-e89b-12d3-a456-426655440000",
2414+
DisplayName: "j1",
2415+
K8SName: "job-",
2416+
Namespace: "ns1",
2417+
ServiceAccount: "my-service-account",
2418+
Enabled: true,
2419+
ExperimentId: DefaultFakeUUID,
2420+
CreatedAtInSec: 2,
2421+
UpdatedAtInSec: 2,
2422+
Conditions: "STATUS_UNSPECIFIED",
2423+
PipelineSpec: model.PipelineSpec{
2424+
PipelineSpecManifest: v2SpecHelloWorld,
2425+
RuntimeConfig: model.RuntimeConfig{
2426+
Parameters: "{\"text\":\"world\"}",
2427+
PipelineRoot: "job-1-root",
2428+
},
2429+
},
2430+
}
2431+
expectedJob.PipelineSpec.PipelineName = job.PipelineSpec.PipelineName
2432+
require.Equal(t, expectedJob.ToV1(), job.ToV1())
2433+
fetchedJob, err := manager.GetJob(job.UUID)
2434+
require.Nil(t, err)
2435+
require.Equal(t, expectedJob.ToV1(), fetchedJob.ToV1(), "CreateJob stored invalid data in database")
2436+
}
2437+
24042438
func TestCreateJob_ThroughPipelineID(t *testing.T) {
24052439
store, manager, pipeline, _ := initWithPipeline(t)
24062440
defer store.Close()

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package argocompiler
1616

1717
import (
1818
"fmt"
19+
"github.com/kubeflow/pipelines/backend/src/apiserver/common"
1920
"strings"
2021

2122
wfapi "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
@@ -63,7 +64,7 @@ func Compile(jobArg *pipelinespec.PipelineJob, kubernetesSpecArg *pipelinespec.S
6364
if err != nil {
6465
return nil, err
6566
}
66-
// fill root component default paramters to PipelineJob
67+
// fill root component default parameters to PipelineJob
6768
specParams := spec.GetRoot().GetInputDefinitions().GetParameters()
6869
for name, param := range specParams {
6970
_, ok := job.RuntimeConfig.ParameterValues[name]
@@ -108,7 +109,7 @@ func Compile(jobArg *pipelinespec.PipelineJob, kubernetesSpecArg *pipelinespec.S
108109
"pipelines.kubeflow.org/v2_component": "true",
109110
},
110111
},
111-
ServiceAccountName: "pipeline-runner",
112+
ServiceAccountName: common.GetStringConfigWithDefault(common.DefaultPipelineRunnerServiceAccountFlag, common.DefaultPipelineRunnerServiceAccount),
112113
Entrypoint: tmplEntrypoint,
113114
},
114115
}

0 commit comments

Comments
 (0)