@@ -121,6 +121,7 @@ function newParam(params: Param[]): void {
121
121
params . map ( val => {
122
122
val . value = val . default
123
123
delete val . default
124
+ delete val ?. type
124
125
} )
125
126
}
126
127
@@ -145,41 +146,45 @@ export async function getPipelineRunFrom(inputAddTrigger: AddTriggerFormValues,
145
146
params : inputAddTrigger . params ,
146
147
resources : inputAddTrigger . resources ,
147
148
workspaces : getPipelineRunWorkspaces ( inputAddTrigger . workspaces , inputAddTrigger . volumeClaimTemplate ) ,
148
- serviceAccountName : inputAddTrigger . serviceAccount ,
149
149
} ,
150
150
} ;
151
+ if ( inputAddTrigger ?. serviceAccount ?. trim ( ) ) {
152
+ pipelineRunData . spec . serviceAccountName = inputAddTrigger . serviceAccount ;
153
+ }
151
154
return await getPipelineRunData ( pipelineRunData , options ) ;
152
155
}
153
156
154
157
export function getPipelineRunWorkspaces ( workspaces : Workspaces [ ] , volumeClaimTemplate ?: VCT [ ] ) : Workspace [ ] {
155
158
const newWorkspace = [ ] ;
156
- if ( workspaces && workspaces . length === 0 ) return newWorkspace ;
157
- workspaces . map ( ( workspaceData : Workspaces ) => {
158
- const newWorkspaceObject = { } ;
159
- const workspaceResourceObject = { } ;
160
- newWorkspaceObject [ 'name' ] = workspaceData . name ;
161
- if ( WorkspaceResource [ workspaceData . workspaceType ] === WorkspaceResource . Secret ) {
162
- workspaceResourceObject [ 'secretName' ] = workspaceData . workspaceName ;
163
- } else if ( WorkspaceResource [ workspaceData . workspaceType ] === WorkspaceResource . ConfigMap ) {
164
- workspaceResourceObject [ 'name' ] = workspaceData . workspaceName ;
165
- } else if ( WorkspaceResource [ workspaceData . workspaceType ] === WorkspaceResource . PersistentVolumeClaim ) {
166
- workspaceResourceObject [ 'claimName' ] = workspaceData . workspaceName ;
167
- } else if ( WorkspaceResource [ workspaceData . workspaceType ] === WorkspaceResource . EmptyDirectory ) {
168
- workspaceResourceObject [ 'emptyDir' ]
169
- }
170
- if ( workspaceData . item && workspaceData . item . length !== 0 ) {
171
- workspaceResourceObject [ 'items' ] = workspaceData . item ;
172
- }
173
- newWorkspaceObject [ WorkspaceResource [ workspaceData . workspaceType ] ] = workspaceResourceObject ;
174
- newWorkspace . push ( newWorkspaceObject ) ;
175
- } ) ;
159
+ if ( workspaces && workspaces . length !== 0 ) {
160
+ workspaces . map ( ( workspaceData : Workspaces ) => {
161
+ const newWorkspaceObject = { } ;
162
+ const workspaceResourceObject = { } ;
163
+ newWorkspaceObject [ 'name' ] = workspaceData . name ;
164
+ if ( WorkspaceResource [ workspaceData . workspaceType ] === WorkspaceResource . Secret ) {
165
+ workspaceResourceObject [ 'secretName' ] = workspaceData . workspaceName ;
166
+ } else if ( WorkspaceResource [ workspaceData . workspaceType ] === WorkspaceResource . ConfigMap ) {
167
+ workspaceResourceObject [ 'name' ] = workspaceData . workspaceName ;
168
+ } else if ( WorkspaceResource [ workspaceData . workspaceType ] === WorkspaceResource . PersistentVolumeClaim ) {
169
+ workspaceResourceObject [ 'claimName' ] = workspaceData . workspaceName ;
170
+ } else if ( WorkspaceResource [ workspaceData . workspaceType ] === WorkspaceResource . EmptyDirectory ) {
171
+ workspaceResourceObject [ 'emptyDir' ]
172
+ }
173
+ if ( workspaceData . item && workspaceData . item . length !== 0 ) {
174
+ workspaceResourceObject [ 'items' ] = workspaceData . item ;
175
+ }
176
+ newWorkspaceObject [ WorkspaceResource [ workspaceData . workspaceType ] ] = workspaceResourceObject ;
177
+ newWorkspace . push ( newWorkspaceObject ) ;
178
+ } ) ;
179
+ }
176
180
if ( volumeClaimTemplate && volumeClaimTemplate . length !== 0 ) {
177
181
volumeClaimTemplate . map ( value => {
178
182
const workspaceObject = { } ;
179
183
workspaceObject [ 'name' ] = value . metadata . name ,
180
184
workspaceObject [ value . kind ] = {
181
185
spec : value . spec
182
186
}
187
+ workspaceObject [ value . kind ] . spec . volumeMode = 'Filesystem' ;
183
188
newWorkspace . push ( workspaceObject ) ;
184
189
} )
185
190
}
0 commit comments