@firestartr/cli 1.53.0-snapshot-3 → 1.53.0-snapshot-4

package/build/index.js

@@ -374174,6 +374174,8 @@ async function startCRStates(meter, kindList, namespace) {
     }
 }
 
+// EXTERNAL MODULE: external "util"
+var external_util_ = __nccwpck_require__(73837);
 ;// CONCATENATED MODULE: ../operator/src/cmd/tf_planner.ts
 
 
@@ -374181,9 +374183,10 @@ async function startCRStates(meter, kindList, namespace) {
 
 
 
+
 const deploymentName = catalog_common.environment.getFromEnvironment(catalog_common.types.envVars.operatorDeploymentName) || 'firestartr-firestartr-controller';
 const DEFAULT_OPERATOR_DEPLOY = (/* unused pure expression or super */ null && (deploymentName));
-async function tfPlanner(claimFilePath, claim, namespace, debug, jobTtl = 300, cmd = 'plan') {
+async function tfPlanner(claimFilePath, claim, namespace, debug, jobTtl = 300, cmd = 'plan', callbackApi = function (ctl) { }) {
     const { kc } = await getConnection();
     const k8sApi = kc.makeApiClient(client.AppsV1Api);
     const batchV1Api = kc.makeApiClient(client.BatchV1Api);
@@ -374209,6 +374212,7 @@ async function tfPlanner(claimFilePath, claim, namespace, debug, jobTtl = 300, c
     // set activeDeadlineSeconds to force terminate jobs that exceed this time
     // see https://kubernetes.io/docs/concepts/workloads/controllers/job/#job-termination-and-cleanup
     job.spec.activeDeadlineSeconds = 3600;
+    job.spec.template.spec.containers[0].env = [{ name: 'CI', value: 'True' }];
     job.spec.template.spec.containers[0].command = [
         'sh',
         '-c',
@@ -374220,13 +374224,39 @@ async function tfPlanner(claimFilePath, claim, namespace, debug, jobTtl = 300, c
     }
     job.spec.template.spec.restartPolicy = 'Never';
     job.metadata = metadata;
+    // we limit the number of retries
+    // to 1
+    job.spec.backoffLimit = 1;
     // we exclude logs to be sent to datadog
     job.spec.template.metadata.annotations = {
         'ad.datadoghq.com/logs_exclude': 'true',
     };
+    callbackApi({
+        ctlCleanUp: () => cleanUp(namespace, metadata.name),
+    });
     await batchV1Api.createNamespacedJob(namespace, job);
     await copyClaimAndGetLogs(namespace, job.metadata.name, claimFilePath);
 }
+async function cleanUp(namespace, jobName) {
+    try {
+        console.log('Cleaning up the job');
+        const { kc } = await getConnection();
+        const batchV1Api = kc.makeApiClient(client.BatchV1Api);
+        console.log('Deleting job and its associated pods');
+        await batchV1Api.deleteNamespacedJob(jobName, namespace, undefined, // pretty output
+        undefined, // dryRun
+        1 * 60, // 60 segs of grace period
+        undefined, 'Foreground');
+    }
+    catch (err) {
+        const cleanError = util.inspect(err, {
+            showHidden: false,
+            depth: 1,
+            colors: false,
+        });
+        console.error(cleanError);
+    }
+}
 async function copyClaimAndGetLogs(namespace, jobName, sourcePath) {
     const { kc } = await getConnection();
     const k8sApi = kc.makeApiClient(client.CoreV1Api);
@@ -374275,11 +374305,12 @@ async function copyClaimAndGetLogs(namespace, jobName, sourcePath) {
             timestamps: false,
         });
         let podFinished = false;
-        setInterval(async () => {
+        const interval = setInterval(async () => {
             await awaitPodStatus((phase) => {
                 if (phase !== 'Running') {
                     podFinished = true;
                     req.abort();
+                    clearInterval(interval);
                     return true;
                 }
                 else {
@@ -374293,7 +374324,12 @@ async function copyClaimAndGetLogs(namespace, jobName, sourcePath) {
         }
     }
     catch (err) {
-        console.error(err);
+        const cleanError = util.inspect(err, {
+            showHidden: false,
+            depth: 1,
+            colors: false,
+        });
+        console.error(cleanError);
         return;
     }
 }

package/build/packages/operator/src/cmd/tf_planner.d.ts

@@ -1,2 +1,2 @@
-export declare function tfPlanner(claimFilePath: string, claim: any, namespace: string, debug: boolean, jobTtl?: number, cmd?: string): Promise<void>;
+export declare function tfPlanner(claimFilePath: string, claim: any, namespace: string, debug: boolean, jobTtl?: number, cmd?: string, callbackApi?: (ctl: any) => void): Promise<void>;
 export declare function kubectlCp(sourcePath: string, namespace: string, podName: string, podFilePath?: string): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.53.0-snapshot-3",
+  "version": "1.53.0-snapshot-4",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",