From 3488cec531eb06ab1e4c9ed5f1d18327a103c679 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Mon, 10 Jul 2023 20:58:09 +0100 Subject: [PATCH] disable aws pipe for now --- dist/index.js | Bin 19465672 -> 19465638 bytes dist/index.js.map | Bin 13765526 -> 13765487 bytes src/model/cloud-runner/providers/k8s/index.ts | 6 ++++-- .../providers/k8s/kubernetes-role.ts | 7 ++----- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dist/index.js b/dist/index.js index 0e9a74c28320ab43158ffee06d059ccf470d545b..0b9f7c43bbcacaf527835211b01ab4487f85b372 100644 GIT binary patch delta 1377 zcmY+^XIPB^6u|N4zFIdWX>c35x}}g^_TD?23U$rOR`!gnLK0q^$X+3?9TM4O@4bs` zGV(u?SPgZ=2b_1rwYSNSfotkX$a#oM&6mK;#KiI*Pqf???E&cS-;So_4 z{w=e$E)Gd~vz^p9H^t7R1}Oe!{~sLBbahWk&39Du3>t&Uqm~k>S5w@J9fup*m`yCTgKJ>Yy&_p*|X*AsV4EnxH9~p*dQhC0e01+Mq4kArS4+0Ugl^ zozVqd(GA@ZgkXfA2YR9xLJ9U9OU91-Xjkm@DZQz8DH=f-|!tjkdL4Eh2Qvtg7^%hCIJ#f zQb=MZF_&0KEG1SFt;AYVSYjiwl@yWKNs3DBCB-BT5=V)X#92~YQbMAWxJXgDQiPw ztf`ZBZlYXuVoqx}%Yb54%wM8aqSb#V$q6O}OBi4UYuLaRcE|;LIKUCPVT2Q$kq0iw z3s<w>E3`%%v_%x6 z(GKm=0UZ$o6JpT`ozVqd5r=N*jvnZVUg(WJ=!x01L4Qi?IYtu?)+x z0xOY*RalKRSc`R7j}6#}P1uYrNJj=Tu@&2}9XnvgPVB;N?7?2_!+vDp01o014&w-p z;uwzO1Ww`YLUg8un1232MWqZlK=n! diff --git a/dist/index.js.map b/dist/index.js.map index 8f752321b4619e28eb1d943a5853a92c5ee32760..887849ab8ad7798141ec800fc37291408a29e87a 100644 GIT binary patch delta 1075 zcmY+*X;92@9LMolb~kNH*>vc?)fTa_n~I1~%H2{3iRf^YBUFTtTI5WLe(w7!I@tKT z??|G0U?#%@W2Ohjm`on^%v<}&gV)UGdweQHqq?)AQC*iARTi%j!9_YJVU-kNw$`LC zigJUe##Rzt&=W*NgEp@$zUtpn1lPDIMOLMoeX7+eJ1B%GM5)fDnbc{oehrW830AYE z*lbat7kWbp71VG*A2>n-Cuq?Z{oo82^oI_v7yvi8!vmfe2rt=ek?K>$H(w8T5mzk* zh(8HA?n2?~<0|Ufy_IrDwe&;pU^3)pWab3f-`b3Ny-3k|Im_KmQjzliW8o($S#EEU zLjA>WO}I+@{48liVwV)-XfkA{rKSfO^5ySc(l3?TJ`2BC$*tJfEkO@&_`nwi_`x58 zFc<+Cf}t=X5W_GWCYTX~5eP;ILNOAf5QfnhgK&(+I7DDPCSW2W5rs*JMhqrn3Z`Nj zreg+XA{G|R!feDL9&<1k^N@h~Sb&8{#3CeNF_s`1OR)?oNJSdbu^cO~604AbOsvKl zti?KHVLdirBeIc$Tx`N-IoK0UqKJ9^(m~;u)Uf1zzG6UZVkT@D`1DhbFv7Gd|!WTF@#RyW6sKe*uQ9 B_>BMn delta 1088 zcma*e**6q$0LAe$ma#KPmY-#e7TPQ=lteU2QrcA_%Y+g_NgGiqtrEXP`%XktO*`$R zqL-G3&hgqqCwb}2lfM3g9zN&XbMC#r>${cpvRm1n6IH8rvsQ%a6%8sAIp}O>Ba`Bs zd}aAxt7QFPzDgknJ8W(AKeE-Nk=E;vs=6l8Z{$@utgRZ>DqsRrn86%MSilliu!aq6 zVF!CSKm|uQ!5O3Ag3)k=8{FYx7}kn!S+XnE&&&|nCVqO#z&_z5+XpN)|MF zD-8v`qQXp;bqIUe+2d{}gT9DpLvFta(a7>54-47!U4%*h7U3XUheV9@{wiGD3e(dv z)Dh}DU5Pp)H%FIOoSK)PsY?x(j%~u#)IT8HU>p*^%>QF7)8d7TOfd@gI-gR@DveRV z6JGF!57h9527VZWu^5N(@J9e9U?L`AGNvF9K?p_&reYeVV+KMIhMAa!aLh&o<{%PL zn2Tt{U>>xH#e6J492O!Ti;#fDSb{_>#WF0%3arE`tVR;nU@g`m8S9aPRBS*R(vg8o z=&%u4$VLt}VKZ{E1$oFv0k)zLMJUELY)1)ppcFf?3%jugdr^jR>_Y`Au^$I;5LGyY z!>Gm)9K|sl#|fN74NjpJr%{J`NSr|f&Y}@bIEVANfQz_<%eaE8xQ6Svft$F6X0+fo zTG56(Xh#R`LXUg6j|VW|As*o|p5Q5-;W;|dg%@~ setTimeout(promise, 15000)); - await KubernetesRole.createRole(this.serviceAccountName, this.namespace); + await KubernetesRole.createRole(this.serviceAccountName, this.namespace, this.rbacAuthorizationV1Api); const result = await this.kubeClientBatch.createNamespacedJob(this.namespace, jobSpec); CloudRunnerLogger.log(`Build job created`); await new Promise((promise) => setTimeout(promise, 5000)); @@ -269,7 +271,7 @@ class Kubernetes implements ProviderInterface { try { await this.kubeClientBatch.deleteNamespacedJob(this.jobName, this.namespace); await this.kubeClient.deleteNamespacedPod(this.podName, this.namespace); - await KubernetesRole.deleteRole(this.serviceAccountName, this.namespace); + await KubernetesRole.deleteRole(this.serviceAccountName, this.namespace, this.rbacAuthorizationV1Api); } catch (error: any) { CloudRunnerLogger.log(`Failed to cleanup`); if (error.response.body.reason !== `NotFound`) { diff --git a/src/model/cloud-runner/providers/k8s/kubernetes-role.ts b/src/model/cloud-runner/providers/k8s/kubernetes-role.ts index 09a26d06..b7a3d3a5 100644 --- a/src/model/cloud-runner/providers/k8s/kubernetes-role.ts +++ b/src/model/cloud-runner/providers/k8s/kubernetes-role.ts @@ -1,9 +1,7 @@ import { RbacAuthorizationV1Api } from '@kubernetes/client-node'; class KubernetesRole { - static async createRole(serviceAccountName: string, namespace: string) { - const rbac = new RbacAuthorizationV1Api(); - + static async createRole(serviceAccountName: string, namespace: string, rbac: RbacAuthorizationV1Api) { // create admin kubernetes role and role binding const roleBinding = { apiVersion: 'rbac.authorization.k8s.io/v1', @@ -47,8 +45,7 @@ class KubernetesRole { return { roleBindingResponse, roleResponse }; } - public static async deleteRole(serviceAccountName: string, namespace: string) { - const rbac = new RbacAuthorizationV1Api(); + public static async deleteRole(serviceAccountName: string, namespace: string, rbac: RbacAuthorizationV1Api) { await rbac.deleteNamespacedRoleBinding(`${serviceAccountName}-admin`, namespace); await rbac.deleteNamespacedRole(`${serviceAccountName}-admin`, namespace); }