From ce1c9c19af6b1d8e6019bf1c910a35b06040cc6a Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Mon, 18 Dec 2023 13:28:38 +0100 Subject: [PATCH 1/2] Dropping yaml anchors - we have helm tpls for the same purpose --- Makefile | 2 +- charts/common/templates/_envFromRef.yaml | 2 +- charts/common/templates/_volumeMountsRef.yaml | 2 +- charts/cron-job/charts/common-0.4.0.tgz | Bin 2148 -> 2140 bytes charts/onechart/charts/common-0.4.0.tgz | Bin 2148 -> 2140 bytes charts/onechart/templates/deployment.yaml | 13 +++++-------- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 39253639..3f5c12ad 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ package: debug: helm dependency update charts/onechart - helm template my+release charts/onechart/ -f values.yaml --debug + helm template my-release charts/onechart/ -f values.yaml --debug debug-cron-job: helm dependency update charts/cron-job diff --git a/charts/common/templates/_envFromRef.yaml b/charts/common/templates/_envFromRef.yaml index fab37586..e8543cbe 100644 --- a/charts/common/templates/_envFromRef.yaml +++ b/charts/common/templates/_envFromRef.yaml @@ -1,6 +1,6 @@ {{- define "common.envFromRef.tpl" -}} {{- if or (or (or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName) .Values.existingConfigMaps) .Values.existingSecrets -}} -envFrom: &envFrom +envFrom: {{- if .Values.vars }} - configMapRef: name: {{ template "common.robustName" .Release.Name }} diff --git a/charts/common/templates/_volumeMountsRef.yaml b/charts/common/templates/_volumeMountsRef.yaml index 3cf1e770..44393693 100644 --- a/charts/common/templates/_volumeMountsRef.yaml +++ b/charts/common/templates/_volumeMountsRef.yaml @@ -1,6 +1,6 @@ {{- define "common.volumeMountsRef.tpl" -}} {{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}} -volumeMounts: &volumeMounts +volumeMounts: {{- range .Values.volumes }} {{- if not (hasPrefix "init-" .name) }} - name: {{ .name }} diff --git a/charts/cron-job/charts/common-0.4.0.tgz b/charts/cron-job/charts/common-0.4.0.tgz index 4d48c21add550a3e55984c53c151d8b4c8ec46b1..4800e6773760afb181d8c67032b705e5295481e1 100644 GIT binary patch delta 2103 zcmV-72*~&35Zn-uJb(Re+c*;M-+GEUH;dimYFUoI00aG_NVj{3yS72HNO3@bf|kZM zHx#9kl+$dI!@a}3;XTQL)c1$&xOJUo*8|iQsUbNcIluWJ;|9JT@XpDc2xZ?8pFP_? zIgaBD`+f7j<2cp-oo@g5S+_svJ5FzKJnBDly2t(D@iTC~fqyJDilidqne)|SRX^^D z5DDo83P}S#hQ+bvp>zcel_|f1zajI%)q4Y`fq;KR6BHa3N{bU8#}MxxOWlMx21X}> zh#PB>_UG7r+p!+|3-`2&68%@`hm0tcosVw7r*!6%aBFa|PX7m^ZbknGgX7U&|93&R zw{7rnN;yI+-hT^rz5!IoTF}0~w=@@>f_*_)gwkFRA>sbsYPZ`~2|&8m73JO-PD~eX zNoe_~h({C|TL3X;+}=XE+p-}=Fo~pkM|^C7eTEE)L|Yg2C~-p>5;tyLVldS)7b6p7 zQV#@R1m-S_JcQO9ncp@jX2(1&u;C6kj4Z4+}|6S4C5VqiUMV%(H$Z8mOSbyee8u#s6qcDsRI8EWq7hBBv`BegJDJgM}y^Ye=RO0gHUh)FK9oDP@@I?>9k-pF%;onnLRb+5SPc;Ghf}w(jMy z2|W&);eR6?UE@nZ_%YmNcw*{L0HOkoj9`(gcbWX@Z|N*t_PirTQb zE4gwB8r!VuyRenlcmGwptM<4h{jcM{wsP?|?Fj#!fm8MW2E+ay|93(S_+QunE8M=E zD}M_GW3Mi*ta^NLis*evK1JBk$kNZ{qcZS`){_lcrZ#ze@p#B&nD$q);HT9*hr^TJ)7>+tRywPmdi9l_> zaDu4R|2saEens|XvDA$E+WX!s}hX4KNzwl3@ zCACXs^6Yp^XNW&@ZNZEOr=AaI7C z&oE@f#aE0$>+6CspJbz_m zc!d6Cdr7?R zFSLrR&F(EoCI{wE|?VBw|fot)qz54Y1=0NWw|GD5%RKsZg}9sfS}|DG^~S!)fHMxCs?{ zud{Q9EK;4C2vwU*`D^eth`35KaayuzD)boc+6j!B37^`Dvz;4?VV=U%ES;kwzpYnI z+P|R6+Zt=#*xvZp6>v{MBY&QW;^dd|UJnlJ(^hNO;SU#uKOQZ^|7~Uf*WrJ6)T`ou zcR1YR|1M}L{#UU-cMX?izqf|i-{JL;-5`JCos))BhPBsEz6_{0o%cFk@8SBXQ62x| z_}=&(ayyp**5UuishYTUn>G+XEMplw49C~WLKaG>>~Kh hvKP_~JnZ~A5M)n#+S5~|{|5j7|Njs^+8Y2u001%gD$M`@ delta 2111 zcmV-F2*CH;5abY$Jb!y{+c*->-})4DPWF*pEX(l=Fwj4Wbh~%BYa1ks6bA$-XlZP7 zLs2S8In5?H+;_Ndc%S4z>S4WX$F1u$TMtlIq=w{(yIu3Y<2dF2op$$Ruifo+22QWj?>c)<`=s0N?Sbh^k1PLGNMqnKDYrN(}_>Qjlsbx{qGIhCH?R9Iww2*-v-^? zHNnF%`THTl=h4W2@elev)Qx?0MfRuDffnOYPxts zLd!=*Jfg_Z0*Eo=?hex3mJKO_Q6$w{;$s8sb7V*)+PbJmi5tq0xN++OgQgKVGx__A8vT!?3jEiU;pv8uV5R=|`X&7z^g7N? z|F=PP`d_mF3P=!ZNTw43i+s$~A_j^vWti&kS3!xNLqWM3L*ob8{6RM0pa>hb?&Yu! zJr3&OBYz!T<4aEXA>3zpV(L!=t~6+r;3N6;SkD2zaiz~uRsWICUW>p#$ML2dfED`R z9yn$Hzt`{V{Qs>`jsE90K-mEZ1pHk7m$!|F^P)sop!$WA5kv3r5a#uSp?6{4%6zr1 zcx$vat;0`LD#|ArPRQ!Jq$49_BKQz~Or93`Eq?$_aMMoDaUA;$pY5QOl)VU#WkHkS z036ood!p2xV9hnzbvl0iZ zmZCE3+^1Z+1hs9J^_|<(tGoZA-Bo$~GX1aOzqWGmr)&xTot{(n|9bu2F8VQnab?-#i&I4JLh>=fdUx*;4&B=R+`@QH=5@6`mK*iE$lYfZ%zXw` z^?!;iL?QLsZ)l8_`hU_b>%Y_Q?(}~fba&S}f*JLPAW?xptXS2ti=M$8&8%bV61 z$Uxu(Kb>R9h>I^7gT~d>`@c58hDNgi_aNdo(D=|uYFKcC0`5VHh`Z45m`CbgM1SKk z{bYEG$nex_x(-$KKb*N6J_uSB|8<{jHqcYqhg~Us@qpI&z!~|hiR7wIfNO$STh1xm~A@KHBup0m*xwMkdJdka`LR} zhs;xA;mm!>d7y|6ni9{0%q!-3Ykw8|i}2|P?XY?^px zUY(288s|v7_kt>X$6ag`rIjiWWTGcYCbH&h-e!?fl`jW`kXe948i5}pluD){QPMi; zivCd$ul*}6BWu0;_0&4_oT-ZcaWMOOgHhm0{BM`>zdz{rclf^zs=@!t27g#$49dLn zt6=zuDo%WAyMf=DwFwKSq@6{Z^VG{0z`O$3@dPB{q@5SkWsy`Unm5$LAvBbTu#w?3 za#!4j3cXj^xkDDIj!lHBO{V-UcoRfir3pAK**Fz?2=~ndM$Lqe?Znxh8;brsbEjEa zM|pl*ubQ-fMKy10taWXB<9}b5z&!ga73Xuw<2Dv)`xwE6{ ziGDtq(4*$X8N!eG;^VVZQzFj3|KASu%c7TDd+&6ScBU$r9XllTX?X~DIn84d zWA5_NMA|I7D^`W$knU>S>!wj0zHw8$W&uI2q-G;e% zAin2OXkTO~1SUD*l5$vgN;52tT|8&Xx^{K(ZFNP8Tz7Yc0e{QQ*2-3uK4yuHhuS^7 zrd^MN&Ft_byPdY4;02+-z-DhnnzilmQmN|4{hs5~#Qxh;WImnnK;Y)bSb6`a(<}e| z=fK(h{l`{lAI^wUD7XX_K)eIsW{Mm}5oI3b69|cWO(rO9Yaf1_QVB8&!$2qra*B+> zgasq;iE^iuPk)Xj0U4;&{ZiKb1Mj>pi08>*)8mqQ!0rwai$EwxD6 z7yzRjZOeXj@!>)R0GHCq-gPcOiuLR$8Os+ReU#kcIyAEIS`(~9Y&rGL_*oblGY zqY-hhqtM)alGc$eZ$j(H9+7M7$X3374g{T8NB_3=;W&~A8blKQ{^}QL*`Wx2M^{-k p^^mk;b`kt;*)!<|9=5&@1liG!cJy57{{a91|NkU~xu*a^004EFGr#}< diff --git a/charts/onechart/charts/common-0.4.0.tgz b/charts/onechart/charts/common-0.4.0.tgz index 4d48c21add550a3e55984c53c151d8b4c8ec46b1..2947d2e0251489a26f5d39fb61cb5535ccf08318 100644 GIT binary patch delta 2103 zcmV-72*~&35Zn-uJb(Re+c*;M-+GEUCyU+WVp)zq0vPBYMY`QP+_epoMT!Fg6tpz9 zxuGbPq?~4x9PSnq`T~qFj;M8>S zmV}m%ig-kkkp&QA#@!vHyDb}11mj4mcf`jQ*yqTQNVIiPj}kYOA#vl@B?eO+b1^bT zCiOr7Mquu;$U|t&koj$cVs^~a0vqmuQ|=*G(AUjl8Gm&%LHHD5{~B+PV1G^+j9%70 zTn}Ja;Nii@WEk(^Qxqs8jqV7!x8PAv=~FL!LJj&KNfr2SD8thYA;C)h9}Fw{e=<1k z@AQ8g)TI9n8=!;)v4&(i5wOU|Of6!dm{5kP{(cjb_$d^Ws|mDzknJC23--&fVe4KF zn$Tmv8Gk;~(KWslgdf3uh9{=}G~h~uMg=~SPmlE+;5%3P0@d{&`TUIt{BxXa$^lrR z|J`BT{ttUQ`@a=x(Eq{)s5$_FfS;=Winj3}FG_R;s-HO-GxQD)Ag?D3y$kbJ7OQo| zJEOH}9e$=#Q9jLZLe}3U9T_1L!AFbS6@WIlX@6hmIEh__FZN3+I$lP_s(i`t@n<%T zZ4fJF(-fE(jIj7!T7rAMSR`T!CWOhyi;+*^qb6cg!W0&vv>#SaN9MdWti=ARrKk;? zyOK+nps~%ez6)D%QGr%!t*I}4JuU7GM{wBD;f-dqP6cZ7 zm76V4GorvH9L5NdL=T88B#A+w3?kv8QGeMZAlxv>XzT?(pA#*u=n8?Y@SW&@ZNZEOr=AaIJG z&oN}g#aE0$>+0&mUt3^9tKEWo5b+ymeQYH)EVw}d_n<_?T^RPvBlRz$$%KA3Jbz_m zchwAzt&fN_k1g(nydQMgU`@Nn0-wrjXjNSl`%l9PyFb|Xo1@mZw5$c0I3#2+D zYF5ao*yxAq_BAasr-8^p+U0%$VMZ_43!d6Cdr7?R zFSLrR&F(FziI{wE|?VAlofh+O9TgCt3$?$lG|J$Gj{I6|*CB~r2D}TQUhL5S@ z#HY3!_?>x|uy97YS+tqwV736}HNcK1APFb!qM$B|q(afYp&pK)r9_0S45yL1;x<(1 zz0S@ZvPgAeB2;ZM<*&ipAmS>`#A(SUsn8?1ZznKnCVXNi&US7nhItB4vvdxN{I*^- zY5#&MZ)>b|V|(LYSHL|5jemG1ij!Z;dp$a^Pg|{Ahd*2t{&chm|2LTdT!sJLlU^17 zyTic_|F=O4@xO}wxofy6`@J#5{tmB)YzO%p@0>K8GOWCQ@?}81?!4FWdI#6fjq3Ox z$M?qXkej&#unPZAoa*`i@T9l9|GO1x!2jw7Sau1Zk`yYP|5qY|!haor!r4*%M86nJ z=uwN}j2@qlnh|*>&?IOnr>fm5-3e+hIP3QHFxm@_UxnHq&LB6*j6~zJLUmG1QW)iT zjhPGmqN(_Zz-kk6uO&7lSsUWL=j?U_+LSH7a4>mx5;yI;?^W{pF)44-J9bFw)A9)J3VO&S#@yATiL_aE zX{vsAXknXD&&7MO%RAiE?bnI`*_ll8GA*a$hZ#_%Z%P1{&uI2q-G+sDAin2OYF}n3 z1ttaIl5*H|N;9gAT|Q^Zx^{K(U42E$Tz7Y+0jtf{%2riAW`BvrhsHg;rj?I_&Ft_b zyQa3D;3c8I!h&x_nzgO-QmLB9{WHg>iT$@{$b35Gfxyj=vGV>;Z&3aF&*91L??1Le zdvHdSLct}d0OB10H#6igjwtgepF&97YcfS?TYK>9j7pGE7zRQ~kTYZqrYsnPPn0{O ze0l@|8BuhO#($I)>IwI(J>WPsNi=Q3baaLu+)y=xzZ}@0{ay&TX{klh#sC=QXj}H{ zi;ov75NPeesoAn{d3pgJ71FY&RCUa6EWTxre-|C|n^w%G9sQFQ<(zl&j>g2jjzV+y zNm_@tya}yCdrYpaLtFX!IS_Pe9sb+egG(Z45J~v^>oA|CWrrg84P9l~)I-vV*+uZ1 hWzVG>c-Z-KAjpn(w4>)r{|^8F|NnZcp7a1h005J-C(-}_ delta 2111 zcmV-F2*CH;5abY$Jb!y{+c*->-})4DPWF*pEX(l=Fwj4Wbh~%BYa1ks6bA$-XlZP7 zLs2S8In5?H+;_Ndc%S4z>S4WX$F1u$TMtlIq=w{(yIu3Y<2dF2op$$Ruifo+22QWj?>c)<`=s0N?Sbh^k1PLGNMqnKDYrN(}_>Qjlsbx{qGIhCH?R9Iww2*-v-^? zHNnF%`THTl=h4W2@elev)Qx?0MfRuDffnOYPxts zLd!=*Jfg_Z0*Eo=?hex3mJKO_Q6$w{;$s8sb7V*)+PbJmi5tq0xN++OgQgKVGx__A8vT!?3jEiU;pv8uV5R=|`X&7z^g7N? z|F=PP`d_mF3P=!ZNTw43i+s$~A_j^vWti&kS3!xNLqWM3L*ob8{6RM0pa>hb?&Yu! zJr3&OBYz!T<4aEXA>3zpV(L!=t~6+r;3N6;SkD2zaiz~uRsWICUW>p#$ML2dfED`R z9yn$Hzt`{V{Qs>`jsE90K-mEZ1pHk7m$!|F^P)sop!$WA5kv3r5a#uSp?6{4%6zr1 zcx$vat;0`LD#|ArPRQ!Jq$49_BKQz~Or93`Eq?$_aMMoDaUA;$pY5QOl)VU#WkHkS z036ood!p2xV9hnzbvl0iZ zmZCE3+^1Z+1hs9J^_|<(tGoZA-Bo$~GX1aOzqWGmr)&xTot{(n|9bu2F8VQnab?-#i&I4JLh>=fdUx*;4&B=R+`@QH=5@6`mK*iE$lYfZ%zXw` z^?!;iL?QLsZ)l8_`hU_b>%Y_Q?(}~fba&S}f*JLPAW?xptXS2ti=M$8&8%bV61 z$Uxu(Kb>R9h>I^7gT~d>`@c58hDNgi_aNdo(D=|uYFKcC0`5VHh`Z45m`CbgM1SKk z{bYEG$nex_x(-$KKb*N6J_uSB|8<{jHqcYqhg~Us@qpI&z!~|hiR7wIfNO$STh1xm~A@KHBup0m*xwMkdJdka`LR} zhs;xA;mm!>d7y|6ni9{0%q!-3Ykw8|i}2|P?XY?^px zUY(288s|v7_kt>X$6ag`rIjiWWTGcYCbH&h-e!?fl`jW`kXe948i5}pluD){QPMi; zivCd$ul*}6BWu0;_0&4_oT-ZcaWMOOgHhm0{BM`>zdz{rclf^zs=@!t27g#$49dLn zt6=zuDo%WAyMf=DwFwKSq@6{Z^VG{0z`O$3@dPB{q@5SkWsy`Unm5$LAvBbTu#w?3 za#!4j3cXj^xkDDIj!lHBO{V-UcoRfir3pAK**Fz?2=~ndM$Lqe?Znxh8;brsbEjEa zM|pl*ubQ-fMKy10taWXB<9}b5z&!ga73Xuw<2Dv)`xwE6{ ziGDtq(4*$X8N!eG;^VVZQzFj3|KASu%c7TDd+&6ScBU$r9XllTX?X~DIn84d zWA5_NMA|I7D^`W$knU>S>!wj0zHw8$W&uI2q-G;e% zAin2OXkTO~1SUD*l5$vgN;52tT|8&Xx^{K(ZFNP8Tz7Yc0e{QQ*2-3uK4yuHhuS^7 zrd^MN&Ft_byPdY4;02+-z-DhnnzilmQmN|4{hs5~#Qxh;WImnnK;Y)bSb6`a(<}e| z=fK(h{l`{lAI^wUD7XX_K)eIsW{Mm}5oI3b69|cWO(rO9Yaf1_QVB8&!$2qra*B+> zgasq;iE^iuPk)Xj0U4;&{ZiKb1Mj>pi08>*)8mqQ!0rwai$EwxD6 z7yzRjZOeXj@!>)R0GHCq-gPcOiuLR$8Os+ReU#kcIyAEIS`(~9Y&rGL_*oblGY zqY-hhqtM)alGc$eZ$j(H9+7M7$X3374g{T8NB_3=;W&~A8blKQ{^}QL*`Wx2M^{-k p^^mk;b`kt;*)!<|9=5&@1liG!cJy57{{a91|NkU~xu*a^004EFGr#}< diff --git a/charts/onechart/templates/deployment.yaml b/charts/onechart/templates/deployment.yaml index f4eca98f..70205d6e 100644 --- a/charts/onechart/templates/deployment.yaml +++ b/charts/onechart/templates/deployment.yaml @@ -78,7 +78,7 @@ spec: {{- end }} containers: - name: {{ template "robustName" .Release.Name }} - securityContext: &securityContext + securityContext: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} @@ -133,7 +133,8 @@ spec: {{- end }} {{- if .Values.sidecar }} - name: {{ template "robustName" .Release.Name }}-sidecar - securityContext: *securityContext + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} image: {{ .Values.sidecar.repository }}:{{ .Values.sidecar.tag }} {{- if .Values.sidecar.command }} command: @@ -141,12 +142,8 @@ spec: - -c - {{ .Values.sidecar.command | quote }} {{- end }} - {{- if or (or (or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName) .Values.existingConfigMaps) .Values.existingSecrets }} - envFrom: *envFrom - {{- end }} - {{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }} - volumeMounts: *volumeMounts - {{- end }} + {{- include "common.envFromRef.tpl" . | nindent 10 }} + {{- include "common.volumeMountsRef.tpl" . | nindent 10 }} {{- end }} {{- include "common.volumesRef.tpl" . | nindent 6 }} {{- with .Values.nodeSelector }} From 1de6297703c3c6b765e5c28cec560afd587f9ebd Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Mon, 18 Dec 2023 13:30:54 +0100 Subject: [PATCH 2/2] New common chart version --- charts/common/Chart.yaml | 2 +- charts/cron-job/Chart.yaml | 2 +- charts/onechart/Chart.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml index 614af975..8bb77c40 100644 --- a/charts/common/Chart.yaml +++ b/charts/common/Chart.yaml @@ -15,4 +15,4 @@ type: library # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.0 +version: 0.4.1 diff --git a/charts/cron-job/Chart.yaml b/charts/cron-job/Chart.yaml index 84d0cb9c..f71ddf79 100644 --- a/charts/cron-job/Chart.yaml +++ b/charts/cron-job/Chart.yaml @@ -19,5 +19,5 @@ version: 0.63.0 dependencies: - name: common - version: 0.4.0 + version: 0.4.1 repository: file://../common diff --git a/charts/onechart/Chart.yaml b/charts/onechart/Chart.yaml index 0a691581..3637dbe6 100644 --- a/charts/onechart/Chart.yaml +++ b/charts/onechart/Chart.yaml @@ -19,5 +19,5 @@ version: 0.63.0 dependencies: - name: common - version: 0.4.0 + version: 0.4.1 repository: file://../common