From 38d38b679a2f1a8c0de9e2c388b895dc1ca5004c Mon Sep 17 00:00:00 2001 From: Etienne Audet-Cobello Date: Fri, 15 Nov 2024 11:21:11 -0500 Subject: [PATCH 1/2] bump versions metrics-server to v0.7.2 metrics-server chart to 3.12.2 --- build-scripts/hack/generate-sbom.py | 2 +- .../hack/update-metrics-server-chart.sh | 6 +++--- k8s/manifests/charts/metrics-server-3.12.0.tgz | Bin 9885 -> 0 bytes k8s/manifests/charts/metrics-server-3.12.2.tgz | Bin 0 -> 10395 bytes .../pkg/k8sd/features/metrics-server/chart.go | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 k8s/manifests/charts/metrics-server-3.12.0.tgz create mode 100644 k8s/manifests/charts/metrics-server-3.12.2.tgz diff --git a/build-scripts/hack/generate-sbom.py b/build-scripts/hack/generate-sbom.py index c9cd22a27..1049b2336 100755 --- a/build-scripts/hack/generate-sbom.py +++ b/build-scripts/hack/generate-sbom.py @@ -256,7 +256,7 @@ def rock_metrics_server(manifest, extra_files): }, "language": "go", "details": [ - "metrics-server/0.7.0/rockcraft.yaml", + "metrics-server/0.7.2/rockcraft.yaml", "metrics-server/go.mod", "metrics-server/go.sum", ], diff --git a/build-scripts/hack/update-metrics-server-chart.sh b/build-scripts/hack/update-metrics-server-chart.sh index 7d8dc352b..873257a28 100755 --- a/build-scripts/hack/update-metrics-server-chart.sh +++ b/build-scripts/hack/update-metrics-server-chart.sh @@ -1,9 +1,9 @@ #!/bin/bash -VERSION="3.12.0" -DIR=`realpath $(dirname "${0}")` +VERSION="3.12.2" +DIR=$(realpath $(dirname "${0}")) -CHARTS_PATH="$DIR/../../k8s/components/charts" +CHARTS_PATH="$DIR/../../k8s/manifests/charts" cd "$CHARTS_PATH" diff --git a/k8s/manifests/charts/metrics-server-3.12.0.tgz b/k8s/manifests/charts/metrics-server-3.12.0.tgz deleted file mode 100644 index 22f9f8dc2b1d0efc545bb83157ce93c149f8280e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9885 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 P00960lE-#*05SmphQ8Pw diff --git a/k8s/manifests/charts/metrics-server-3.12.2.tgz b/k8s/manifests/charts/metrics-server-3.12.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..4538e8a10e54c3dcb0d5047b4034cfb23683482e GIT binary patch literal 10395 zcmV;MC}h_kiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PKBhbKEu(;C|+>=#_3SR?g%+^m26Ty;EdwqKYj~Sx&aLQYj6F z?3qDK5)1&2G_i8O{R$60hx3p$BioYj!PbyXpwVb_HyVvbgpyNVxB~eEdFy0Mxb&tZ z3jemg(r&lg2YY+^|8~1w|G&H2-Tzx>@37rz?{~WG!@spVd!4=R-=Mul9Ojl(NW%Zt zzH?jk&V40?#4(dZQWlFN2Y_%%hs2lTbl_3e^2a0|p*VtT2LQl@k2DUBfCK>s`UyaQ z!sj$mH5|d#>#HQBK9%9r0D&AMkR*YGGs%1wf@J!c;y3D}w^gawwAWnq&q+X}t?}Zm zVOu!YY#f$OtCe-NQah>t*HA&~^Y zhPt0WVi?{d0P%i=r72HZg;5c1G?XrlAtS2laY7ReX^g^i#w@}kxG~2#)K|D? z-;oKCgbUAnp9l&y-wHbI-gspenq7w|0X0%QLNbjSgij$?cIZR zUH|VM9z5y)`zYJ+3Wp>OC77YtVzbH=p0f=f##9)I{NLlZZ`>i{5s^yM4QYr9;1&8I z;RqALsS?;isks3{LWIBoXe=2_S;|3Tl!Qbok?UxEsLT$I2@_N@K0N}CBPt}HdLLg1 zWrNf>v?dGyw&C3bIj4bYbBvjiB}$($fe_gKQ2~=rpTILF?s2Y*;IF?NQ1C~vrF3YL zhGCC|)Sn)~>F|un9!G((wCMKIFg!<}qZCK*>u=6BWD+q$+`K&_5jtA>W$5YphiMqj zJanuzbnN>qjpdQ<)p>$G9a0o6cPkABP^><*?%Q-5I+5-zyB~cT0K+vbtEK%RG_C}PlpgQ2?8aMIIy@V(kpD9 z12Gj*0V9l&Yg;K5N)xM!Guq@l;(#Ts9vFj3NQG3G2r~u{DI65X!C(qfv1tuIgV;G@ zu4)SXqWCLdzG!hABFEUrR!9aI3b#ZESLs?QTH6>88TZl6n{+J_4rJ(PmT>rh`11zw z{rATwxw#@%8^JTCe)d>!j(*CioErXwOB#ln-o@vtow#iGSly^--toHoz&I$pF2IWuaODgD#iRElIY)l9fu3_J_f)HX|U{hXJd9O*{@5xF`~`3R4oT|D_YCKE#S%2T(W zu;3LHJk=}J@6%v}R!J{VDUyhfqQ%qLEiF}AK8uHRlyY>FV9=WFH$X(=&0#NE2577XBF3{QL34hu*oChg4D$zQT|wQ;WrcP-6#>Ag5X~ znMWP2j1<)L4k&eRgp(+gu3_I3BWF%~PS*b3-fp8l z2@7ehSQ3r{?SK+!->6Bf)#a?vxr8)PqNcCL*_RK5yO*0^07A#&El=OGiBW9$(GU$zK%;<-@YFb4(Emco*6jYOnYF1Kn z)l`$Bs;a6?SwUe=W<>iVMIrN#{3Jbsy>?`OMi^;&cK6>>{U}u8bVX?GH#DFc(8A%B z=$HrDXKmYt26&s*WgkW~wrqY*|3pnGJKw^vr)SO)?CRyT8Pa0L>^qL-<^~SR zCevFME7ob`F%kq+jWr41l&23>LUBSu+YjM$lHdm#AxpJt7rBG+J?hy-V=Lwq*{e^S z>Z)U92iLY`YNs-+)j`#?@3h-hVt3ny+}oug-L}y7PYdcedO&_*VH)9EwVts!mmb?E zO6;Fwh`u7Fw(}$l)!NO7AO%8(LnQ*I+3SRbY&1Pj)Z{r~v5;J^pbT&jixaH`4fG;Q zI>01k(?~78i$7<~Q6-IoG(>)utrZ;^C8iI0?4v|ZUr~en=k~XJX{F{}$-OhJvv(g} zpL_C3-o1?_`+x0&y~CRSZ~tJw^W^`#kMiw$it}xK`{q{VTW4MP0BAoS#ySX zJ5G`U24KE}@HBHP9%)QJeF7T$VHzN8)fPnBeAxm|eYdXeY;64J&i{)sh6!@v$>gqE z0ZZop{=q?~HvbRy_jaG=|9zBCpIYBKudfmkn_cU&qgQ*+Jm=fiUw=8DKDiL!kjAt8 zu0GiUw*b=ab~}xfP6qE6v#nHie8aUemSZ0dcJ-e$I!}i~dIekV7TCHl4%DBHM)Jh? zl1bjeFb%^g{E?E74k-pY%s{o^IsZXZw}zLh1=SS+1N2EM5Cn^`>?75k9#RYg0feKm zp3s^hRKPRsT1I$vcCKJ)JOYuRzvDTl!^*~Ywj-T+9*wtK8b|E_Ar%Tw0YoEjv0X;r z%q?Efm=1H2*7p-K(#?Ip3fV)E*YiJg7mi-8KCT6hIWbHn-h1m#)!$}#Rvz9ExrEbL z4q@vb!u^NXs?}v0U7gFC|E%y{X;9UC$z1D1n1QuiVxaU|VEN!`;9_L!Jt`Bss=cn& z+BhUW!q)%Vf~||Kn@=e1`L#}hrHC3ZgXtK<$P?q1M*e7#F0|eA3<7h(gk4{}v5j~o zE^5@rBuTugx1mANmp-|MKT;;KMu*v2%vM6+4yLA}jHB$H2+U5vvj5!nQnLS&C|m$B zpV6{~)~cgYC!E{ZE8~e-Kz}1%yk?rvSV$84SfxmL5;x72x-x0rHC&;C<(<*9d19~% z=GlG6no4>$ult3B^>*e}8JGK8l0jMJTlSBwl`5Ds{2z+_>($6(ZOvKnaiqnE#Y97S zg)a@BiKiRY)@0SqX8yx1eMHf`G-4Ip&sir|cSBv2U}VlsmcrN|MnW zu^12O=q*Wd_Ps+N{H(IMB7QZd+|qtG*HqUm&fl{T*MTx;VNUfNS?l)vhj29_tD@b2 zC;WgCdb9f}dh;n0*UJ!2f`L~A7aDBUnoP?CrJA34CnfKxcicO*u)_P12-r&W26}7K z+1i0;0;37?6BZ@P_}lu|OXzsrj@wofqFjrz7;QCPK0!>=W=UuVw_JS*H7zwV@Frlr zv0nKi4sy21{$8{FKX?5{5}L*6-ZdI*$@;Ie+phb64!gVUr}f``l$stb!ap({YAlK( zj+Z3VZp3IGY_=IQ={P3v__%j!Yj7fzBp{L;<#9aC!6U^URz5Z6NtZA;5U(Moae%Re zJ;*1F-k)yhOKH>00N29a&DWXT)?Bw0Vrt=cw4}K#!oqx9#9Ms&1cQS;jD2HjRq6#8 zah4`|sBA$S{k&%b65i67MroAomCOkaQHI(qT8+S_?b7yRHdYJF#gdE%E6?(RVC{`g7cKDe@y{MT!~+b;u_?f>rY)y{u*+xrLm zPxAjhN@>m9qyrlLCs~~7{V0f=Ivm!Z7)tUs*4@^^^yl|)N|G`Q+Lesn*aAwKDYh%*(P?)kaEo#qZ!l5+Dh|gduB1MT;Bpy4D3lVyVZb-5i z+~5W-acjWW=#lE^&Uz=g&3-LV;^?5Zb2N(3#0hm>GS>GCaDZUv$F6e^Z&NXz-9Jdr@sHw?RGj(@qhPHmdyY9_R#v5fh)<0&$}92 zyLkBYDL>-AWN*dv_sbL@PlnY4C^wM*w{`<8-T#@9|Lw!Wr}H28Qa-Q!_qp5vpHZTJ znX>$Iv*AlY5)IT%54n%LfmK3t<6$?p5&SrA#0`A zYN14TRstEiXNtQ|Y+4R`{{PxF2?9!;)|0>>+nRJpn2dE~Ql=YbYtb(UMBqv9=W0Y& zx%*~r`AM2dZa+zT$j?}S%Rb7^+-F~^wz3oUi@!97z_ahnubVXbHvj%fhkWH_uKX_! z+;2Gkx6|z$%5t!(26yrB&YlD;8auG5I<1Vd^_O^4m9Wy(?HhXmm4h7> za^)%V3YfVRs@0QIXuW zDyZjaehQc(^Uqy~l&4!1#j|&;t(owTU9D;9Jw zZ+1Mf)|Qc+FXx&I1~AVz`Es#OEQf1qEn#8knl!LWswuKwHr0bd(uhdLU*c85VvHpv z;S5wYqvnzZtH4c-rUGq#U-7bJ{lQAYwVblRHQ)<`ZR4mf78~~|5-X1;Hb3T!6r9x< zwOlZHV#+cG?YXx3s?v8csdE>5l^}QZ(>Ic4k(ONha=DzEv;eClEM04RS)S9BqVYq{-tDP3=e$>;WZK9#J@_5UZqU|rWhE!+R??$!PO`v*_w zf9|K$6i&lM2XnW97if-pejcqc%(g;9>YuM;f1#ZCV+qB|S2&o~E0;Qym+`B8o{7%N zw!*?HDwjrB9BTJkEW@IqiYgwPb@V@NE#F6(FaJeyU-G{*bN}D|!Qqqqzn4hFx#^7Y;mJS!b`Su$J zU?@yvseZ`Q(A@HIERMDRqv%1ywN}la2z*21^lIMQG)Y2?FqR}NpXHnZtgK!$WXDX% z-s!6x7xnwJcT)LX-w4v*6kcu@bdHpc75)*qI)a1!{oMoS$@2eV%Ut=tj>I3fERFx~ z*5&_UXa6bw^Ipp5IsY|3LBLABD3hY}e$9WII-qt`-X8O>xE%8X{`t{#b4-8cQtDGOZh06OP50E|Skgv0>BL6p?|Et0N-#zF)$^ZK(>plN_6S=N) zq%2MOx>&k@Ob6(iBe-9RK+n@=xi*77a@|#orM&~%cKXYd2KO7@wfCQw?_62&4Aa~yH*k}Lxd6Q3N(A-7 ze3g{F?6XniD_p7obHdCe;Ukp2+6DJY|0TT~JbO{y@V)Ks?%vZrz?V~&$$xuY+nvc|MNMsdHaDN&q|6vdIq zIn{Te`6j^|oAAr#f5c*XqhzlQWy$>ScK2uezfb#r_f$U3=Kr@N|JIIt=H{JuB(E+U zEXUAzLSC|{0!#T*g}N z{P}Dg-fXVzdBoZDX?=`?gcYIUt~FLG=BqgYQaz?A{4v(;Tp7+BATHl&mfe0epLMTQEqqQA{6HgQsRSsUs4qRgb1Q~u?@{wEjmzg%XI`!M*gy>t z-h=|bbK_6Gsm+#}{`bZhMsyT2j_Ye=4Lyt&_JQg4sn30Fe zF~%@RX&BIW1PSp!k`W5e*@h2eDs-eF<5GYaV;I6HWCNo(XgqqZ=e(p7)MCB#oWy~% z4Ka?i^$gDvjzfBdfsrbI-|^sG98Q77`b&ipB*-D8F?x>o>iptdGLFtR*n8`LIXQ=b za^ZL*DqH$rgTCVp{^TwFZ}wn3YN>y+pJEcXii!rr|ClB)q#+9DTTfgj&bQuxe009` zWTgIPoQ|At|DUrBzYtDYD&X|hYvFhaXTPH_9ghY`S_Yi6-yLrvd=_BqYY_B%88|LnD&{J-~8w&AVe0Bx8fhaWMFK;Hwe{*6Z%vXSHb z3x56k*}D&~e{=o?$6*L+5j+SHd<~*yhg71$P6@cAVF&|+fca^JvBUsqY(UgJ```L* z_#xvFkwAq`T^In1;n$xK6Cg#?zdh3i;8Cmf5iuct_FOM2Fm83cw%2a$=mks#0}_mp z8_a$^$B4v|`q};BG%nR^V%t5&M=fQ5w@ zE}ZhPD71doInE3=7geUefOjXSCLe_6mr2_@^t!h}hnq!~Xh||^nQC@y{|;Wd+48x0hpUUw<^&WM+7hbos1c4SwB@;dg>mAWGyWCXmn!2)XwfFAOt@fVo z*6%cmrfwRKkVhm|9m}RuzsN$^&pe50G8MK;zmlP>Z)_Kx-$Dr%j1oCDnC>0!-yYMw z!+pzOYF=CB(vwWFmYHq6^PUzrOqnqQ%pISB5_Fl-gaQ2YLSz?Oiww18L$eUIjz&## z{3t@?7db*Ya_$>Zj>>?`G4;oJTA=_4j0q21Wv>KZyD-i{XJOylMc=z_`|!?vzm8ueDc6p7ad&O!tm_*qg2l7UIB2dO~lmjdtlUS3nBQ#S34&4yk8<>{BSCpc%7 zm`NCuiE4F#7(<$k1cQF3-Q92ZbLxCoCeE(gebGpqjPk0+j8GFwj5S(D^zJOUyB-$Y z-Dw^mYbV=%j8v(H*q8V72nQH)hL zAFFoP?e5NH2VbxB_3Tz8PB3mhNdB zq7X1;DST9`(#tWC>en|MAz(Bfm2vBoach5fXZo$hs5($aRe@u>g5z>tPvcUMui`A< zR|K&u-K_C^H>}_*mKdi1T=Y1LP>wMb@Ge14B;yw|*6-c9Z7pWlfilA~Y8~d(>bRYb z+j((E9QW5VBlgQP;-HLUJIAp$qA^}Vzm&$d-?vLi$-wM)1Dhb{RBK1on@oKXKGKe^ zJBx$;^|14PnVt8mozHCfTIXp@B_*Np02;ZFE%=6=nu@w;^k+(D!bqFW(KHaAF3Y}_6OUD>Su5QvbEjZaCaMLYyoNURp z>6Y3~X2ox|rH*Z>z44aXrls#T-OzWY9c5{4w4E2;o@33e4Y#xFSW{uc?Q|Wh_BY&4 z$FZt=!|iB3INWqQho+r_O}BGk+S%W9JNsVyYuFHdWTiHm?_VFkdi#2vo4-rC(93-AQPIA&t?xLr!BMiC*YylUwg)JI?nwWE}Mh)hDsu;2>eB zA&jl7-so-X7>(PB1af3>-;EaieIO4@m1+){RTzu(uvF^+m@K2X(FYs#f< zjfS2jFJ*OVs(KygcqozU)%66kj@b2uZfR~GXAn!15hnqH>t?Vu3~TMz3~`N(TI^Kr zJ#;?kz5Os`mwF8JvMHoO3WG@otR5$XlL#epk!>~2tdPv;nEidEJYR85Oc8rVZFYbSvwe&5{wqo%!}lJRN3aoA6- z!#9KS*2Mr{OSztLY}Z9=UC1x1upqu9qXpm@@g*5OH~PhTkg(!El4Jw{a;iglIEzY( zi6luDFYtAa+cosJww6-#CKVRMFYdis#Q6%!<{kYyNqGBm4gJ&M8IwJZLPycuxx$?I zrQ7?K65k$adt}tVhW@X=t)25@65%^5MCMg~4e!cgMt{@KY%F68t`V&-vM5T?aE;X0 z#Lv#4EgFD2@w0Cp(Ex0Q_>ISt`}LMjhtQWi#r|`!2bhW8*~zwqvor1ML+%SJ*S7!b ztFVFir7(nkspazhwb>%N67KuZ$$t&~Pk*gl=GTaCq{&Rn=T#Ehef(5l;Hg;=GpXYo z)M9$xT%sbMJVb{;s3#+gk?T#&RAhb?CDaT+7U=o~jOe|H9noa-T*HU4adRjkpB?7c zH=Jot$6#vCC(O)(b42*(tS3k4X}^`~}|aULgZhVx6r zZ?tt_iM>-M)dMb@v3E+uFQ<6;@aEiPdFUH^CqbVMDGIn8qZ}jGk(?iCqT@p+3eqOs zglA{(KD<84bglhXG2@Z=V_-U? z>!VoZZ)VyjELcqWX5uSqCoFiVw4Ny&BmVI`MOU;uU*SEH5!e{<&#O1x&o*&g9NhNp zRr#6DdL*>pn0I9f`V8tY?EX2o915eUcX zW56pCB_TeC?D&{PtAfgZkW4UZ9#{;oe>(Rz zuQU|n=0$P-I`wTv{0SA5#XnLZ8K1tP5uK4fRpJ|XP5qCE$>SjZ+P5(lKw+??Of9qJEm9PW?!Dz=9C)pc}|0p8ygK<7w>;3qPH7{|=BC6*tALl8=A1VDe6Fv~q3C1WykF&wN zHN-W%u}~%j#)BZ|&B|stpCbwA66#;W`wZ%_QhzhVFJB}ze=92s8dFe@kMc(BoEVqd zX>Tpkr$YQ>zGJOKdYme(s*#LuojXT8e?J<_BGg zN#_xN=6Gr|@g*5;s;ggKxrV;UV!p2FKTG^P=Dbe)_cKzH!~ujfqEZx+K{~Y10{v0TBo%y`Qrk z$Os?qVWgRI4gGesS);=cAFm`QC%vCbdm4)PM4wOrHq;|vjlTpr#Cq5IVHYKK?uGbf zj`Yhd=bUfeJwE1Fod1@td!adx^WT<6pw9Vr1RfLfUqiopFT{^%Y<)TB^iO5omk$Z( z6=p=j5QT&|4=zyD7sVm5{PH5b%27+xuY729@Y4E1m*x{cVPV)qPFaxK`HJ%;jqo|p z7$O>mRG`n|Ks?tw8_cGs3NS%)4dg?!c&?$pt24rF&eSx-mt&4%%)+2pXdY)wK0tYi z7(?6bwA-E@l$_$DFis7MA}5ac$J_pF@V7oBBmqDh=Q~2 ze?bFx4gLM~2QSrbKwf?%(&Sd3pCY`UWgqH)LA1Mb*^G;&`F85Mo!@jGwUl7}qJBMq zXKuEP5d+aMz~&sisqyO=qI)5J{m$z?)c3K&+{vr-Da!25hH6&(uY;tkmyNpB=idBm zVwWmhZeU8+Fh4X(H|dVOwA_ZO9S*6NN*QeOM|>_QlSZ-Y4jr3T3*eiyx`bQB?ryQ$(^_DX2t#H zn3+d}CZ}?zUGW&V+ixlSwVGzuCFSBfh z^Mm}Z_4#Q)76nZf-#_RP*pPRpdX4>@mW$g-vnxv<73nvX^C^ghxx-}PGAlco7Q~`@ zxv{;(v#>lL=x}UE=0}OK@)r`{fLKqmUSH`eE0r#=bjK)RobV|OY4`wBeJbK_VU)<} zE6TTyKCQTpT~MLZbpMyWxpTc2fGxiNOO;Oj{;z}f-qZbG_fej%0U=0OXvSyeg5z7?mylCcQ1wTkvMVyTxd>u`XnEo%2RnNPvv2j{~rJV|Nl4!y0rj2 F0RZYxsxJTl literal 0 HcmV?d00001 diff --git a/src/k8s/pkg/k8sd/features/metrics-server/chart.go b/src/k8s/pkg/k8sd/features/metrics-server/chart.go index 4c098dac2..0c01aa6ba 100644 --- a/src/k8s/pkg/k8sd/features/metrics-server/chart.go +++ b/src/k8s/pkg/k8sd/features/metrics-server/chart.go @@ -11,12 +11,12 @@ var ( chart = helm.InstallableChart{ Name: "metrics-server", Namespace: "kube-system", - ManifestPath: filepath.Join("charts", "metrics-server-3.12.0.tgz"), + ManifestPath: filepath.Join("charts", "metrics-server-3.12.2.tgz"), } // imageRepo is the image to use for metrics-server. imageRepo = "ghcr.io/canonical/metrics-server" // imageTag is the image tag to use for metrics-server. - imageTag = "0.7.0-ck2" + imageTag = "0.7.2-ck0" ) From 2648d394436ed3f31015e8544e2f6f7a4eff4da4 Mon Sep 17 00:00:00 2001 From: Etienne Audet-Cobello Date: Fri, 15 Nov 2024 11:33:12 -0500 Subject: [PATCH 2/2] update version strings --- build-scripts/hack/generate-sbom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/hack/generate-sbom.py b/build-scripts/hack/generate-sbom.py index 1049b2336..a74428842 100755 --- a/build-scripts/hack/generate-sbom.py +++ b/build-scripts/hack/generate-sbom.py @@ -234,9 +234,9 @@ def rock_metrics_server(manifest, extra_files): with util.git_repo(METRICS_SERVER_ROCK_REPO, METRICS_SERVER_ROCK_TAG) as d: rock_repo_commit = util.parse_output(["git", "rev-parse", "HEAD"], cwd=d) # TODO(ben): This should not be hard coded. - rockcraft = (d / "0.7.0/rockcraft.yaml").read_text() + rockcraft = (d / "0.7.2/rockcraft.yaml").read_text() - extra_files["metrics-server/0.7.0/rockcraft.yaml"] = rockcraft + extra_files["metrics-server/0.7.2/rockcraft.yaml"] = rockcraft rockcraft_yaml = yaml.safe_load(rockcraft) repo_url = rockcraft_yaml["parts"]["metrics-server"]["source"]