From a45c0278e668fa2f9d72b04fb58f5a4b204924bd Mon Sep 17 00:00:00 2001 From: TingluoHuang Date: Thu, 28 Oct 2021 19:18:21 -0400 Subject: [PATCH] . --- .../kubectlHandler/src/kubectlHandler.ts | 4 ++-- src/Misc/layoutbin/kubectlHandler/index.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts b/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts index 0b73faefe..aa0c61d13 100644 --- a/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts +++ b/src/Misc/containerEngineHandlers/kubectlHandler/src/kubectlHandler.ts @@ -76,7 +76,7 @@ async function run(): Promise { // copy over node.js const cpNodeArgs = [ 'cp', - '/actions-runner/externals/node16/bin', + '/actions-runner/externals/node12/bin', 'job-container:/__runner_util/' ] await exec.exec('kubectl', cpNodeArgs) @@ -105,7 +105,7 @@ async function run(): Promise { core.debug(JSON.stringify(removeInput)) const jobContainerId = removeInput.jobContainerId - await exec.exec('kubectl', ['delete', 'pod', jobContainerId]) + await exec.exec('kubectl', ['delete', 'pod', jobContainerId, '--force']) // await exec.exec('podman', ['network', 'rm', '-f', network]) } else if (command === 'Exec') { const execInput = inputJson.execInput diff --git a/src/Misc/layoutbin/kubectlHandler/index.js b/src/Misc/layoutbin/kubectlHandler/index.js index eea8c5e6b..a6a409660 100644 --- a/src/Misc/layoutbin/kubectlHandler/index.js +++ b/src/Misc/layoutbin/kubectlHandler/index.js @@ -3046,7 +3046,7 @@ function run() { // copy over node.js const cpNodeArgs = [ 'cp', - '/actions-runner/externals/node16/bin', + '/actions-runner/externals/node12/bin', 'job-container:/__runner_util/' ]; yield exec.exec('kubectl', cpNodeArgs); @@ -3059,7 +3059,7 @@ function run() { yield exec.exec('kubectl', cpKubeInnerArgs); const creationOutput = { JobContainerId: 'job-container', - Network: "job-container" + Network: 'job-container' }; const output = JSON.stringify({ CreationOutput: creationOutput }); core.debug(output); @@ -3069,7 +3069,7 @@ function run() { const removeInput = inputJson.removeInput; core.debug(JSON.stringify(removeInput)); const jobContainerId = removeInput.jobContainerId; - yield exec.exec('kubectl', ['delete', 'pod', jobContainerId]); + yield exec.exec('kubectl', ['delete', 'pod', jobContainerId, '--force']); // await exec.exec('podman', ['network', 'rm', '-f', network]) } else if (command === 'Exec') {