From 596f3fb6489062df5ae65a8278f0c9660ffd55f6 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Mon, 5 Jun 2023 22:48:19 +0100 Subject: [PATCH] stream logs through standard input and new remote client cli command --- dist/index.js | Bin 19463053 -> 19463101 bytes dist/index.js.map | Bin 13762645 -> 13762693 bytes .../providers/k8s/kubernetes-task-runner.ts | 10 +++++----- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/index.js b/dist/index.js index 4cee274cde4570997832df86d9546c6dd874c7b6..a354e8c279fcae8eb3f95728fd1a5782d7404dc8 100644 GIT binary patch delta 1400 zcmY+^cU;VI7{Kw@U8$=pQl|*Ht916BaaQ)sEL%8ATv24tl9>^HWmB?uWF>o#?7jCc zqijCUA6~Eg@&5erd|%(^&u4aSl3h9`MypcQS@GJappZzvup!}t&5=rWipE9BOg31j zIWACFRQcw4GwV(I@Zg{bv)*7b>5cwoOaBndK%?HrC-1nkCDalYWii%K4u{9+(ku(r zIckTzTa?fQ^&!o_iISb}s#CJORGx}^w#r%Y575{seFCkt|NV)LOH{)O*2o7N*g^w4 z*h32kI3hm^zzGH63>WB72(EBLVHANoilP{b!viIthXJ1Of;URS2S$`aX_P@(ltXz` zKt)tSWmG{`R6}*tKuy#_ZTO-N>cWJ2sE-C{h(_>3V>CfiG(&T=KufejYqUXIw1Yp| zqXRmk6FQ>{0uYF<=!Wj-fu87v-spoM^hH1PhZzGf5Wxt+AcSHthQNX_gkva%Ap(&Y zjuD8$NQ}a0jKNrp!+1=?rvPT~|!;|$K?9M0ncE+P|`a2Z!{71wYbH*gcTa2t1U7x!=< z5AYC=@EA|<6wmM+FYpqt@EULM7Vq#LACQG?e8eYw#uwxu7hmxW-|+)K@e9B4XJ%ZY zY7Qi7iIv1!l22kIv6W~fb`pDuR^lLWl;oEbkT^*SN}MGw5}l-w#8u)ZDJ&@>ahDX8 h6q6K}ct}b}^b&)_Q{pA@mXwtENQ|ls&V=eu&|l*Zx0V0^ delta 1331 zcmXZcXH?Ar7{~E*|Ls(?cWzy}vXV`%y|;{Pl2pbOSN2v`a_uXdWY0ua3fX(_k-e2s zHs9wQFFxOMo^yV$pRA%(n`BH*P-Q6j3r)?Gbk8Me{^prZi(p^E z5r!zWPN!3A!{YV&SbelM)Kn0c=#pt%tQ0C%|CgruOO+h!|3{E1PooMk8B-LEDcmgG zenxJJ0yCJy0+z6XHEdvuVz7hk9Z(!4;0Px;!v(HzgF8In2`_lV2fpw_NvPqE0BBGO zr4a}%${+}3Q4Zx%0TmI9N(ez^R6$i#Lv_?ZP1HhdgrW{~sEc~2j|OOnMre#CXo_ZN zjuvQ%R%nejXp44ej}8b!M|47GbU`?}q8qxS2YR9xdZQ2eA_DyoiT;Sf07N4Ou^5O! z7>ps%V<_S<48vi-2*hI~MqxC@U@XRAJSJcwCSfwBU@E2|0g0H78JLM#n2jXNK{DpT zhnk=I^AXf diff --git a/dist/index.js.map b/dist/index.js.map index 40ce47322d06dd44bc4bbecbb1c3871bc4ad43df..4e5722014f5ce5f4065a573d302a2173dbf719a8 100644 GIT binary patch delta 949 zcmY++*;kAK9LDjJGFh@_h}p7heaVt-vJ8zHHSdfX#%{_lk$rt_k$oq` z*!N{DiHpwhhq!X#_`0i$&&~Hd=V=Z_3{@2oLr9{ejYLa~v=xKIN;_#U9i*egNhj$n zU8JjYlkO5PJ;W$IrI#c~Z|NhZ1|`=T7j$_7**>qo)E#i^nSV{ju*<4sMP;D&ua#)Npk_%gDAQd{b;j_oG$kdv^?$5QX^#2-tb2ba zn)LcwQ?j05S5jNAY)(^rwbQO35q;4QDw2?l{uqFPFvEfrq+$>T!-_Nv!B7l?4R#F2 z2#mxijK&y@#W4(_5J_i!H%(13?{gfJfC37+B^p5p~x;uT)w4c_7% d-s1y4;u9kHj4$|#Z)n7KG~q|sY5)1B@gMR3WLE$H delta 888 zcmXxb*;kAK9LDjJGASe(>%1}|m1fY`mx(FaMOl(PV^o$Aud#%h(QlL{lC>f@3)n&IkRMnqlQgTAH;=jSjn4*F_)nT++t;U3G zm(yA3%=iB>E4I+?t!7S9I(7e#nnw(Jt*zb=r=?qzr0!~qiq)6@dU z0TyBr7GnvPA`{E799hW53arE`tVRyjAQx+~4(qW28?gzSk%uj?V=ElkhI|yD5Zkc> zJFyE+>_!pxU@uhcgA4m{00(gh#W;*3IEoUK!VM3Op$q~qj-wnEIDty|P=%8?h0~}; z4bI>!&fz>RKtnAq;u0>S4)wT#t7t$YuAvFnaRWDT3%AjXJGhG$wBjD_qYV%65bfx| zBRqy5Pw*7a@EkAj60h(YZ}1lH@E#xV5uflG0erz%e8YDH@dH2c%kQ)N{uk^5K=X0d diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts b/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts index cdb77273..471e2f77 100644 --- a/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts +++ b/src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts @@ -111,14 +111,14 @@ class KubernetesTaskRunner { } static async watchUntilPodRunning(kubeClient: CoreV1Api, podName: string, namespace: string) { - let success: boolean = false; + let waitComplete: boolean = false; let message = ``; CloudRunnerLogger.log(`Watching ${podName} ${namespace}`); await waitUntil( async () => { const status = await kubeClient.readNamespacedPodStatus(podName, namespace); const phase = status?.body.status?.phase; - success = phase === 'Running'; + waitComplete = phase !== 'Pending' && phase !== 'Unknown'; message = `Phase:${status.body.status?.phase} \n Reason:${ status.body.status?.conditions?.[0].reason || '' } \n Message:${status.body.status?.conditions?.[0].message || ''}`; @@ -138,7 +138,7 @@ class KubernetesTaskRunner { // 4, // ), // ); - if (success || phase !== 'Pending') return true; + if (waitComplete || phase !== 'Pending') return true; return false; }, @@ -147,11 +147,11 @@ class KubernetesTaskRunner { intervalBetweenAttempts: 15000, }, ); - if (!success) { + if (!waitComplete) { CloudRunnerLogger.log(message); } - return success; + return waitComplete; } }