From c56e2aa5b48f64099bfad045238794500a95fb1d Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Thu, 5 Aug 2021 13:26:08 +0200 Subject: [PATCH] Fixing robustName helper --- .../common/templates/_sealedFileSecret.yaml | 2 +- charts/common/templates/_sealedSecret.yaml | 4 +-- charts/cron-job/Chart.yaml | 2 +- charts/cron-job/charts/common-0.1.0.tgz | Bin 1805 -> 1795 bytes .../cronjob_sealed_file_secrets_test.yaml | 28 ++++++++++++++++++ charts/onechart/Chart.yaml | 2 +- charts/onechart/charts/common-0.1.0.tgz | Bin 1806 -> 1793 bytes 7 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 charts/cron-job/tests/cronjob_sealed_file_secrets_test.yaml diff --git a/charts/common/templates/_sealedFileSecret.yaml b/charts/common/templates/_sealedFileSecret.yaml index 7a3a356..b47ebe6 100644 --- a/charts/common/templates/_sealedFileSecret.yaml +++ b/charts/common/templates/_sealedFileSecret.yaml @@ -1,6 +1,6 @@ {{- define "common.sealedFileSecret.tpl" -}} {{- range .Values.sealedFileSecrets }} -{{- $robustName := include "robustName" $.Release.Name }} +{{- $robustName := include "common.robustName" $.Release.Name }} --- apiVersion: bitnami.com/v1alpha1 kind: SealedSecret diff --git a/charts/common/templates/_sealedSecret.yaml b/charts/common/templates/_sealedSecret.yaml index cea7611..7bec2ee 100644 --- a/charts/common/templates/_sealedSecret.yaml +++ b/charts/common/templates/_sealedSecret.yaml @@ -3,7 +3,7 @@ apiVersion: bitnami.com/v1alpha1 kind: SealedSecret metadata: - name: {{ template "robustName" .Release.Name }} + name: {{ template "common.robustName" .Release.Name }} namespace: {{ .Release.Namespace }} labels: {{- include "helm-chart.labels" . | nindent 4 }} @@ -16,7 +16,7 @@ spec: {{- end }} template: metadata: - name: {{ template "robustName" .Release.Name }} + name: {{ template "common.robustName" .Release.Name }} namespace: {{ .Release.Namespace }} {{- end }} {{- end -}} diff --git a/charts/cron-job/Chart.yaml b/charts/cron-job/Chart.yaml index 182eb88..d83e77b 100644 --- a/charts/cron-job/Chart.yaml +++ b/charts/cron-job/Chart.yaml @@ -15,7 +15,7 @@ type: application # 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.2.1 +version: 0.2.2 dependencies: - name: common diff --git a/charts/cron-job/charts/common-0.1.0.tgz b/charts/cron-job/charts/common-0.1.0.tgz index 7a1aa03202204b9dedd785d5bd53a6c9b0cb7e0c..fefb316fb10beb8f337da5bc14b1a83f38607e71 100644 GIT binary patch delta 1738 zcmV;*1~vJO4ucMmO@A+_f&H+^-d&4!UyvMfK$|w8rLoNmMQTaPxonc6|Dpe|zoZ}~ z#j>o}n_aJWbI<^BB!=XSC_ay$877o*EJf#dN|hnkH0C>-H{bXDez)s>`@UcO?FZe% zouC`|hl6hKushiCgTrpWy954bh-JxAZK&GuKiOCH;hu=mgnyl((oBjW%nrQ>b*NZk z-2DsqGx8WhyEkAg75p_Fp%Q3NdxFL|glzYC<~qS4a5hp@U3;@)KA!}{_rCNKHnz%g z{2PoDP7UhLMJUCXO=6mCj1Jb}zt`_o@ZaklHTd6(-Q2Vx!Z8yFt!yul`35ivZ$bO+ z&a=JP7|0prDSv7*qe{cwowq<9fp^J7G=yU}{1r{S7!8f6p+gTKV$^b=!FihIqSvg2)VY709>#lPcvA$h2LD0O532a@A00LL--gxTzqA3W1RxcBU;LDD@oavp zF;r-N5Ol;bdiD(F?UZA5>i(+B&9)xZ?&RKAk&-yW|<}SU7_0xaSN-kf1=?&l5f-Up^m~qTD$Cmit z@A>^D{_h11|8K);_`kFP7Wh9CM+J+_dpQnix7)e?%NncNFiR2NB=lX1^};YwOqemW zzR~S(^b%VV@qi-StCxgpG@UN9U%j3i^}8s-Cx0jC9%;+?pCV6CY5VRs;UX6|RF$N0E#v6ZYl`Irq-5;D7)5FZ_)fCV-=oTL1W$ z-~Q8!_TOpy{l)n?`R5;Pj@W9q;1*QY4O$niyoJjvRB#JMr6Pp>k-KE^X*wRW-|{}T z;jO}=;cFH^%lJ=b;f4#r>+nD5`xX3mkAHgo2LIcz8pzlUu;PnL1E6EyJJpS{9(GG6whNtgHABCbJH+HtzXFq^O92ACs{rS1tiZb%X82c+cBHRx1*Pc7plz;2j9zlK_ zQ9pLwm-)J(>!)VR{Ga7_PIu_d90IS;|EuS}{Xw^>|8K==_`kXV9y$cB6a*H|fGb%+ z=^VInZcuhMgm25Yt7{K7DW4yKmPKT2M_VPE{mJIlH7xW2dCa3-WXU>>-Uxm@1k3xY zy^cS-zqRMD58;19(08_0|9>4W{r}e>Xz;%kdl3KIg1%nVK#xLtQdcD`WKC#qUOzes zT@X&6Oca?syf56{|A)p#WBOnk*?2UKvU}>5^FOgk5Ss|8aPvOa>A&7lmH!X>gF(ap z+pt}DON~J#G#Cll4uGpE3K*q~M@&p0q2VQ+peEif{5)kEbebem8Gj9Wik!oQ%MrxX zgi|Ia2cVEs!)6FhrOex@h`e18IB`ide4n@jQjFk=nJN6?838L}Kngd~hGh92I1@-b z^78cJ)JTQiE*!fp3unit5HY1aGGV6UKC|#WGJ3B%?z3o^PCE9ZxYaY!nNKvL;boe* zvv2L~6MdC<`(#8fy+eIsVtXwWn|S;G_IBZnDkf76e|h#pRl g9+~M-M%Zb1u(8G(`oJaj_0=? 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 delta 1765 zcmV|A=`vb`#2efGeS{mED zP^6ZmoXaLD`VM`=K1o4JvSmq$lUuKId(Z&ul^BvUqWFFOX6QghkrbWd8C8Z{(}?eE z-hAKphyA|$-}n9U|9*Ek*y;AWe(&h8d*t_a{BEy5^moAj41cjyEYXIl9siSkl^^a4 zF&eWoRGLXKf_cxQalE+glJ1cBUWhtSEHVK+Bz2!CjT)EQx2n- zm4~(tTo<^zb1}J&x9}m6#zkW%LJ{6`X_xc4UwXl+_(w7SUdiYLCz~RGHTds#hut#% zhrM2d|7}gvYm1aPu*X2vDr4{aL-(i z;Op$_K7Zx`XhV<_%?VCYaOH7w&uL?w+Xe5`c-?!l+a(J=p{U+MN&x_`o!MBJkY_v$6#8cnB*>{qYn#=|~} z;ENMB+pwFP&OXdpGy;tVET}C~Uq*IWf*For zzjJrzdA6H(tkCL!<@Z0B88r}40b_(jV+d3iDng)8%R~j}AbS8*xDGlQhcco}*qbZl z+2fp~{k|z=Bd{^%k=wS5ni3yNZ4Yft2_qIhF6z0siJLZ%{kJAl>c%CX6 zbc}(Wn+5@D{YHkEm6X~p&ssLatz9&la09Iqq~TAB8GI)KY^C0`k%~@j)LOq?|F>f`_^)h$2gsn@cP%YEjSt4m2pTaG$fz^#QXbD}cadf+s~Df17yzgc z(on;s$Y7X0d6q|zVxR#}v_aLrVt*lypk-8otp&B92-J0KFnpbbTS!qRE;X?lO#dj~ z$V8abcbcJ0@}Ng>+s>H4t@MOsDr;HR9_9nnE}i{ie_~&kCO@EAj(tzftbV)`R_Vx$ zPGC_IN>`$|_$!s8M`v{TsI~9mcb9%WyWPkCo2&q>t^W@y{NEiMHT=H~yMLGe%iN!x zt36Og-WYK&E6&e!Lv z!T(n5Ui@zh`g&CgJqhV?U6n9bH-Wu*`{Z17ML&HqQKTwyQMg%mBArn)G zX>duWsEM}=KhBs2oy4(JMuVOq=P>1R3=uWKjEU(1DCE?zIf7Fu%XTV4Zx;kkT`mpZ z#_oU=L%3pQ27h=#z{(hq!i}^cS$+r31QL(DKD{_KQlYmC$8O8Q+3_iaOlglynd!LC zG<=VYKdO%V%o}FYj$Zx9Z}nVsmJ^L>aGAvJ>|1;LL|?_;J{i+XZ=aaRUQ5NM-u}P6 zT{xqP$wb3nUVo=O5-a&L2F4>SMA}KaEBUiW<~ooeb{ZaRtg*&^%l7{O00960;burY H05|{udijSe