PR#37: force cleanup and controller.setVars - c3i-library

c3i-library

#37 force cleanup and controller.setVars

Merged 5 years ago by mikeb. Opened 5 years ago by mkovarik.

mkovarik/c3i-library set-vars into master

Add force cleanup

Michal Kovarik • 5 years ago

6b9e8e2

Add setVars to set more variables as a batch

Michal Kovarik • 5 years ago

36c2dbf

src/com/redhat/c3i/util/Deployer.groovy

file modified

+6 -2

		`@@ -89,7 +89,7 @@`
		`return dcs`
		`}`

		`- def Integer cleanup(Integer age=60, String... apps) {`
		`+ def Integer cleanup(Integer age=60, Boolean force=false, String... apps) {`
		`// age is specified in minutes`
		`def df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")`
		`df.setTimeZone(TimeZone.getTimeZone("UTC"))`
		`@@ -112,7 +112,11 @@`
		`}`
		`script.echo "Deleting:\n"+todelete.join("\n")`
		`if (todelete) {`
		`- script.openshift.delete(todelete.join(' '), "--ignore-not-found=true")`
		`+ def deleteParams = '--ignore-not-found=true'`
		`+ if (force) {`
		`+ deleteParams = deleteParams + " " + "--force=true --grace-period=0"`
		`+ }`
		`+ script.openshift.delete(todelete.join(' '), deleteParams)`
		`}`
		`return todelete.size()`
		`}`

vars/c3i.groovy

file modified

+1 -1

		`@@ -12,7 +12,7 @@`
		`*/`
		`def cleanup(Map args, String... apps) {`
		`def deployer = new com.redhat.c3i.util.Deployer(script: args.script)`
		`- return deployer.cleanup(args.age ?: 60, apps as String[])`
		`+ return deployer.cleanup(args.age ?: 60, args.force ?: false, apps as String[])`
		`}`

		`/**`

vars/controller.groovy

file modified

		`@@ -36,6 +36,10 @@`
		`return httpGet("/vars", true)`
		`}`

		`+ def setVars(Map vars) {`
		`+ return httpPost("/vars", new groovy.json.JsonBuilder(vars).toString())`
		`+ }`
		`+`
		`def getKrb5Vars(String principal) {`
		`vars = getVars()`
		`password = httpGet("/krb5/principal/${principal}")`

mkovarik commented 5 years ago

Add possibility to force cleanup of openshift resources (not be graceful).
Update controller with new method setVars to set more variables in one call.

mkovarik commented 5 years ago

@mikeb PTAL