Commitb65625d

committed

support --name create option

1 parent120636d commitb65625dCopy full SHA for b65625d

File tree

+19

-5

lines changed

+19

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export async function prepareJob(`
`58`	`58`	core.debug(`Adding service '${service.image}' to pod definition`)
`59`	`59`	`returncreateContainerSpec(`
`60`	`60`	`service,`
`61`		`-generateContainerName(service.image),`
	`61`	`+generateContainerName(service),`
`62`	`62`	`false,`
`63`	`63`	`extension`
`64`	`64`	`)`
`@@ -159,7 +159,7 @@ function generateResponseFile(`
`159`	`159`
`160`	`160`	`if(args.services?.length){`
`161`	`161`	`constserviceContainerNames=`
`162`		`-args.services?.map(s=>generateContainerName(s.image))\|\|[]`
	`162`	`+args.services?.map(s=>generateContainerName(s))\|\|[]`
`163`	`163`
`164`	`164`	`response.context['services']=appPod?.spec?.containers`
`165`	`165`	`?.filter(c=>serviceContainerNames.includes(c.name))`

Lines changed: 17 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import * as k8s from '@kubernetes/client-node'`
`2`	`2`	`import*asfsfrom'fs'`
`3`	`3`	`import*asyamlfrom'js-yaml'`
`4`	`4`	`import*ascorefrom'@actions/core'`
`5`		`-import{Mount}from'hooklib'`
	`5`	`+import{ServiceContainerInfo,Mount}from'hooklib'`
`6`	`6`	`import*aspathfrom'path'`
`7`	`7`	`import{v1asuuidv4}from'uuid'`
`8`	`8`	`import{POD_VOLUME_NAME}from'./index'`
`@@ -160,14 +160,28 @@ exec ${environmentPrefix} ${entryPoint} ${`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
`163`		`-exportfunctiongenerateContainerName(image:string):string{`
	`163`	`+exportfunctiongenerateContainerName(service:ServiceContainerInfo):string{`
	`164`	`+constimage=service.image`
`164`	`165`	`constnameWithTag=image.split('/').pop()`
`165`		`-constname=nameWithTag?.split(':').at(0)`
	`166`	`+letname=nameWithTag?.split(':').at(0)`
`166`	`167`
`167`	`168`	`if(!name){`
`168`	`169`	thrownewError(`Image definition '${image}' is invalid`)
`169`	`170`	`}`
`170`	`171`
	`172`	`+if(service.createOptions){`
	`173`	`+constoptionsArr=service.createOptions.split(/[]+/)`
	`174`	`+for(leti=0;i<optionsArr.length;i++){`
	`175`	`+if(optionsArr[i]==='--name'){`
	`176`	`+if(i+1>=optionsArr.length){`
	`177`	+thrownewError(`Invalid create options:${service.createOptions} (missing a value after --name)`)
	`178`	`+}`
	`179`	`+name=optionsArr[++i]`
	`180`	+core.debug(`Overriding service container name with:${name}`)
	`181`	`+}`
	`182`	`+}`
	`183`	`+}`
	`184`	`+`
`171`	`185`	`returnname`
`172`	`186`	`}`
`173`	`187`

Comments

(0)