From 7d2704c3e458eef6a1d4888745d2f87ef0799306 Mon Sep 17 00:00:00 2001
From: Frostebite <jas.f.ukcmti@gmail.com>
Date: Wed, 2 Aug 2023 00:28:14 +0100
Subject: [PATCH] podname logs for log service

---
 dist/index.js                                 | Bin 19473117 -> 19473512 bytes
 dist/index.js.map                             | Bin 13774555 -> 13774998 bytes
 .../providers/k8s/kubernetes-log-service.ts   |  11 +++++++++++
 .../tests/cloud-runner-kubernetes.test.ts     |   3 ++-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dist/index.js b/dist/index.js
index 188c2299e5f5d6e48f3f6a4ef0af721e692dd35f..7ca0151cfb3f3b9c1d1a80384dc6acdf8a3cd3e9 100644
GIT binary patch
delta 1429
zcmXBURa8__6oBD1!+?x|2#R2Fkr)-k#K!Kx!0u5;!MHOzgM}z6ij9hL?Zi$HySux)
zySwAx^6>o+XRUqqc{;Zbry8FfOEtzP=rZ(cR4pRO?h<Twm>n^8#oAM`S$inac15*1
zlmRiS8m;yUQ5;bgRq1Y39norxCD||DQ~MpJ_t0F^^kG^VRqs<IAeJ%J+|LrH6t^n9
z?N-%hc0`4nVnZ`84z)#@?Up!`HgbxSkERTnZ%E#lV(?@rGIOzCc(`I}!9H!@OQW}D
zyQ=f|XvRx2$15rS7es2qC%buR=MGJC)_eyV{54+}W0u5pRSzc^;0zbYxhsswifqV^
z9B@NUxFZ)l;ECMG125!-H++x}`B4A`Q3$?J;D^HSM*sp51QUv&D2gE%At;Velt4+8
zLTQviS%je+%A*1*q7o{j3c^tp)leNZP!qLK8+A|@^-v!T&=8H#7)=m?rf7!dXn{zy
zL@TsL8?;3`v_}VYL??7c7j%Ug-OwF9U_npxLKLFW8-36h{h-1M8~S4a>~J6k12G7L
zF$6;qi(!bvaEw4aMq(63BLQPD7Ks>#@tA;#n1sogf+S4EG)zY_W?&{#pkWqfV-DtG
z9_C{K7Ge<=V+ocb70a+3E3gu)uo`Qy7VEGc8?X^+NXI5*U^BL0E4E=fc3>xVVK??*
zFZN+S4&WdT;V_QiD30McPT(X?;WW<REY9IPF5n_A;WDn^Dz4!=Zr~<v;WqBzF7Dwz
z9^fG!;W3`zDW2guUf?BO;WggiE#BchKHwuh;WNJAE56}7e&8p5;Wz%^@5FRfmjsDk
z;v_LhoFy)jED~3VQIb`XO_E)bL*gdMDRGzNl6XiwCAlSeBwmud5^sr*B%dU|q=2NL
eq>#i{qDcHCg(d!y07;-ENMh3M<(tq2XZ!<gEV$qR

delta 1242
zcmWmE_n!y^9LDk2oq6`&dka|=>KbN9WfLhom2^hCB%3R;GNQrRnVpr&-Xn@iA!XB~
zUCR6W!~65Y^9MW^cBdts*pZerY-B=u;?e=rQ&JN%k4a8RBm)`AL~L2eN)p+~P7ZRC
zi`?WPFZsw%0SZ!x!W5w>#VAe*N>Yl_l%Xu;C{G0{Qi;k`p(-~}jq23kMru-v+SH*g
zH*qt!P>=dF;8t!UncKO8JGqO7G@>z0Xi78gra3KW$vw2<Uhd<5TGNKMw4*&8=tw6z
z^8j7w%7b*{As(hXJ?Kd<deeu#JVHMn<uM+oKTj}#CrM!-gBZ*Zp5keq;aQ&Jd0yZ}
zUScROGmKXl&Im>_iqVW=EaMnYDzEYy6PU>BOky%qn94NXU^+9H$t>PvHgkB3w|R$m
znae!Vn9l+hvWUejVJYvijODCgC97D?`=qmmwX9=38~A{Ye8@+9%qBLog{^F3J3H9P
zE_Snrz3gK@2RO(l9O5va@)<`s%IAE+mmK3OzUDY5ILSAh;#<DsG-o)=InHx|i(KL|
z-}3`M@)JMv3s<<xul&aE{K236#ozqHzg*)#{!dL#Ntj3^F_IyYF_I~gIg%xkHIfv`
z7ResT5y=_J70DgR6UiIN7s($f5Gfcb6e%1j5-A!f7AYPn5h)od6)7Dl6Db=h7bzd9
S5UCic6serB$xS3wPrnY7*6<$y

