From 8a3a36618625b8418d07395d9f88944d34a1b0e6 Mon Sep 17 00:00:00 2001
From: Frostebite <jas.f.ukcmti@gmail.com>
Date: Tue, 6 Jun 2023 00:03:06 +0100
Subject: [PATCH] stream logs through standard input and new remote client cli
 command

---
 dist/index.js                                 | Bin 19463077 -> 19462702 bytes
 dist/index.js.map                             | Bin 13762669 -> 13762222 bytes
 src/model/cloud-runner/providers/k8s/index.ts |  14 ++++++------
 .../k8s/kubernetes-job-spec-factory.ts        |  10 +++++++++
 .../providers/k8s/kubernetes-storage.ts       |  20 ------------------
 5 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 91258ba56cd083b95ebbd6254af771492975d39c..f3435294d9eac3508606888107e82a57d742e182 100644
GIT binary patch
delta 1457
zcmWmEX;jo@6oBzFe`XkFfnjk(6k${bP*6uJC^6H*B}>gU6_+6-cQL?~264q54dks1
zE5TinRKy)z5-oEpmt4^{TU1cgc75)L-*et`&pqdUd)GZFHkH;Fn{wvqc4-MtRk=FE
zplZkKjmngz#VVJ}VNg}oI)mCAsaaJor#4Huip_qi?5V|2an7kdj!|V>7wA=NiQcMw
zv$SYc-B$}XPfeRJWnyYZl54o?az|%ZwGYCL>T;qMrmFnI^s30C8C5}w&92;wEP9^~
z4tLv8$(hNj?uJ*es!6kXo85_H(^FG2)6!?iFsQJPW>YmD&7#hhhng$65!W*R%tP<O
z4CaqKT7b$KqnVZCe7s%dP3CnVOY>L5;`F}Co$F&&o$l&<bKTh*yr72x-Y~)kCYWJ?
z6|(OK8~hP~Km?%y>}ZH!G(rd(qX|OM6k!O51I^GJEf4`GA`yjXv_vb!AQr9B25sR&
zJG94hcpfhx4)J&qFQEex&=D`A6J9}Qbiu254T<QAZs?94cpW|Q2Hr$3^hO`Ng}&&A
z{uqFP7=*Vm7(*}=Nf?IV7=e*+BN^`?1*4FPcQG1cFc#x59uqJTlaPkVcn|5wKqjVO
zDyCsNW?&|=@IE}q#w_GuHs)Y1=3zb-AQua<2#c`<OR)^gk%tvni4TyE0<1zI6h6d9
z_!z7435u`=pW-uoj<qO83D#jfHee$*VKcU1E4HB&+fjxuumd}>3+3323hcpN?8AN>
zz(E{BC8}^3M{pF!@Fk9;8YgfPU*T(<!Z$dLGdPQLIFE1f9WLM^F5xo1#}!<~HC)FH
z+(Zp-;WmE2kN62c;}_h)ulNnW;}6`$J={kv>hJ&$QIAJ>j3@XLf8lTZgMaZK{>RfL
z?rdEiB$~uaqL&yX-V&q4M`DtgB^HTQ;w$l!*d+dv07;-ENYX%Jmo$_FOBzW+B#k9a
iB%zX~k}yfQ#35-WX)b9YiI6xYk&-A~CEtXutLGWa6nAI<

delta 1631
zcmYM!X;@TM7{KvoE^vWC7<O<#7<52!fvhaUlnBYKjG%0<xsErP9GHQ*L*YPCnM;(k
zXs5KaBHJS^l5ElTy`-|mGNXMpT1eaN|B^m_`29cJ=bU@rb3WYe!LIlX`?})Wm)Lr=
zDTS)jZPQg-q1K^-ec3U+IYrvuacWkLmepHTtK}D~Etz(Qa@A<X?qIXGBos7>6=*UR
znw5Sd6q;+)o35!YPrcC)HvArCtBrE1>Rr(e)zYfXKD1l)mD}{hx<JUPHmtgN0e`q&
zRkZh{t2v94^Hl#}iapiij_?V2VcUdeSzxM(Gqo(Wqf&D!*Uo}C)xO!G>mGl=Yxq^;
z?x?Y<uS!c(Tc>NeswSeP#vYhrXq(e(1P!mxYAJI?Tn8pDb9pAs@Ojjx_2F!_y(B|d
z<0D#;$}iC4+y_UK<v~VdZRrBTGD;6k<xv&gN$K)Yhg!Ek!7+4qrHjJzxeA}zV3l~A
zOv5s(&8CnqWbt6=nC6&+um1nkjgz%Z)t|A^u9BDP4mE9$Em5ts+w^4vts0^bjTp$Y
zSi~V7b|hdJ5|IQ4l97T`q#+#{$V3*hF&s|hAQvN$hkUqDfRPvlHwsaN(HMhbjKw&N
z#{`t16o+9V4#yEV5|eNgj>cphgECCPv6zZ!D93TA!11WWbX4I4%)m^{!fedJi8u*!
zaWblL3TjY`Q*j#R;dGpVGjSHq#yL0_=iz*KU|>GHSO60jU?J+@!-ZG`KkCtd0D@>l
z6GE^MMl&wL#c07|M9_*hT!Kr{j>~X4uD}vpiKSSE<ye8M(1ELQ4OXHP*Wx-{j~lQG
zt8pU~Zo<u2gSEH?w_+XE<2KxmJJ5wYu>p7CZrp==aUbr-19%YKcnBM@2@m5D^x#o!
zMlT-27Ceq8@FbqXR&2x5cm~hnIXsUS@FHHq%XkH^;x)XEH}EF5qYrQ4ZM=gWco*;C
zeSCnO_z)jq7e2;re1d*_iqG&lzQC9G3SZ+Je2ee!J$}F*{D=YkgrD&Xe#Ibu!(Qye
z@Aw0M;xGJ-fABB%cMP=JIw8>{QIcp$j6|2jO5!B(61yZpGE9;vNs>4u$&wUFsw7R4
wF3FH&O0p!`lHn4kBuA1f86nA&<V#$V0?A0pD2ZEAC@GSRwr%4#VJmO@4>?y-w*UYD

diff --git a/dist/index.js.map b/dist/index.js.map
index 384ed7d2770405f37b5b155b588f4ff2e0cb3976..91b89fb04c2003dd333061e6a93816553f9b33f9 100644
GIT binary patch
delta 1108
zcmXBMX;92@0LJmzRI=N#t<L>-teh2<yMrW=Qmms;qSc`&rM8kp6v??O{78=6Qi-se
z!a57NUV2f3F=NJzVa7|-@NK;K%slhVJkO7+UfZ_89@}<plu;`eznoNx4!b6$l`yzC
zC`3)TQ)#`%Lm?XDT;>?HpZ~W5&B|6$sIdNN`qW?-Dian@Wwxm*SLSY2ACjjqwd6ZR
z%2>&(2jgo8<7KeIFj&I|wipgOjDQ>p*uw#iaDo!fP+=ro;0iam!vmgBn+D^h*nFW$
zmTW{&v|1thR9=C?P^p%SiY`eZlFU-IX#eBwEDW8Jjj7)(B?O6Xl~;uD|0cQ1OAGQ!
z^0SIlL()XkZ^=hge3blzp+D5xMyu23gbSmKT5VrA6gBC=nL52r7%h@oSW^6L<>@iG
zMOhj8f}--F(oOgbNGhQm2z3-eMo$M5|K<Qu_{G~*6sWus#ow|pUtwwVbf~R!^@2Bi
z;0p~#!4IP`24gV}<1qpL2tXhvViJN7j1Wx56imf5Oven&L@2@#jtI=cY(!!XqA(ZH
zn1>k5#{$G+A>t5^MMyv*7GnvtSc+v>jul8kGFD<0RwD(eSc5dI#X6)zhxN!nCbE!?
z4ah+*HewU<kdMtMKq0oE2*uE&1f?j$R+M8KDzF`u*nyp>!Y=GaHEOU2dr^yhsKb67
zz(E|sVH|-0MjS;wj^Q{?K;R@!p#i7Sh%-2gb2yJCT);(K!ev~+Rb0b$G~)(Z(26$P
zL_2QbHac(zcX1CUn9+&*=t4Ih;2|Etg2#A*r+9|vc!3`D;w4_;HTv)dZ}ATAO?9px
HzJC7)?+w1z

delta 1331
zcmZ9|ZBUd|6u|LWg$HsI*<C?<o<$xLO;kWli9iFhq7ZbovhsBw*A1v$c4Ze7(8MUQ
z(t@l`g)fmW6(p>YtoVwSFBR4LO`ASc(~ORzGksFOIMaU@9cTRTyLaxr=iGbF?YezV
zx!!nQ2|0?k>!XL6)`cxTORq^HM~2UkDL2gZ?3#OaROzPZv4lF3yTo~Os9AK6<&SXW
z&!qh(Y00p}^^_WQL!u!)^Nhk+Y*VD9IZ|T65DY~e;-Me`iFg3RV8(+OjwFmgGAyvd
zhLK1?Dn?;69)cQ<lxW3XadfJR>^iEMrTnngBpW;R_})IPG+UZ4Yoo$#SG4v?QhHe{
z80W8bWe5CjhM=$7D0k2G7=gfi!|T>(>rSsxRbzO><gnW%vRjQ8$4UDLS!lDD#ge7}
zhNdJ{_yR$P5v*A3^VE3VV(L&wN~mQ_yc8bjOOU@WX__>iRu!u=qk+ewS8vFw9gN-7
zuc?xCQA?A*igFVrd0D2SI6XcWZ^n)m{Hvu(Y?yvYOP3U@-I{Q>sAz!dGW>?CGFX?d
zH|Td7$k&}Siz}Vd+OFCp5>gYzpOdS|HH$rSa5=R#FHVmZ98L1aW@pZ7BWUE@EAVc5
zx0))U);#Orf9BuPEa?t+b)Yg3bXNrj8=iPy|6}K<nk1*DB}jk4_(b`yJ}td@z-C7p
z#vr=ZF%}PF95OH-6YvNoA`_D^8B>sjY~)}nreQiB#SF|uE*?W39!EY3FblKs1PW1v
zId~Ft@f4oMGbqNhcn&3)hf<VbJ{G`%g;<2=@d94NV!VWx@d}n;DVAY5R$wKZFt7?P
ztcDw}q8t^d#A|pR9(Yj&AN*K@Y6K8O4QjC#>rjV!G+;e8;0<g<BR1hpG~q40jm>Dr
z7QBOZ@gBBf8{WqUXhADJ#CCjykMRivpW-uojyCMTPVB;Ne1Ud+i9Ohheb|q$@HM_c
z2RiXB4xkI&2;m^ULl3^kA@m}Q!|1~i9K|sl#|fN7KThE^e!!17gR?k?^Y{rr;};Cz
QSNw+G5eX02F8p)#e_*vcL;wH)

diff --git a/src/model/cloud-runner/providers/k8s/index.ts b/src/model/cloud-runner/providers/k8s/index.ts
index b5fdb700..a492031c 100644
--- a/src/model/cloud-runner/providers/k8s/index.ts
+++ b/src/model/cloud-runner/providers/k8s/index.ts
@@ -127,12 +127,14 @@ class Kubernetes implements ProviderInterface {
         ? CloudRunner.lockedWorkspace
         : this.buildParameters.buildGuid;
       this.pvcName = `unity-builder-pvc-${id}`;
-      await KubernetesStorage.createPersistentVolumeClaim(
-        this.buildParameters,
-        this.pvcName,
-        this.kubeClient,
-        this.namespace,
-      );
+      if (process.env['CLOUD_RUNNER_MINIKUBE']) {
+        await KubernetesStorage.createPersistentVolumeClaim(
+          this.buildParameters,
+          this.pvcName,
+          this.kubeClient,
+          this.namespace,
+        );
+      }
       this.buildGuid = buildGuid;
       this.secretName = `build-credentials-${this.buildGuid}`;
       this.jobName = `unity-builder-job-${this.buildGuid}`;
diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts b/src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts
index de91f871..af488c5e 100644
--- a/src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts
+++ b/src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts
@@ -107,6 +107,16 @@ class KubernetesJobSpecFactory {
       },
     };
 
+    if (process.env['CLOUD_RUNNER_MINIKUBE']) {
+      job.spec.template.spec.volumes[0] = {
+        name: 'build-mount',
+        hostPath: {
+          path: `/data`,
+          type: `Directory`,
+        },
+      };
+    }
+
     job.spec.template.spec.containers[0].resources.requests[`ephemeral-storage`] = '10Gi';
 
     return job;
diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts b/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts
index fcce49e9..7f6f642d 100644
--- a/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts
+++ b/src/model/cloud-runner/providers/k8s/kubernetes-storage.ts
@@ -94,27 +94,7 @@ class KubernetesStorage {
         },
       },
     };
-    if (process.env['CLOUD_RUNNER_MINIKUBE']) {
-      pvc.spec.storageClassName = `manual`;
-    }
     const result = await kubeClient.createNamespacedPersistentVolumeClaim(namespace, pvc);
-    if (process.env['CLOUD_RUNNER_MINIKUBE']) {
-      const hostPathVolume = {
-        metadata: {
-          name: `${pvcName}-volume`,
-          labels: {
-            type: `local`,
-          },
-        },
-        spec: {
-          storageClassName: `manual`,
-          capacity: { storage: `5Gi` },
-          accessModes: ['ReadWriteOnce'],
-          hostPath: { path: `/data/${pvcName}` },
-        },
-      };
-      await kubeClient.createPersistentVolume(hostPathVolume);
-    }
 
     return result;
   }