Merge remote-tracking branch 'origin/killkubernetesjob' into clean-co…

…ntainers-ui
Zooz · Dec 30, 2019 · 940b200 · 940b200
2 parents b653474 + 40eff6e
commit 940b200
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/jobs/models/kubernetes/jobConnector.js b/src/jobs/models/kubernetes/jobConnector.js
@@ -75,7 +75,7 @@ module.exports.deleteAllContainers = async (jobPlatformName) => {
         let pod = await getPodByName(allPredatorRunnersPods[i]);
 
         let containers = pod.status.containerStatuses;
-        containers = containers.find(o => o.name === jobPlatformName);
+        containers = containers.find(o => o.name === 'predator-runner');
         if (containers && containers.state.terminated && containers.state.terminated.finishedAt) {
             await deleteContainer(pod);
             deleted++;
@@ -115,7 +115,7 @@ async function getJobControllerUid(jobPlatformName, platformSpecificInternalRunI
 async function getLogsByPodsNames(podsNames, predatorRunnerPrefix) {
     let logs = [];
     podsNames.forEach((podName) => {
-        let url = util.format('%s/api/v1/namespaces/%s/pods/%s/log?container=%s', kubernetesUrl, kubernetesNamespace, podName, predatorRunnerPrefix);
+        let url = util.format('%s/api/v1/namespaces/%s/pods/%s/log?container=%s', kubernetesUrl, kubernetesNamespace, podName, 'predator-runner');
         let options = {
             url,
             method: 'GET',

diff --git a/tests/integration-tests/jobs/createJobKubernetes-test.js b/tests/integration-tests/jobs/createJobKubernetes-test.js
@@ -243,12 +243,12 @@ describe('Create job specific kubernetes tests', async function () {
                                 items: [{ metadata: { name: 'podA' } }, { metadata: { name: 'podB' } }]
                             });
 
-                        nock(kubernetesConfig.kubernetesUrl).get(`/api/v1/namespaces/${kubernetesConfig.kubernetesNamespace}/pods/podA/log?container=predator`)
+                        nock(kubernetesConfig.kubernetesUrl).get(`/api/v1/namespaces/${kubernetesConfig.kubernetesNamespace}/pods/podA/log?container=predator-runner`)
                             .reply(200, {
                                 items: [{ content: 'log' }]
                             });
 
-                        nock(kubernetesConfig.kubernetesUrl).get(`/api/v1/namespaces/${kubernetesConfig.kubernetesNamespace}/pods/podB/log?container=predator`)
+                        nock(kubernetesConfig.kubernetesUrl).get(`/api/v1/namespaces/${kubernetesConfig.kubernetesNamespace}/pods/podB/log?container=predator-runner`)
                             .reply(200, {
                                 items: [{ content: 'log' }]
                             });
@@ -391,7 +391,7 @@ describe('Create job specific kubernetes tests', async function () {
                         nock(kubernetesConfig.kubernetesUrl).get(`/api/v1/namespaces/${kubernetesConfig.kubernetesNamespace}/pods/podA`)
                             .reply(200, {
                                 metadata: { labels: { 'job-name': 'predator.job' } },
-                                status: { containerStatuses: [{ name: 'predator',
+                                status: { containerStatuses: [{ name: 'predator-runner',
                                     state: { terminated: { finishedAt: '2020' } } }, { name: 'podB',
                                     state: {} }] }