From 6300c661ff848e0a938e31c46206e9f2a66b7b1d Mon Sep 17 00:00:00 2001 From: Conrad Kramer Date: Wed, 18 Mar 2026 23:02:50 -0700 Subject: [PATCH] Lower macOS Namespace runner default --- secrets/forgejo/nsc-autoscaler-config.age | Bin 1396 -> 1395 bytes services/forgejo-nsc/README.md | 2 +- services/forgejo-nsc/autoscaler.example.yaml | 2 +- services/forgejo-nsc/deploy/autoscaler.yaml | 2 +- .../forgejo-nsc/internal/nsc/dispatcher.go | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/secrets/forgejo/nsc-autoscaler-config.age b/secrets/forgejo/nsc-autoscaler-config.age index 243394ab37ac2cd766153d2a7f37f4bf3719d212..3d8df29dfe23e4c974eade24d7721b5946a22127 100644 GIT binary patch delta 1348 zcmeyu^_gpePJOa-u~(#7X<ruIOO>-Hm%dkkMOavnd!T7jhOc8qPNA2vd7xL3Wne~bMTB-%R=Q)bg|BarONoK+ z#E;_j=80xOIR)C@u8ASu5yja#rRhl)nP!3M{sAr_C7A(H`en|!+HO9D&OruT9^t`G zX&F)JSw@8g&Sq5whKbtQF6p_ELB&q4k;d9S74Er39?qWGm7ykFy1Kdw!S0cUK>>+A z0ZG|OiGjgUPL6pgnZbUMmRXtM#px*q*(q7|ZUMdp+J#k~T%WGIS;(&c%QdF%53}w} zjquGw(Y<9kl*Wmgn-2Y1BqaP_bL-7g$r)i zlU}gs$cq_wHRiWkiOeo zaJh-bzRmS(<4!oG=LbZkADPs^;GyEY$7%*gORW1V$xl8i>P%dag;o_r4? z^wmC#DAaGPeB)I8zHhV5a{+$`=7yQgY6*(P^Sd5vUQ%EFuzsER))M~O{rkQ?Y~02( z$wjOFv8R_a+rhXGVd2Y@OB{mNG@ef2<$9x}*3xL-_fmQ570>FIzRK&e4|X1x_;s}} zSvUL8yEADonsnd4p4go*>4Q5{%M_#SazCE^4P3VEaP`MO{mGfteQRgEKghjhlR|c@ zz<<8o-)z_0ny))>Ik7aZ{&?1nc+babN`~T1-RAX86E+4b{S#UfbxYz=_G4ET*0)A( zvz8>EWphg7$>rDy7%Q`JFbdDcfuG@>LHC+&`Iv#Z`R;bV-!>^V2o8744%?Add| zy{GrR!fUJWsSPe2y@8PYNGd~8djQG$}Rd#pp-k^0a z6V_Z<5f*;unA0&2!Gns-2Pb@gSn{o8MSb$K|9Q*%J*HAuEeihl{l0(H>E?n$ z?~5(E#%13R{!7xbT6)k=GxO{dhj|;WX?y+q*E=(6;i|TS7MZ_njg-#WML^3o&o?|f!_ziSD@lBYZ+oaeZ;_Y2+I`OHr1&{CI=uUdO~ zi}v=l_|H+=T4VUBTT-egW*h6%b%nwI{TE)?#~E$FBJW={iR*oH*OPm%6gK$&zEb|% zb*jOVsdxYG^u86yajh}6=c7Vv)Y_}Fzj*UKi9DS$Lz7yq(gkb-!8Bn9c_+Q#F?fVfS!%9xuYcp$HO&V5; GssjM6S8Hkj delta 1349 zcmey&^@VGKPJKaIqHAiHe`1+$ioZ)zxJ#Ckv7vL2c|=99Ww~#0MoFoUU#Ou|ZlGgs zD3@8Oe^Ib^m{F9chl`7ML1{=vc3F6YrD>H{Sb0f>Pk3=@v0rg=RFJ-LI+w1ULUD11 zZfc5=si~o*f@e`wu4B4FV1;{bk#S(4PgJ;fXrZ5Hky}z#pifv@c9dnZgXmnWvkHTei2MwqKx2s*`!> z#E;_j76pd+UIw0JL7_&e?inRvRV7hgk={mL#*twa;n~?yfq525MpfQrrj7<&K?Y@M zz7eGnE|p29k#4zJd7h&c;PaE>-El0illh;YE>Ly1KdwW~LG0iM}pn zUgi;z;brcwMdgKFu9hC@zB$QGex{azx$cSe>6QU5<>4-#Tv^eRR4?-9gg@VM{5^NX ziklI8=JyZ5z}<=>;l?W$}R8K{n2wiwmqOs=FvvI-1mEIcJX}ARPlNAW$My){uR92mK*Tr zOrCfDMcaw`%=d@qgz2SR&_AsZpWFYfX0u&ip!oFa{-a+@6_umg+vdJx-S}t2Gd_jN zKPSIEHm{jr8nx*1w65oj>5BparXFv-HG55pX_))j=8$)%#oU|MRNi^yqwzX_@@vi& z_q^wXC!fBjT$}Z5ZRu_I)sK2?H`^bt;+dBEX>Y5@tE+NPjJ4}IjC{;fuWR$Y`u9lu zj&jn!gC+|VzbTwh&{tZ%>vY|v1{*uuHT4F^kJjYBKJ`lfw9b8zWfzmn{O(@a#IpQt zIJ^CZ2<|Wacg&dB7TG?p6MSUYyg$nB%<*gu*ZkAHdg1iY z=Qj^He#@V#dhXp+tpKaY!5IPtu=vxNp6ClFN9@%b>n) zk-`_I9G|vqHGSeSBe_4n&-9M<>A%{ir8j?mQkb*uz=VLC`=svwzj%@V@>%_7d*_v^ z@-&90R0LUFQFRx}iL?uu`t8Vs&1e2x>saen@6Pnw<5BOkPdP2qR8uyE%g_0^?z`Z8 zxk;`kZ~wmSq_sOyxbN13`9I1^?zl~qDT{koxbd@I!Gfs|Gvybq7mYYq$={GUD^~l> z;prXI_`lyiaASR$wbkQkLV<0Z*N$z=3g@a|pSXU}>b_sk-l#vlEBPs4!{#+n=Cj-x zlVUPW^F`e2j|XnOt+Q>{64k_KJ!bqFflJX)aYq`Xv*I8!0%K2`a9ce>Q{H2cwWP0 zc&_ftZj-HYyo-DntgC+{dmv!tr=Js?sy|kRRmkqGQlIOX%vDwLF-U){Qreeoiw<$U z?1`2vy`Qeds3=zBcv$`{-^9pTwcxl_hmO~XZ+2PC5x|l$~j3Txu-K^nq(!PZE6VUk=kdI KXsN$9F9rZmly-Xn diff --git a/services/forgejo-nsc/README.md b/services/forgejo-nsc/README.md index 6f55717..2cffe63 100644 --- a/services/forgejo-nsc/README.md +++ b/services/forgejo-nsc/README.md @@ -144,7 +144,7 @@ instances: - labels: ["namespace-profile-macos-large"] min_idle: 0 ttl: "90m" - machine_type: "12x28" + machine_type: "6x14" - labels: ["namespace-profile-windows-large"] min_idle: 0 ttl: "45m" diff --git a/services/forgejo-nsc/autoscaler.example.yaml b/services/forgejo-nsc/autoscaler.example.yaml index db7738e..2185469 100644 --- a/services/forgejo-nsc/autoscaler.example.yaml +++ b/services/forgejo-nsc/autoscaler.example.yaml @@ -27,7 +27,7 @@ instances: - labels: ["namespace-profile-macos-large"] min_idle: 0 ttl: "90m" - machine_type: "12x28" + machine_type: "6x14" - labels: ["namespace-profile-windows-large"] min_idle: 0 ttl: "45m" diff --git a/services/forgejo-nsc/deploy/autoscaler.yaml b/services/forgejo-nsc/deploy/autoscaler.yaml index fae0d37..30b2729 100644 --- a/services/forgejo-nsc/deploy/autoscaler.yaml +++ b/services/forgejo-nsc/deploy/autoscaler.yaml @@ -28,7 +28,7 @@ instances: - labels: ["namespace-profile-macos-large"] min_idle: 0 ttl: "90m" - machine_type: "12x28" + machine_type: "6x14" - labels: ["namespace-profile-windows-large"] min_idle: 0 ttl: "45m" diff --git a/services/forgejo-nsc/internal/nsc/dispatcher.go b/services/forgejo-nsc/internal/nsc/dispatcher.go index 49cb4ec..3c7e94f 100644 --- a/services/forgejo-nsc/internal/nsc/dispatcher.go +++ b/services/forgejo-nsc/internal/nsc/dispatcher.go @@ -116,7 +116,7 @@ func (d *Dispatcher) LaunchRunner(ctx context.Context, req LaunchRequest) (strin // Compute macOS shapes differ from the Linux "run" defaults. If the request // didn't specify a machine type, ensure we pick a macOS-valid default. if machineType == "" || machineType == d.opts.DefaultMachine { - machineType = "12x28" + machineType = "6x14" } // Prefer the Compute API path because it uses the service token (NSC_TOKEN_FILE)