From 64ea5f7198b1b4c89f7c10b984e7c5cb4376e7d7 Mon Sep 17 00:00:00 2001 From: Michal Kovarik Date: Oct 24 2019 11:57:26 +0000 Subject: Cleanup all resources together Removing resources one by one takes lot of time since it's waiting for delete of the resource - eg. pod and meanwhile new pod is created by replication controller --- diff --git a/src/com/redhat/c3i/util/Deployer.groovy b/src/com/redhat/c3i/util/Deployer.groovy index 3560bb3..d563fbf 100644 --- a/src/com/redhat/c3i/util/Deployer.groovy +++ b/src/com/redhat/c3i/util/Deployer.groovy @@ -100,6 +100,7 @@ class Deployer implements Serializable { } def deleted = 0 def now = new Date() + def todelete = [] // Delete all objects that are older than 1 hour for (obj in oldobjs) { if (!obj.metadata.creationTimestamp) { @@ -107,11 +108,12 @@ class Deployer implements Serializable { } def creationTime = df.parse(obj.metadata.creationTimestamp) if (now.getTime() - creationTime.getTime() > (1000 * 60 * age)) { - script.echo "Deleting ${obj.kind} ${obj.metadata.name}..." - script.openshift.delete(obj.kind, obj.metadata.name, "--ignore-not-found=true") + todelete.add("${obj.kind}/${obj.metadata.name}") deleted += 1 } } + script.echo "Deleting:\n"+todelete.join("\n") + script.openshift.delete(todelete.join(' '), "--ignore-not-found=true") return deleted } }