diff --git a/dist/index.js.map b/dist/index.js.map
index 4d513f7a5ba87da483c67e950586606a7638fd49..87adb3a2088e6ddd7d30ad051c9e64e8f748a937 100644
GIT binary patch
delta 1090
zcmXBOM^{r}6ouiXL?lKr0R=)5yc7*6MN}+c6dT5lV6Q|7Bp^3el3+n>sMrA!KD)s#
zSipw8VZjPIWjXL4IB@7v-(?2R?CiZy&-c#2#vh%5t=_D<>?omCv>KuNt17RTA~fPp
zgSMuzC)g|Ueg~+k)YfXXwHJCL04nrBAo?N*YV?B!{V@Q+7zizN2tg<YVKBlFjtJ-x
z*{-%4YC2L=QY2@g<o4J+Ubo~bloVHi<aA52%OjO}W!WhgB}yKLU6%4)vd1ZV?V>5n
z6edKMAw;xjjA_E8G3pcID#*#UQhTM8<dTZrE?Kd892Rp$vcEZ5aoF7UN^_oQ`)M=?
zCElnKwT4JlD6w4scC^JJnRA#F%C9J+P)ZCj;n_UnFG!dEPxx;|oh~v$WagXnqPAJD
z6Wv-<P_<8Egb7g?0twNGK`i1h6vJRfJQ6S*BanzBBqIeQk&00mjWI~WSd7DXOh7s^
zFcB6^!enG(3Z`Njreg-OFcVhH!fedJT+G9KEI>9EA_uuxgvD5brC5gLSb>#Th1FPt
zwa9}F>yVEE*incgIN(GvO0XWKkl})Y4Jd;f9(YlXjo5_E*n$ddMJ2XjJ9c0vcA*Np
zu?KrmjeXdU12~97IE*8xK`rWV6!kcU1~fw8I8NXsPT@4p;4IF;hbElI1zf}>T*eh#
z#Wgge1=n!{H*pKCXv1yX!Cl<LeYE2N9^w%m;|ZSP8J^<>Ug8xx@EULM7VprB_xOO1
T_=L~+f-ZF9Yr9YLEhF|HPgkQ5

delta 876
zcmWm0Wp@n#007XVo|vb{OuR8|y3Lr{(_K$@H=E93y2hUF&P`1lhUxg~_~4(oKHPI|
z&flWI?>|L>-1M~Ugt(Y!a#C!@|73>3S)p(-ic^A;lp;WB%21Ya#893f6{tuhDpQ53
zR3nz^)F6(U#OH^?wW5X5g1q=ZRwP)PI@BdZ0`;g*A`NIrBO23$rZl5DNwlCPt!Paf
z+R~2pbf6=h=u8*7l1w*J=uQt(=}9ko(}%vK5vCvg8NfgWF_<9?Wf;R5!AM3inlX%J
z91+Gdfr(6FGE<n!G^R6ynapA~bC}CK=Cgo>EMhTBSjsY%vx1eRlff!hvxc>-V?7(#
z$R;+kg{@?=jqU6pi=FIZH+$I2KK65fgB;>8*&N|0IYc?eaZYfOQ=H}uXF11tE^v`c
zT;>W_xyE&FaFbiy<_>qsC69aD=K&9SL_Uvs!c(5{oEN<06$QNJ4R0yr9q;)-5g+-)
UXTI>2Z+zzmKl3BOUnz<I08BV1oB#j-

diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-log-service.ts b/src/model/cloud-runner/providers/k8s/kubernetes-log-service.ts
index f7cd436a..871ae1bc 100644
--- a/src/model/cloud-runner/providers/k8s/kubernetes-log-service.ts
+++ b/src/model/cloud-runner/providers/k8s/kubernetes-log-service.ts
@@ -113,6 +113,17 @@ status: {}
         true,
       );
 
+      // if status of pod is not running, then continue
+      const podStatus = await CloudRunnerSystem.Run(
+        `kubectl get pods -n ${namespace} ${podname} -o jsonpath='{.status.phase}'`,
+        false,
+        true,
+      );
+      if (podStatus !== 'Running') {
+        CloudRunnerLogger.log(`Pod status: ${podStatus}`);
+        continue;
+      }
+
       const logs = await CloudRunnerSystem.Run(`kubectl logs ${podname} -f --timestamps`, false, true);
       CloudRunnerLogger.log(`Logs: ${logs}`);
 
diff --git a/src/model/cloud-runner/tests/cloud-runner-kubernetes.test.ts b/src/model/cloud-runner/tests/cloud-runner-kubernetes.test.ts
index 37f72b3e..d51c26ce 100644
--- a/src/model/cloud-runner/tests/cloud-runner-kubernetes.test.ts
+++ b/src/model/cloud-runner/tests/cloud-runner-kubernetes.test.ts
@@ -44,8 +44,9 @@ describe('Cloud Runner Kubernetes', () => {
       const kubeConfig = new k8s.KubeConfig();
       kubeConfig.loadFromDefault();
       const kubeClient = kubeConfig.makeApiClient(k8s.CoreV1Api);
+      const kubeClientApps = kubeConfig.makeApiClient(k8s.AppsV1Api);
 
-      await KubernetesLogService.createLogService('test', 'default', kubeClient);
+      await KubernetesLogService.createLogDeployment('test', kubeClientApps, kubeClient);
 
       CloudRunnerLogger.log(`run 1 succeeded`);
     }, 1_000_000_000);