From ae12190453112e3274ee9fc6228ef9f1d9aebc69 Mon Sep 17 00:00:00 2001 From: Sebastian Florek Date: Mon, 13 Nov 2023 09:28:40 +0100 Subject: [PATCH] fix: update gcp capi provider to work with latest capi charts (#865) * fix: update gcp capi provider to work with latest capi charts * bump gcp chart dependency * allow helm to properly annotate certmanager SA * update bootstrap * bump helm/tf version --- .../helm/cluster-api-provider-gcp/Chart.lock | 6 +++--- .../helm/cluster-api-provider-gcp/Chart.yaml | 10 +++++----- .../charts/cluster-api-provider-gcp-0.1.4.tgz | Bin 17559 -> 0 bytes .../charts/cluster-api-provider-gcp-0.1.9.tgz | Bin 0 -> 18183 bytes .../templates/gcpcluster-crd.yaml | 4 ++-- .../templates/gcpclustertemplate-crd.yaml | 4 ++-- .../templates/gcpmachine-crd.yaml | 4 ++-- .../templates/gcpmachinetemplate-crd.yaml | 4 ++-- .../helm/cluster-api-provider-gcp/values.yaml | 2 +- .../cluster-api-provider-gcp/values.yaml.tpl | 7 ++++--- bootstrap/terraform/gcp-bootstrap/deps.yaml | 2 +- bootstrap/terraform/gcp-bootstrap/main.tf | 4 ++-- 12 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.4.tgz create mode 100644 bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.9.tgz diff --git a/bootstrap/helm/cluster-api-provider-gcp/Chart.lock b/bootstrap/helm/cluster-api-provider-gcp/Chart.lock index 015b1361e..fc2687c67 100644 --- a/bootstrap/helm/cluster-api-provider-gcp/Chart.lock +++ b/bootstrap/helm/cluster-api-provider-gcp/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: cluster-api-provider-gcp repository: https://pluralsh.github.io/capi-helm-charts - version: 0.1.4 -digest: sha256:4a5070742fa6e34bf27a5ea29d590a5c86cdac50f56522b1b79671181907da82 -generated: "2023-08-23T17:30:41.21781934+02:00" + version: 0.1.9 +digest: sha256:276229b280a0de17bf5518f0a716d1d889100a7c52a9a49a651aa25d1d271363 +generated: "2023-11-03T15:03:07.222737147+01:00" diff --git a/bootstrap/helm/cluster-api-provider-gcp/Chart.yaml b/bootstrap/helm/cluster-api-provider-gcp/Chart.yaml index d1315c0be..929c8a33b 100644 --- a/bootstrap/helm/cluster-api-provider-gcp/Chart.yaml +++ b/bootstrap/helm/cluster-api-provider-gcp/Chart.yaml @@ -2,9 +2,9 @@ apiVersion: v2 name: cluster-api-provider-gcp description: A Helm chart for Kubernetes type: application -version: 0.1.13 -appVersion: v1.4.5 +version: 0.2.0 +appVersion: v1.4.7 dependencies: -- name: cluster-api-provider-gcp - version: 0.1.4 - repository: https://pluralsh.github.io/capi-helm-charts + - name: cluster-api-provider-gcp + version: 0.1.9 + repository: https://pluralsh.github.io/capi-helm-charts diff --git a/bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.4.tgz b/bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.4.tgz deleted file mode 100644 index e095ebf06b68dded838ab84974b915e9d2a1ea97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17559 zcmaI71yEc~*RG9AaCZU(XCSz{ySoH;cXxujySv-q65QP(KyY{0IeDJ<`_B1~)ZbNe zRd?^+duDdkmUXXteT{;{1pB9fXu#+UC6yVCCFR&O>Jz!&b!~72)O3IuYwrzAgb0dPIK903dtw<){j?HDAtM=S|;OJ zbMJ;c`oC&IC*oouEP+WgZ`AlcVn~9il^boAXMIPK9cQ5y_r6 z9A9ILf%`h$?{a1l+m4v(fd+EeZtniudRt*Zn_FA8pYGn~&2Ix1_E$p|_U7jP?x3)X zxzESxyRWm4-8z>E%%n^p!?!J4HQ1*Z^6dGi5QOnWNSAJwUzXbM&Y0)W8^Ph>@e8W` zts?jC=-(B~(;?;XBzny-`Z35NaLGM{kQFgRkoK7=VByLvWkss32y{16TY{D9IiBZ> zpH)hSAN*tXqQha)z=+QLn|q(SIzHWhJU@WQX-vkFr?-sdZ^$Wk4FVLy7uE>aqsG`G zP-Y*&NN;HlT!hdgj8lZnJ$=QHXE8^D5QS4Er+3q@TRHn!`qdb+$z}V6abS<{F2D+K z6(nsy4b)C##k9XzN#BD)@XDM#2hpYYr9S9{Ib+wR(ig1plkm9ENMjqYB|9LwHNsVR z3z$+=QAEqao0^|-ghgDQ4`W{3t*WBO*=_(_m~~te^N`J;_m|7qw~wzu4o@snwYDED zrN?fXqix^h$r2?am)cqnZG>7NfF1q2-q&CI(5V%0Jj89(vWsOE$DVJ&9GQ!RZ%rK@ zn&7B6oN(wD)jyx=(@|712AgzqkLY8XIEkCmLnk0zxcQ8oCL>592#*h;CpvMb#ea{84Ie zi4G)D&eG`__4NRyZ`U~-dp`;V&S~Eo@ zpK6-w_6`ID!34}1EN-p^XDV1F(J~^Hr0;uR7Z(?Yi$^SEBiBoqM3p_i?vHKf5FcE4 z(^tW}O%pCgjB7!ZFW<+=Vj9Se&i1kgX?DosPc~bEkY7MP-XJlp&nug&i%ZWJ5a!9< zQB5zhJbwviM0_^JAIHJcYYq#~zCU$3t*yZ`d12IKDw(LwbAv2_v|WLrVs6<(=+Lj! zj-^(}Th>6~10Q!e&N4J1e`*E=;pSch|M?*?_MCYI3*)vxSv~TI#XQL4OSEdGkUQ*B zEyC|}_IR-;$%&FQ8I17;*9wJaq3_DTd>D$^kPuD`DEJnVSmdfOffDjqsQzq=3JEfD zyhLZ(*|;Q%_`~OO;e(Pf#E9e&0qEcbnq6{AOTh9l`MJZ-Sw}|5Ltkj-lvQJ&HaaWea7@){nr_Xxshx@N8%sd1=%#<2f$ai z$(g1sBD*jKL>dYbu~9vpk9j<5eHD<=J(jK07CDqHD#b2cy^flO?i}M@KpcwXs*RnZ z==|Iu+?xGb|FRpO9|Q7+wDtL|>7URr6hvVLsarJB5pa2zJs2f8*=m6M_fjwyO=6rb zBo;w-Df7Za6+iJX#z!W!V^QUrQ~;iGWS0sRm{9xD3WWQ8>ZR4kBbAC6L$5*eAadbkkbIvmJ?= z@q*(|_b;m1&4Ic++(XF{6Umi3(PS`5ohTZU)h4yDCET90g3p^~)#?m!fiB-qYE3Ir zjx6Ukf+Oc+KLwLM_!2{2&F!Q3N<2qmU?@IwR6c=+)MYzD>mlYNyc1f z-7qi2X4JL)EP+d9u+n_f{#@UY^{R&OL;D!sKzH3a<1hB^M?(nypWczGji5Lf4b}+c zc=i!QY|&jf8K3wKelHsI>DmZ8`!I28BEqf0?rjgkRZIA>V}1aZLOPwnzims;Ids*zMy5%bSEY#HQ_toz(vK#Yn&v0 z(?JlqyDO|)H3)}?2kQ+qZE^p5!#|h2{p@R5#p?LaUyl42DCBToe22zEyled~IQ{^L zOPSS z9}cx)*NfwGJRQ?Ez?{dZ_M$kPqSDQkiR}Ee0q(?O)?Tt-FhNH|Hfb)8A;L;H3{|xyEFmKx z3%^XR%rpMI&Y$n4WYVJ+h1ubEOyCVG_Q1jeefT~r<^a50A!#hxCxXY%L)p>byjK4$ z2Gbrp>&XYVjvCG%d}>kH-gVpE-XDkidpjQQhxf+HFYpsXb885*2g*qj>qc-+HXL|}$h#eBZTrBNN3Q>9Vie2v?B-`l<2f8V?5Yz-?j z2RfIdOr!?m6DD6KTPoOfIsn65M+q=5f4F#i*NY29m>Bj;&>45Kg>Y9pwGu=y*ktE7!&xAs?PVKyM^RhqY+F z*q4Ma1601rDY$6OrV;`(zdH4mel+>h{caJXpp)O|VxJ~Q(DDgjh#Rg+v8z+<;9h@S z=j=n%%Nnm-yuFFg{RJg0ElH(vaFESs(|mE8T23OgT-6J&IKTRvEvgCHbE2_$k{IDZ zEGmV*U9z>-4|{-_$0m@EBLhjKzeF>`>|yDp{O~{z{kwCBke&#aya}*neh#laihD$n zv#R5@=o^g@EhZZ|q>QzE#FywIl&MX!2imd9wVtD8P4g@FM{%j=Ajm+qc?~6rAOx z){~_O|9fNW9)oU<76zfJVw$U^WT^bofH-!Q^+pitXFrG@4yAv*|%Pj zmH*!KU0~y`Fn*6FCt0S#i}|*hMJVIYO%yHOXV)DglQUFh3~fQ$kwsLkz3atFiXMj? z|FZW<$!LuTr)3mY9s`wVEM+zUd9Tpj`b(o}1~ZjZ8r>60!hWPNNZ(8fGYQh=?;Q-s zylKoZ#q_}Zj^R#Y?S`EW2w~rR9i6pZzMKis$QX_5m7QcQZ8z!U$bNH{a95TSlL3R{ z-X!2MUsy|#!IWE+6=qit?K3BH^DwuXExS`RfA3fGejWOSFMxHLGgii0S%FT@Oe?zm zZ32uGtudJ}KU;VXOluUw#VXtZv#(?1CVfE^-LE(~ll;nwCVTK6Mk>_qkTu&nUT;p0 zm6S=wOdahd&LBcPA^1JI4sTicGMI7`7Kh?OlZf?e`(Oi@E-9CsnXNBC0jm(g<%L4D zuZy2s2%Ai0L5s9uQWWe(hL6j=$K_$~VGfrl30&iv!FlY zv%vf;Y){1{QIw`A!iJDUzGCXzC-CD+**T@3rc5?x0(rK)0=DD#1Kh|7;h9J~+>uFw zj+K^l;=s+x+h)|fd9!e9QIKk+6E}}+wostvvc>@77aeeOnw&dh2A3`dwvLKd zQvf4AdSMp3^-obVYJ5ECu4JowzH^sT7J1aH@*H|W9EaISAu4e&Qh8x^nd2)@Tj4!b zc!(i6GEIN@SRlM2DQw`Xu;Nu}FP-|mEa8V44~lvS*wF+F{8Io_OMiJUn(gFmfa9G-> zoWt-9jqWMP2RXH+;Z1_$)?l+!iKGM70rjxG6aZvB42Zp9tJbU|4GM?dMW4F+M<;ob zDwuT2b_gMZy7?9^HZ}1;{R=TF9NZ+!-rDkN_sikr8|YMNqGZo%Ej@`8!Mqf}EH}+b zQR=dlewbiU=1gVp+4TbE0_UFS8@JVAjcB|^$>b6=WG%i3HLa6;zwoS<(eFue;b;5> zP1t+-xvP3I)mq(~3U+2OlZ5dDmQG!lN6yf(*#k=>htX1ac{8wOjm}X_@+@SM_CVj% zwQFeluI5clTJ0P$+A$+vE@PuYu91mxdvV*d{HD1b!TCh;!HQ9XGme4MG1&{*Qx%4! zYW}vv!ods^{3YK6Iawkg9v$Cr&T9JbPcABWNqLIvHf4FtgzdOEC!(}37|}QtmT&b1 zUe|_@^qQhU%8qcq&l$c31(Mb6hy)>H;9~nwV_~5?(=>A$!z*R^2$M_0a}Z+WV-QYX zJaG-)6laTy>J(#{@0f_AVu#{mY(@>NAIgt#cLw|*;`v=gjbYOa7Xok0)F&kuo4#{Q z5xW!-(mS|=B~|DsVCjZCat_mMd_gzkQJYjLJvX=*N!g)&Z%jGL8s(b6C2uBu(NDwH zuOO9~M=W-p!6N(=Pomgo0kRVm_RBTG9`h};6}}V7JIG%NpjK(=nG%nfSEPXh*ZB?} zQMKIp+0YYFD^{l>`R$Y0%rJ)0>UcJR-q5mE12PMn3Y}0a8xA~^G!@l)#16fRwBmy~ z4I3QaT1^UM(9tEzAq@l2GD~ewJ(sW0i2im9|9w84SET3y?6dWO#fUKGvjrpi(LWTW z=mRWg;8r9`)}n^5px2Z;m(FlZ@dA=bUS()mnv&X=KCS5Z@3U_1uTrOsf}=Xuaz^t zS?3z{B{dcYROk3NS_M zZ@rVu@&Mf9Wn6AQRnM&edxnYMr1;ioA~*bV-O?%%mafdGBoNo~4?E6+HD^rCoW%#4 zyTypwOC`_hL^gEknI8=Os5Y}@13Y#6Q=_G8PW2l@{UHWtd1%$Jy*0J~VcxoYzT^{` zV43oE$2UTMD#;u`1RRbsjfAsXFgB-_x(rX){j3sIGL)<#%bx7w_zQz8ri?AJZ7SoL zR1tAvxex33#)|q84Hc9;lSQCPJhd21wyK`^@@^Qm3p*@A=DZk^F^8>p4#W`K{R1~c zn;C!dSFOH)Lif6P6RVn3>FxzaMd!@)q-YDM*!nLc z!1EGoJl*kO?2+n1)!^T!oh>mGCF{_J(`PtUvDcw?M6n8I((7y}8qu8i4J}L?dz~@k zt;^_VI4VX$D_&(Hj{KP#(c1>Zb0%)NL)I~+x{bc93%uWVY440<4zB|8_%f49?;Ji9 zvyCqHW}kI2g{MdG2P$W}y@g2* zeLiabcC5If+dE%y%DLejTG!Iu4l51WDLW8BF_PwL?{ln%8ct$)q-(wT!c&(Wk`kYY zs6<0+(t$zOUy$~cUh6!%$}iN>=wlTSTGKG|3P2#8V)qR2Fqva^!s;5(*~ z0z4N z&TD{9`O~rfd=*-HhFMk$nGnTnb@Dkb;T!L`iymS^*q2`WLn;A-taxd%Z5V&)?%f{|l8;|Fs4vF2VO%H6qCO&noT25r5D3 zv=RSn886zoUR| z|AV?%8e!tkgB^WtKHT?-_MGm+n-p5A6lQC9J#G_&yTN?7&m;RF$Scm7!?MtW z!bf@f1tM2|_f%6$d=-e9RVq5QHL43|9k&yTM_12gs&kXO>it(Jh*9kueb2OrpTh8< z_+n+72J0c7eX|K%+%T&gqz3@J$BvfG2lS`P)!UiD?Jo9yF66w%H-Wx#RUV@=7%9lObNsoo^gIj%w#q8D}0Ic3dCx!YDLlu z(PgqOlc?7d;P`oYJpx_4FCL$#$9u>2MR{+^=EgSob7d|cal6+>hYAgrsrwzZ>e)7C z8m_f&-vX>A=-BjG$4UVq`lKW_-P~D9tMW4p3ez*l+dl7a2M5o)ds*&bBVYB2d$@Rc zxVd1lEG9$ptzs->F2G;w=hP1eVDK}2<&ji^7Z;TUfSob4_j^MM$1(Hz&FaPKM6dOR zFz{;G7#=X5o$p2{Ss{sxOVIXQ%S+{REy z9s4ru6A)U|lV~#N0pgU{$atpGh7)32VKH|}D`i)heA~piL_PdmpPc;uPraX2^U^!2 zi*4dSYDB44d4AwR%Ma_N2=cW;TM9%StzzIGd~2$i-&OtNKFz5WRF}TcM;y?yPrptd zW4#T4uAKm`sZ>Hdj@Jl5IT-O^MoXrU$xTJ|~e-;)pQ6RqTw1kyOoxp>5qj&;MZ~toV`x$M4KCC4= zE4}~$w}@Q(+8GGp;?2VfHeFz)=1qxkH{~Fn_=h$tUP^pV^679r@xqG-HzsHkT(}`v zi+w7T`3Igg!(^3!&DtlCDk4c`?*oPGeF%X#ILj87*QN&Bqky7tQaCyKMZv~K;E?|r zbqE=$97UGgYeVf&s>5tmVw-LiDg9+?s4g-E2N8bK~`+$0#A4Anq75Vjg`FR z>LV__l2zIeyjp`Pa=!UBwrHBbB9C}UK$e#&n_M+P&><+ImYOEZer-!Tda?X$h@^t%xN5_Hqlprz9{=Ph<5e zAh4NOVr6>WH~Cae%a|}gE)EAp@zV5+)qSkwZ3O=QQnvG?kl!!=8AutM|J!N61gLjW z5c@=zM__Fo^dh;Uv8+8oRI5nH|6Jp?1w7Ex*#a&FPi_Gp9BOO4w3nN%ehx|pha)C% zaESeQpYt4KSFMA5yiQePk^p89Zz{ETYTgfIdo+eo$29E}bxpb)ZkL%t7ncp5bLQR9NcK}6bYfhy_T2)sCXG8kGAKG8k!+>}ZeqyN* z|y0kyrKVg=g6nN8zg0=oH9Q2JWfDYHzNj;AR zjc*wXuD(z%?!jyXL7Z)y=*aN-7uEF6J!ZAdEtl42+1hs8A+?G@yKCzB+I8vK=7XkM z#nyoKzkrr}v)fMry7zEAarJlqK<9~p-d}0Cqhk9*;ShVB?aH^Y;^DJw?(ukN%kJQB z=X0y27j!~1kJAC7>0Mske%rtDy?x^6d+t`Se|QawD|ySEL~(uMU1O^#Tk0OLOjud= zbzd0h0@-)Guyuj1dM@e`jH|ktuC_O9aO4>_i{DDBgm~QA>=$(**H??ZX)5eaf4?*? zugb?+YfDMtt{$YA&myhqXxz>C!kQ_bcnz<~kyTSvus+c{PurpQ&(sX5yq|$SZa@f_ zXQ11OP@1lrh2G#4&+i&t^BeOu#+_bRzv)>Akeivv2N>ACM(&6(`B00~+z|;gO*)-H zKe2hfh5o?oTw}s=6)%SYW7uE*R6m=N(PYkMq(np8jJRU z(TrY^Fn+UwYj#LGG9W8-DUo3#MLLYS?ckigJ6kH47>L#`lCxX{?-=cd`^8I}Muz$w z?O3}4S(GqeDS&<6f?Aduezne4b1cqZfd3P|M0ys!A~oC!>>?dq*u01H$5;bFeoXpL z&X$a=a(_Yf=MRZa*4NUgzAzsKobY3k###Uhl;2sR^fLP>=D zuQClzswk3hvS?q1x9r{XUf6uJyFxRFGorua)yRac1;;Z5oZa%2PhN zm%-Wh)U+>@rj|$S&VBWR9nKJW!G?)*0rTt1{+PZ*Fkj!jFwEZV#GWB+fQLy-{LOdv zTD&8qH?kW_LYtAts*o~M>hIOcek$pka=Ub7isMp}g|FtA+J|-Nfvqu2#z;^t(D;%z z90?MncSJuMFK#Qy5k`#bkX4w3XejWPv)sEQPaR+!a2kBY@VBrkT<$ay1;}^v;i~;I zpJK@qzi)iawL;VW#oOHh*+R8JI^`^G$0w<=K6xx6))bZ`3FnKC9e-ZH?TLcJN%SMZ zbSim?qenZ~&OUHq7-)*xl-7n^vryla&FrFgraEU01#%QfF&)6!yVuwBXS>Pi)2XCVMvU)vB%Z zM=!uSwM_oUhF+EWVJgBHq9U0f6@H{gK%$ZXTiwod<>AtNcQQt!Bt_0*cZK?m(jk|# zr9zG$cr5eG{A`$4wUVLp$$9XU#aL4$%0Pbvb~+%({AVUd7dwP$QhI3FUTtoMjpqh* zN7emkdIAFr85+B5(Lw_^vCNb)41TR-rwLx9W+TlUp*}{)+}e)mk0inC$5Q+iJeWcK zRCc85+|$$Nf*EEUAg%jB9~Fml&N@;Vo^SZvy1UxTj|;s{?#)t39N(*^+G&~gD!Quq zm-W5OySHySv&)>4K!+-(_pg7GuZi4ko(CO4%5GuquGF!iKMe2av<&crFKvGjlFG>a zi9<$VeluaX&p8p8EkT(LRTAaM)w+A_{rp(VW`Z<0a*Qr9ibi<2yEr}Gco5!{9pLJP z+F1JFnhR$Bet>6J9^JJA*m(GY7hkqgg2qh+2B`j_jOt!UjgLm)Y`Ueeq&fHF!zSj- z@uJPfeJ}QqQW1#zc?OJ715$9J&6{HuV_46^2>VJm)K8uUXTIjw))gw&qqukK-%xXM zI`X=H0N*TzYAo}V$?Z_1RN-VqCt=1zR7vT8UpUDjtS!VS)-FNa@!SfUM$HCAT_6ia z%T&XbPLWKd1u7`C`fUdyWapuU1cvV`SD~~hZ=%EVatov=4J|PUNi#)XvEhBq%n%?N zDkB3H01?+g%JClQ)?Zq3ctt?pf=cz@=6MfG!(L*Sg_fpJ+)<;=4<0Q0BFjF(4 zUf)|WEJt086&_jVsCwe*DOs7^kt+1kB;kt3iV{@N`RO)Qio!D}#54o=3^;w+jCVzg z0dx8O=0@e1OSPFQcoqPNEU|^rI-!$ztW|B0sMV+t?N>mq$~e)M_c%ANx)E} zx`ddEO5EbV^Wyq`34y35jm4LXbzM#j>p%zIJs8K)-jz3AL8-abwF3AmCyT~;|DULC z;2~C9{t+yZ;;E{&()NEWq8%$5S5N$BTZTl+1A$Kj6tS9F(tpNP9?g;e_Wu6RGwz3S z=6}BNFFFM(&$sGEy%jTHQ#}8l&@y)CEwAo|L80}=SH#mCo>aMz@QS<2Kb*6IchU89 zsY4co499KdGI9BGC$0XDGe+o*4DyN;z0$(h0Y()JRNm_76G}d8J#BD0s@q zVSdJx4WmP4*2gP^c zX|0jiV$k^{x)^r0&b%^UsF2fvU7`Vtf#}Xnia4?Xkn&^bqirObCfNYpY_U1raU*<& zIVc2lo!_Wb%zM)Q(o6@DAZ5VdvT6;IJQQFzyqFw3MMFT|Mxs?Tf3)&~+SBUeq*y9T ztY*f5!x~tw*CfW5$_LLP|ATq?`qJ)!!Z@kD*HVxppNhK`?l=;4alc+c)LeBJm*ytA zWW28wZlr;sW{^P!Gs(jJoN%N)4V}3-yYCF-a=Hk%v@l!ED{Fky>}*GMWSx0$J#HFm z{K^x-;7Lh7=HAc>7(Z1#!&3LyR{EJ?-AYqJT^SACj>B#3`jPb{#?&FbDi>rHEru1L zjP=E!**XDF6_YX;)dX!RU!3cED>AZmf*jNfy~^#$hmM8Tacgl*vnpa}QpxbuR0HEX z>c`m62o&M5BoyHrA!>d&(+7^PA-lnfylo#dNOn&`)P6ayuCEVuDqllxErh6t(jIY> zg+E6Ay4paMA7XPvF`PQv^{0dtyIjsc$!SAllvqE{C@@27i5Ga{mia7gy{ z{uVOq*HC3H77-lTKTlH0qcH1lb;M8uKG+dGF#$JZb~W4z|A(gV)aouF5dHZ0Bl^+J z?a}?oe|2kZ)3@OXa{W@{<3pK}{7}GVyR+u>PftSebI3oM!U$&wuQCYsF=OZA;#b76 zAZN*b5;;6$2K2su989KC+`pM$2cC44KnYlepdVp1)y&Co7R(2llDXhc+o6&ta1{Z} zK+(jIlaEzEe7pmf?jNWbI1Rmm2<^-PRFtI#5SXpsXLOJ=ItD-z41sQlRH(I8Cr{v8 zW{4v;TJu~pSdb<5NM$bpwP0(j$f`%unj)~0h~Os_@w6nmt|6+p&o$(Zo??V{7HjWjNI?9CKSV7)2hYm6kjCg+nSV`KeB!)AbMRS*ZtGdn$g6T~kYp44eF*rKqr6mb2Yxco*`U7*6Ya*J(Jc0 zdAq+&svIBN?-tFPR|bBk$yB+V%q9Hb^D_M>#l@^&N9?|PB==h;wgNc7fCcZlj`l~= zS)&7IV_UgDo+sQiI@aw2zV!oP{^4spgxv#kJcQoy|LIX)Iou;l{0qsgonxZd|AyJ^ zKhriABmcES*6ZQ_+DH`Zd5b)<6#egFg%by#a*o%o-nln|?%oF2jPBkW_>Y)}!P=uM zUB{)S`gWSz-MDGdmI5!|qOiS2uMbh%QVDkz8)EDaMz>qQ*mvacSu8F5iiTem?YP6~ zsd^FM?(Fmz4{AviWQSjb$nm0tu7$O{30N$!;qKs52=7W*Y}1?@p`xb8u&2?61t`UtOn-PPF>$TS|lP4{M4RH<`$Ytrd}}V!-it z99cNj$qss~7W>4~`jVgP-J8yalt{s!xX z6;dQG-XR?xHvcUu&$ns)1&nU7*uyffm2|;4$~z0@|1ancEG3d2d@@%{%RCELOZ|A) z-o|#LJXP2R@f+Y^8DKq2n~QYP~>4D_mbRf9{rBj zn^y~65@|vxctXIJiz!=n3PXcPC^}U}X``8Cl##OIK`2@_WYn_7Lp0F(r+Y=a^iHx$ z>9iEA#o}TxZ1jdRj+D;o56g<@a=x#?qoPOYj4Mpw5kpU|khfhz50m%i^JP!l=!PU@qJqn|D!$Gwj1 zICHNyb5dj3J-asmfJkw+JT?E7T`GA*1C{I~OPs%XrIqwa#tsrvSX8LgUkvG#nFHCO zx+?ep9AJ_ayn>h?*yxm1hS=@2RHJgrO&>Nao{PxdYS8QQfs&$52cGdAV){Y=EGxLl zg_$D8E>0skc?G7%*Z+b_0?x|5__tzy0sl3WQga2)2QuWQV~%RpS3LR;VXZs~Pn@YmyE2VFig1PoZ>k zR@+{>R5u|Ur$kvRC&ROAa{}?Au~-PZ2OGH6Z__xt$fQ^=Td%-4mpQX^e}QKSmsl8C ziDBr`zcOK%WDa$V5>l~H$T~_-v6noC)C)e0FVVx+e(7-|bHB*=>*SLQeC*hQ#u#*>~`QtU!i<7Xq9FL~fv#wNu2kak` zTMEjua}z_9*rQiXSoIcSsbP;*_%rJLuwuMUG+o})c1u6WS1lAeotd@Z2>{uCMB_>n z^~edO&7SO^Fn)xXb@VZ1h%I2N9!XVsgOKPKarRTx=QU?iL6OeozmM5Gb28Qb^F z@xCuL^NFZhP04?RE+iYkb!MW$i>m?Gu<^eo9Qs)GbJBb1K{|iCh-7fB#=2jIb=#nX zw?2lst%rNl9TJ07ppM^4DsM` zXK@WTOZM1pSzo@w6wjbIQuOkVt*gc=fmss<9$Nad?pMC;V;chH(?7eeL(jI18##_S^Jk@d}2i3ZJtoyS?~!#mLRg z$Ik)VXufV?FN|{={_nKVFiwguQnB z(1z2g0CWm}n5^`gvrl9sSn6fVYz{m+M|Lr!At3(nh9dJoo$9uSO^to)tT2X1K)++g z+sxm){!pM)44w{EM0NLN{hKaB``m4GhvNpY{( z9ckE77Zqn}fL%me1N*^WM@rlde|MoePC7!Fi8DL6!3~RTJPfEimRe> z48~Qj*w(oPW{wpT$I;kKBG${eB2dMf5S_Cng~@&qsa6>3jy@HIldM1q;&dY_Q#L(_ z_n)>e|L&1-A0ofr0beWOBnV&GkQ9JU9gbNfcjh z=fMZNGrgIZs4^2=$!U?fF!~+sNA4r@MF^Ol5#^YNM!D;I+eQ}GDk6E<%e12XFhlZ5 z4AB}$ipb6sURR^2Sk-;NUS&rUEoFhbA~>hyQAy$hmasoJ@~;LmH_O= zD>>QeVpL@JqLYkUel^RR9#`e0aUP}URCvdf1?M_(cr3tUp8SA1Rt@6!{U+U-DSgQB z&ef^pHP)z&zoRRMNEB?=B}xWu9B%~dq(;`XB9Y6>5_uyu^&&K`Z1u@}1cJQB;XN90 z9JK1^Gb0flq;%jtE#^oMW20s33zYiffgda^s-Xbj9hEnohA;7XzV_@?4vQNzsj|nyjheEeF*EC z`c==p=ls!}jyo(K`}@4cEYp1BJd8*C8GqLRV_3AQ@0?ole>sl&@h;sa zc^3|<7HOlXOCpm6;a`TzD@)kD*uQKC<(?Egs#Oo5mxh~$E!@2Eu|};GU(ew8N`jNp zd;=qn;$dLQL*qI;R~ZN_^5d0naKlcESArika?d_jYC;QBvt*%{vlAstth?P|G={>>q_ zo3v^+HHYil^RQF@Bz-pIe@X<;Ud$FGxUnZ7@z%-Xo$@@>opZ$hc_%fG6AN;|9fu9{ zs}ahd4kTb+6c6IgSnn6wgkPEO=BHF$Xk@2etk{MBCSpDOq9z)ViVV-r=>n8MLI2`) zqB-tA<#?a^J0>QR>`G>B(%{Um!(7%vx<4S<|Isswj-A=br>uDI8i-R#7=hSTR7hWvM7+6+=Z&}uUU!RR; z>I)*Aa!icRoXDYD)#Y$bi7llSw5!Oo7X2gr@DP7Wy31KoWuf|uy;4PM>N^Bs%}3al ziG1^K#TQ*zpbwa8NfmN6d`(xB_@A2;V*Qi9D2Z){t+~1dGAil?Ugws9daD5jfqO&kxyx5Ye6-3CD&F5eDNV*X zE9xvWhi;TN23L5XIXH*!7ie(f==Fr8+4d=I1NiGP6s+Rvia4PHGzy&V8(sNl4 z>6l|~XAM1-QK#fDd~ zCTKz@UnK5{&nZfQD0%GnD&}?fDyMPo7v=)~;LYc+1@%$L!3@8LkOWH?v{CfrP~=Ih zP0u@gdOX=5AzgK8Sw+odZ3mT>pW%SxPPY*uT6-AlBCMgDKc_3XYl1b3^Kzav5=Rx+&ju1~PmtiNagL@hHPG?tR zwbVfP+#W;-4|Ac>EZB$jE0;pF>&&PG2Snqq(;j60zB=@Db^USt*w2&E$85`c%}xAr zuX%hXbkVs_SvvCANNAxUAx;nVFw;)xe2L*YvZgQj2sd6~{0(il?Gb#lQ9}60DSae) z0{X`^Cmj}0W()e$Ww4PO4Am>%+8u}0bMTd5=8Zgr_&CAiQac$st5Ip0qm4i?1J^7kZq39-S zoqNjVMWtSo_R+^`T$02+)_xHD6g(O|r z@3MgD{cOkAPCwn^(*r(prizy|a*<<~$Jj+jS zQ6sXkjw$;CZ&|tT>gy+JT-J41wck!bK6EL z?=*EiOa;Dq5UOIQdt~H$P+dN{-N{UB)=@mHf`D`3b-h;`iw&TwtMe<3N6_5m@y~5g z9$5{IU<}_C_)QYW-W-I=tXHd!G4Gl8UlKX_a5W7!Q=hA$s4b{Vs1p!V*&cQMlsfv*?m zFApHh3d}!v^yP~FPXE*`dl8-27>4;<*>O5$>=ZONsK-_zK~d=bt$lb%rIgmk3-#bU zumSHbUm|b0oab{^*-&KDMpu5q%m;s93(sqVBmv=q_5{;GjJ!@}nZ>7-jx`C?0lLzw*9PbcgX4bdUOB>|+B` z3d~id4+s($mFNnGbQwn9eHnT;p@0-Ed02A*8Krg*<$Mu zG8R?(Q3QT2^|t3i5=FM~Hl~DXmn|LQP019+w%(~B2!lNL)SWj>H9Y#-brVeQ5wzKT zr1lQlnyzgH@rgNI_^W->w!7u|Y3Wb0xAldGuNZ!6>#hjDJwP0J*4&@e#Q7BXiQs%> z{KsFS=!ovKcN2#g^hRE>@+v^4d+M+qCj7yl3cpzkqDJ!+-MSW1?ah~(K^SyxdtsgW z6*sJ)`5VKO@#~09prsL}0=*Vez+jMwd`(+-nsgUgFNe@pXm-HWBiK*Q9JMfLjE@q} z&9bFMkx%`-bn&MfF!vXKcL}wRtCy|O5r2Lu?QPH-zj>I%J(&AV_7k|jb&D%Yk-{l- zi|!!$72IbN(^R(}GjQ^*+r#uTdh1Uo2FQ+J`d-zxDu& z&jsJWHW$JD6Oz97_I2J*x>xV8x^DN?vXsSvPYs}A-37#HG{~z*MW=1Wt&r@++BDzeg=Ei9Q5kX4QAKY6*%zQrn0^tXiFk?~nT^(T^V zDBu`{fLL9%VZkTMWbYN_ko?F02-E^A{m@y$_`Sty*ZP0HTe1I-_ILKY{r^eQU(gs! zNq7Rcoa_14w$e{_K&%EcgGue(18CcpD7_<#FhKHF0NXa6a#ldYnn2@bEa6isPN z#Ne-ixJd_p4JP<%@Yg^t)ZdKL+2F7L|KKm^J?4~U0-YY8h(VBY26xH^G$MFQXXorc zgWy_(EFxQjFFmrqL z&h-q-c)}hw>R#!rK7`qp^-hmq+J|T0Q}OPl{k-zjW!`Ij(##*QOpAK%|7KPDV<;OFf%glAL%i_bz zJ?o{CmNbeWr5Y+dZ?DBruvEeO(znLfJ8_)O@vfe*J3QZMyXn4yLK4ZB_7S4|l_CnS z9WuWB8s6$GRg50y<<3f-{vFT8cRZ`qe~?!_E0zBF-uQGyNz1&Aoox1fnwqEAY;8fG zey%>ovHAo@xhZL0mq1TW~6#d3Y_ z8p3OSgU97?92XrD0s4@jW3_lycOyp)0J7;fq0}L#QmN{O`#zT0i}rMva43Rse>liK?Z?T2UBfGQ2%~AHmZqJ=d~-M)pKf$d=)E7(K%Z~Fg)@;) YKKbO+pCSG400030|1EwmMgY(P03R~Oga7~l diff --git a/bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.9.tgz b/bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.9.tgz new file mode 100644 index 0000000000000000000000000000000000000000..e24b343f6f015644e8eba9d5fec657603ad0b566 GIT binary patch literal 18183 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 literal 0 HcmV?d00001 diff --git a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpcluster-crd.yaml b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpcluster-crd.yaml index c1feccb19..451c08ca1 100644 --- a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpcluster-crd.yaml +++ b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpcluster-crd.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: name: gcpclusters.infrastructure.cluster.x-k8s.io annotations: - cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" . }}-serving-cert' + cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-serving-cert' controller-gen.kubebuilder.io/version: v0.11.3 labels: clusterctl.cluster.x-k8s.io: "" @@ -18,7 +18,7 @@ spec: clientConfig: caBundle: Cg== service: - name: '{{ include "cluster-api-provider-gcp.fullname" . }}-webhook-service' + name: '{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-webhook-service' namespace: '{{ .Release.Namespace }}' path: /convert conversionReviewVersions: diff --git a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpclustertemplate-crd.yaml b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpclustertemplate-crd.yaml index c7e1694cb..1e78e09fd 100644 --- a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpclustertemplate-crd.yaml +++ b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpclustertemplate-crd.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: name: gcpclustertemplates.infrastructure.cluster.x-k8s.io annotations: - cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" . }}-serving-cert' + cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-serving-cert' controller-gen.kubebuilder.io/version: v0.11.3 labels: clusterctl.cluster.x-k8s.io: "" @@ -18,7 +18,7 @@ spec: clientConfig: caBundle: Cg== service: - name: '{{ include "cluster-api-provider-gcp.fullname" . }}-webhook-service' + name: '{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-webhook-service' namespace: '{{ .Release.Namespace }}' path: /convert conversionReviewVersions: diff --git a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachine-crd.yaml b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachine-crd.yaml index b4654dcb6..fcbb6a6c0 100644 --- a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachine-crd.yaml +++ b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachine-crd.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: name: gcpmachines.infrastructure.cluster.x-k8s.io annotations: - cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" . }}-serving-cert' + cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-serving-cert' controller-gen.kubebuilder.io/version: v0.11.3 labels: clusterctl.cluster.x-k8s.io: "" @@ -18,7 +18,7 @@ spec: clientConfig: caBundle: Cg== service: - name: '{{ include "cluster-api-provider-gcp.fullname" . }}-webhook-service' + name: '{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-webhook-service' namespace: '{{ .Release.Namespace }}' path: /convert conversionReviewVersions: diff --git a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachinetemplate-crd.yaml b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachinetemplate-crd.yaml index 23ae05f74..34d92fce5 100644 --- a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachinetemplate-crd.yaml +++ b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachinetemplate-crd.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: name: gcpmachinetemplates.infrastructure.cluster.x-k8s.io annotations: - cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" . }}-serving-cert' + cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-serving-cert' controller-gen.kubebuilder.io/version: v0.11.3 labels: clusterctl.cluster.x-k8s.io: "" @@ -18,7 +18,7 @@ spec: clientConfig: caBundle: Cg== service: - name: '{{ include "cluster-api-provider-gcp.fullname" . }}-webhook-service' + name: '{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-webhook-service' namespace: '{{ .Release.Namespace }}' path: /convert conversionReviewVersions: diff --git a/bootstrap/helm/cluster-api-provider-gcp/values.yaml b/bootstrap/helm/cluster-api-provider-gcp/values.yaml index ca3ba2d99..94251785b 100644 --- a/bootstrap/helm/cluster-api-provider-gcp/values.yaml +++ b/bootstrap/helm/cluster-api-provider-gcp/values.yaml @@ -11,7 +11,7 @@ cluster-api-provider-gcp: manager: image: repository: ghcr.io/pluralsh/cluster-api-gcp-controller - tag: v1.4.5 + tag: v1.4.7 bootstrapMode: false job: diff --git a/bootstrap/helm/cluster-api-provider-gcp/values.yaml.tpl b/bootstrap/helm/cluster-api-provider-gcp/values.yaml.tpl index 8f2eb20d3..a417d2cf6 100644 --- a/bootstrap/helm/cluster-api-provider-gcp/values.yaml.tpl +++ b/bootstrap/helm/cluster-api-provider-gcp/values.yaml.tpl @@ -1,4 +1,5 @@ cluster-api-provider-gcp: - serviceAccount: - annotations: - iam.gke.io/gcp-service-account: {{ importValue "Terraform" "capi_sa_workload_identity_email" }} + serviceAccounts: + manager: + annotations: + iam.gke.io/gcp-service-account: {{ importValue "Terraform" "capi_sa_workload_identity_email" }} diff --git a/bootstrap/terraform/gcp-bootstrap/deps.yaml b/bootstrap/terraform/gcp-bootstrap/deps.yaml index 7641bf59b..d165e191d 100644 --- a/bootstrap/terraform/gcp-bootstrap/deps.yaml +++ b/bootstrap/terraform/gcp-bootstrap/deps.yaml @@ -2,7 +2,7 @@ apiVersion: plural.sh/v1alpha1 kind: Dependencies metadata: description: Creates a GKE cluster and adds initial configuration - version: 0.2.25 + version: 0.2.26 spec: dependencies: [] providers: diff --git a/bootstrap/terraform/gcp-bootstrap/main.tf b/bootstrap/terraform/gcp-bootstrap/main.tf index c46da946e..75bbbadc8 100644 --- a/bootstrap/terraform/gcp-bootstrap/main.tf +++ b/bootstrap/terraform/gcp-bootstrap/main.tf @@ -164,12 +164,12 @@ module "certmanager-workload-identity" { module "capi-workload-identity" { source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" - name = "${var.cluster_name}-cluster-api-provider-gcp" + name = "${var.cluster_name}-capg" namespace = var.namespace project_id = var.gcp_project_id use_existing_k8s_sa = true annotate_k8s_sa = false - k8s_sa_name = "bootstrap-cluster-api-provider-gcp" + k8s_sa_name = "${var.namespace}-capg-manager" roles = [ "roles/iam.serviceAccountUser", "roles/iam.workloadIdentityUser",