From 8720c33db48bccf754007f9199ec4973b160f84a Mon Sep 17 00:00:00 2001 From: Youcef Guichi Date: Thu, 19 Oct 2023 11:33:48 +0200 Subject: [PATCH 1/3] Added ability to refrence an env from an existing configMaps and secrets --- charts/common/templates/_envFromRef.yaml | 21 +++++++++++++++++- charts/cron-job/charts/common-0.3.1.tgz | Bin 2099 -> 2150 bytes charts/onechart/charts/common-0.3.1.tgz | Bin 2099 -> 2150 bytes charts/onechart/templates/deployment.yaml | 2 +- .../tests/deployment_configmap_test.yaml | 18 +++++++++++++-- .../tests/deployment_secret_test.yaml | 18 +++++++++++++++ 6 files changed, 55 insertions(+), 4 deletions(-) diff --git a/charts/common/templates/_envFromRef.yaml b/charts/common/templates/_envFromRef.yaml index 57eb3c9..d7cc7cf 100644 --- a/charts/common/templates/_envFromRef.yaml +++ b/charts/common/templates/_envFromRef.yaml @@ -1,21 +1,40 @@ {{- define "common.envFromRef.tpl" -}} -{{- if or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName -}} +{{- if or (or (or (.Values.vars) (.Values.secretEnabled) (.Values.envFrom)) .Values.sealedSecrets) .Values.secretName -}} envFrom: &envFrom {{- if .Values.vars }} - configMapRef: name: {{ template "common.robustName" .Release.Name }} {{- end }} +{{- if .Values.envFrom }} + +{{- range .Values.envFrom.existingSecrets }} + - secretRef: + name: {{ .name }} + optional: {{ .optional }} +{{- end }} + +{{- range .Values.envFrom.existingConfigMaps }} + - configMapRef: + name: {{ .name }} + optional: {{ .optional }} +{{- end }} +{{- end }} + {{- if .Values.secretEnabled }} - secretRef: name: {{ include "common.robustName" $.Release.Name }} {{- end }} + + {{- if .Values.secretName }} - secretRef: name: {{ .Values.secretName }} {{- end }} + {{- if .Values.sealedSecrets }} - secretRef: name: {{ template "common.robustName" .Release.Name }} {{- end }} + {{- end }} {{- end }} \ No newline at end of file diff --git a/charts/cron-job/charts/common-0.3.1.tgz b/charts/cron-job/charts/common-0.3.1.tgz index 5fb517dc5914c10903f03490ed3d7ee0132ff349..854f9c0b433aef98df37246cc574e01a354548f5 100644 GIT binary patch delta 2113 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 diff --git a/charts/onechart/charts/common-0.3.1.tgz b/charts/onechart/charts/common-0.3.1.tgz index 5fb517dc5914c10903f03490ed3d7ee0132ff349..264c4c041ba8f20110145cd9232b48234b63f183 100644 GIT binary patch delta 2113 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 diff --git a/charts/onechart/templates/deployment.yaml b/charts/onechart/templates/deployment.yaml index 6a73480..a733250 100644 --- a/charts/onechart/templates/deployment.yaml +++ b/charts/onechart/templates/deployment.yaml @@ -138,7 +138,7 @@ spec: - -c - {{ .Values.sidecar.command | quote }} {{- end }} - {{- if or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets }} + {{- if or (or (.Values.vars) (.Values.secretEnabled) (.Values.envFrom)) .Values.sealedSecrets }} envFrom: *envFrom {{- end }} {{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }} diff --git a/charts/onechart/tests/deployment_configmap_test.yaml b/charts/onechart/tests/deployment_configmap_test.yaml index 0869615..8c29ccc 100644 --- a/charts/onechart/tests/deployment_configmap_test.yaml +++ b/charts/onechart/tests/deployment_configmap_test.yaml @@ -14,7 +14,21 @@ tests: content: configMapRef: name: release-name - - it: Should not reference configmap if vars are not set + - it: Should reference to existing configmaps + set: + envFrom: + existingConfigMaps: + - name: firstcm + optional: true + - name: secondcm + optional: true asserts: - - isNull: + - contains: path: spec.template.spec.containers[0].envFrom + content: + configMapRef: + name: firstcm + optional: true + configMapRef: + name: secondcm + optional: true diff --git a/charts/onechart/tests/deployment_secret_test.yaml b/charts/onechart/tests/deployment_secret_test.yaml index 5dfc580..4414e3a 100644 --- a/charts/onechart/tests/deployment_secret_test.yaml +++ b/charts/onechart/tests/deployment_secret_test.yaml @@ -31,3 +31,21 @@ tests: content: secretRef: name: release-name + - it: Should reference to existing secrets + set: + envFrom: + existingSecrets: + - name: firstsecret + optional: true + - name: secondsecret + optional: true + asserts: + - contains: + path: spec.template.spec.containers[0].envFrom + content: + secretRef: + name: firstsecret + optional: true + secretRef: + name: secondsecret + optional: true From aafc0bbfabe9dbd289cbe4436648b3a00e7d5e2b Mon Sep 17 00:00:00 2001 From: Youcef Guichi Date: Fri, 20 Oct 2023 10:36:50 +0200 Subject: [PATCH 2/3] Removed envfrom -- Updated unittest --- charts/common/templates/_envFromRef.yaml | 9 +++------ charts/cron-job/charts/common-0.3.1.tgz | Bin 2150 -> 2140 bytes charts/onechart/charts/common-0.3.1.tgz | Bin 2150 -> 2138 bytes charts/onechart/templates/deployment.yaml | 2 +- .../tests/deployment_configmap_test.yaml | 16 ++++++++++------ .../tests/deployment_secret_test.yaml | 11 +++++------ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/charts/common/templates/_envFromRef.yaml b/charts/common/templates/_envFromRef.yaml index d7cc7cf..d3c6c86 100644 --- a/charts/common/templates/_envFromRef.yaml +++ b/charts/common/templates/_envFromRef.yaml @@ -1,24 +1,21 @@ {{- define "common.envFromRef.tpl" -}} -{{- if or (or (or (.Values.vars) (.Values.secretEnabled) (.Values.envFrom)) .Values.sealedSecrets) .Values.secretName -}} +{{- if or (or (or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName) .Values.existingConfigMaps) .Values.existingSecrets -}} envFrom: &envFrom {{- if .Values.vars }} - configMapRef: name: {{ template "common.robustName" .Release.Name }} {{- end }} -{{- if .Values.envFrom }} - -{{- range .Values.envFrom.existingSecrets }} +{{- range .Values.existingSecrets }} - secretRef: name: {{ .name }} optional: {{ .optional }} {{- end }} -{{- range .Values.envFrom.existingConfigMaps }} +{{- range .Values.existingConfigMaps }} - configMapRef: name: {{ .name }} optional: {{ .optional }} {{- end }} -{{- end }} {{- if .Values.secretEnabled }} - secretRef: diff --git a/charts/cron-job/charts/common-0.3.1.tgz b/charts/cron-job/charts/common-0.3.1.tgz index 854f9c0b433aef98df37246cc574e01a354548f5..11a7ba4ff9f9de84530926ec166316adce91ffcf 100644 GIT binary patch delta 2103 zcmV-72*~&55Zn-uJb&wM+c@^`XFbLFyO~S!k7YT&0S5Y^NT;)l-L^q8NU=bGf|ibL zPAEzxDW{nvi+zWE!+nwksr$ut+;N>|;RDnWDU#=q;`yBmSvTb(KeK)~Ok2?~x1rNxPlV~BT;rEWtU1EUi` z#I3bR$8+qS-L;;2hI?8?iT*3}Lq-(J&L=nEQ#$iWxHULfr~iZDprZeSL2s}BJE6O~ zHh4It9HABO1%Er=04iiHXg@qyx)q&*eMwk^(q0fD;o-q5fk)T6rraCDspEtU_luktAZx%h#4aq7NbY9AUG^7YfSN z6n|Pj$o3DiruhY2+Q8jg8q>+58aKytlVKmZ`|JX`4XLjGb7Ub3slWY}c&yd`lYUkI zonddU|GS{OyUr0Ts6PgY3baydO?~C-WpU>?hNDhwlR8J%sX%Seazh4cP87I=!vrCc z=mC+1Bryn-K_px>Dtiosn+7tPc!5tS*MEf@WX!s{f&cvL-|%;$C6CskZOX{-)ZcUys_TEaaDTUa z5VS7->p4~Z@Avlhe>c>iGI|3%F5i=Q$UIOc6wG4|MyL<=Jdo;)sCgmbVxu3b+c&h> zI1NV*(;*KE2s3`QVSJz+k;a76nXZuvxwq#ypMt^ z{J>pom8F#`5M-toNhY!uYu;y3RJ~mR2qCioi8KN~M<|s{qot&GG8FxzBwqJdT1D1o z_v@*3=s8mz|Km9K?G~fJwfNty;{R|o9PIIb7u10NwGFVs7*yNJZ-U_ys((1~sqF@S zXVE1roRe-AZRS~-9e{Zau;T?t!b!U*sLLX$P_%EThhu0d5n(ICY2>cB4HbHCvSW!X zQk|LzRhvxtTktN3xJvVJTC!;>^ce2j35=QrpW2DDog0c_p2*WpI!DF!w*G3;{uNc; z*I4Vu{>HzqfO`rW@k$gIzkieodvsu*_FDTL{^z3br=w-~zs(HbI{fdBdR6@Ij+{OI z?}C=%e--<4*Kk=rd~1mP9bOUH4e~eMJ83v~SbGKK>wtRGb+6;~9IPVK380b`DxLpVB7?#mfWp~P{eMKi7))rcMRCUP zW3l-7?9`mdGl3>uOF32TR_u2krsufL=ik2OqJ84{Rj9q=41kk7Ni;btR42tGp;3O< zn8(mBnu?DIv$i4kMq)#f!y(=W&Thw`4cqF=57TESanmmRUL~(TZf;YT;s2JP-_RQT zKk1FC_&*q(?D2mmw0{);zaQwAWiPq$-sv*!OjR&Dc1Y^e@)+(4n#Ux@t*b{9X}9d^ zRQ)>9(mth;%NJKy4Y4>lB=n!K%R7-~W1G8Ds%F0X7_^xZ`)|*Y`EH&o5x{|;@?o-PF3^wc70LjjC(v@QG1 z#it7u2((_psoAn{d3pgJ71FY2RCUa6EWTw={tzAWn^w$c9sQFQ<$`zefhNSgjzV+y zNm@s?ya}x%dqS?QBU}0UIS_Pa9sSdK3716BAd>LcH!#0Q%ML~GJG#oUsfVN!Hy6S0 hmc5W};9+NvE_>S3p1x=LZvX%Q|Nl1|qrm_|003ntHHiQK delta 2113 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 Date: Fri, 20 Oct 2023 10:54:33 +0200 Subject: [PATCH 3/3] Default value for optional; bumping common chart version --- charts/common/Chart.yaml | 2 +- charts/common/templates/_envFromRef.yaml | 10 ++-------- charts/cron-job/Chart.lock | 6 +++--- charts/cron-job/Chart.yaml | 2 +- charts/cron-job/charts/common-0.3.1.tgz | Bin 2140 -> 0 bytes charts/cron-job/charts/common-0.4.0.tgz | Bin 0 -> 2140 bytes charts/onechart/Chart.lock | 6 +++--- charts/onechart/Chart.yaml | 2 +- charts/onechart/charts/common-0.3.1.tgz | Bin 2138 -> 0 bytes charts/onechart/charts/common-0.4.0.tgz | Bin 0 -> 2140 bytes 10 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 charts/cron-job/charts/common-0.3.1.tgz create mode 100644 charts/cron-job/charts/common-0.4.0.tgz delete mode 100644 charts/onechart/charts/common-0.3.1.tgz create mode 100644 charts/onechart/charts/common-0.4.0.tgz diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml index 5f5fad8..614af97 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.3.1 +version: 0.4.0 diff --git a/charts/common/templates/_envFromRef.yaml b/charts/common/templates/_envFromRef.yaml index d3c6c86..fab3758 100644 --- a/charts/common/templates/_envFromRef.yaml +++ b/charts/common/templates/_envFromRef.yaml @@ -8,30 +8,24 @@ envFrom: &envFrom {{- range .Values.existingSecrets }} - secretRef: name: {{ .name }} - optional: {{ .optional }} + optional: {{ .optional | default false }} {{- end }} - {{- range .Values.existingConfigMaps }} - configMapRef: name: {{ .name }} - optional: {{ .optional }} + optional: {{ .optional | default false }} {{- end }} - {{- if .Values.secretEnabled }} - secretRef: name: {{ include "common.robustName" $.Release.Name }} {{- end }} - - {{- if .Values.secretName }} - secretRef: name: {{ .Values.secretName }} {{- end }} - {{- if .Values.sealedSecrets }} - secretRef: name: {{ template "common.robustName" .Release.Name }} {{- end }} - {{- end }} {{- end }} \ No newline at end of file diff --git a/charts/cron-job/Chart.lock b/charts/cron-job/Chart.lock index dea9c02..8309305 100644 --- a/charts/cron-job/Chart.lock +++ b/charts/cron-job/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: file://../common - version: 0.3.1 -digest: sha256:64689b29ef8b2262efbd5d49bccf40f798698d426dcfdc7c632aaf183a8cc681 -generated: "2023-08-18T08:34:24.144108449+02:00" + version: 0.4.0 +digest: sha256:d4eccd332ada7362f429e04b82022f5605a02e2d3aa7b9fdf8adaf4f6c9e03eb +generated: "2023-10-20T10:53:13.982995773+02:00" diff --git a/charts/cron-job/Chart.yaml b/charts/cron-job/Chart.yaml index 3267c1c..c0c2cfd 100644 --- a/charts/cron-job/Chart.yaml +++ b/charts/cron-job/Chart.yaml @@ -19,5 +19,5 @@ version: 0.58.0 dependencies: - name: common - version: 0.3.1 + version: 0.4.0 repository: file://../common diff --git a/charts/cron-job/charts/common-0.3.1.tgz b/charts/cron-job/charts/common-0.3.1.tgz deleted file mode 100644 index 11a7ba4ff9f9de84530926ec166316adce91ffcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2140 zcmV-i2&4BOiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI`qZreEa?`J*5`Ma4*@{eUXz5xdMp-88*i`}+CGDxvNfP$8e zZB8gkB`K$wB#V8AeZzf{1*!YRcHD8DX5j>!~P3!zJV+?ilidqh4ZI*RVVjM zh=lYKg`@!=!{Ws9P`ZMK%9LNjUy%9W>b(KeK)~Ok2?~x1rNxPlV~BT;rEWtU1EUi` z#I3bR$8+qS-L;;2hI?8?iT*3}Lq-(J&L=nEQ#$iWxHULfr~iZDprZeSL2s}BJE6O~ zHh4It9HABO1v}pWDr7BaKRj5v6`g{8Nmzu^UJxPS;lV0_N7uTh+#AEG>Hdy{mXC^f zM3J!t5aY$&9i%%gV<&=1B-MN3V+-taWJo01x~MtC9c4(|xOb_6sg7GQGC?LaBLE{T zcUj~iwC2eCwm~pEZqouA?txS8Ay?4X-D4SbH$nIe;our?kKtfJ7>r-lCaoEmCh+iJ zWHJr!;d2xyBaI#ixwqs|FXvN#^a3^LeKSNve*BeP?P>Q zY=9CH#9ET+MZh8-Gu4QJVoDjNI{Xb_qBwjNA`Y4{BITe#q|ki~_ZeuI`qO|bjSLlx zNahwRGr%*@?8i}E|B)}=ioid|>9!nzHTvHj4xFm}ANGcO{oe&O=zn1YR2_goz|Ylx zMf-S|7bUs^)i0b(7@iYM#x0)G5nZ3 zE%RFd+Tf;xp5rw38@}2}sbE1F9;<>T?Bn@1@wRyeY?=ZSj1d;UOG_2DEBNM%_o$hF zHTS|Ymp=Xa31_}q!&)D#TI?l^bHlK5nH&48oK<1tt{?xaw@|bH_^tH6j{n*S#h#4aq7NbY9AUG^7YfSN6k0#X z_7AeA`2}3sz};IK)5)S5H^+06VIR5s>;k$CsjmNXWFZQvzx|eYtkwUMepUaSVQ;Vh zyP&(f&JirAKL&{kv{GwLedX(AapyROqfTs-I!D&2KyA=+Lk4P26u5-L1R;{>0g;6y zF$k1FBwREqdkln|1~Qs>flnycg&Sndy1Ie?{OjNFccLf_!mM8sVf_RJ&oFQVy`elcyz$nezPbQ7xUf4FeBd=RuQ{_8na z{qOho_J23jpfY*`JTBjpc*s0ZCKSwL4o0XC_B@d4jHr1b;bNm7s@pfT*frhEZmGV)R4AIpi5Z6U1-vu5f1GY`9lUKvN{@f&D3R>q#ypMt^{J>pom8F#` z5M-toNhY!uYu;y3RJ~mR2qCioi8KN~M<|s{qot&GG8FxzBwqJdT1D1o_v@*3=s8mz z|Km9K?G~fJwfNty;{R|o9PIIb7u10NwGFVs7*yNJZ-U_ysyOkf?FN2l(IqULlWrDm z=2@8?fO!qD;{`~-yyei31A)mk81aS zhNJ#I|GN`v!2jw7Sak`Yk`yYP|5qY|!X1FZ*-`yOzZgttu0?Ui@ME#~`0Ui2$TNW^ zT}wGt?N;n}9;WBG&F9~~=AwP#_*JOA;|ze4JV`V;D^w@NB%x7$*O{ zC$tp*zaQwAWiPq$-sv*!OjR&Dc1Y^e@)+(4n#Ux@t*b{9X}9d^RQ)>9(mth;%NJKy z4Y!8Bq!am!JZOcL3bX zk;5dS%%gk;A#tzC45e+ogx}^=f{em25K4laBV#aQ!32Dw+&Sg5V-U!Qq6;);rch6~ zXT1cDGm}JvpFOs`_09t3l#{oUc#x_vT%8N z0Uj07vS(Cv%x^5dWl#PP9rK%3%x4|_lNRNIck+QI#J!F}bN5MFN4C5Pts{FvuB{_m z`T98!bY>m>(|QS)M9?6T@YgrLNXrgI@H@K7vZ;rp6E_#Z@0PugZs1{Ok1l)K)1JO( S`fmUL0RR6t8>7JhLI427=saNn diff --git a/charts/cron-job/charts/common-0.4.0.tgz b/charts/cron-job/charts/common-0.4.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..25e1fd478f1bf3cb66c63e2d00c7bf70d8b630d6 GIT binary patch literal 2140 zcmV-i2&4BOiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI`qZreEa?`J*5`Ma4*@{eUXz5xdMp-88*i`}+CGDxvNfP$8e zZB8gkB`K$wB#V8AeZzf{1*!YRc06^RX5j>~ygoA6mJ%)n?VK9DG`)ECYVS$GS zBa>mghtE-VJ1s(f`q)x7YujP?P>Q zY=9CH#9ET+MZh8-Gu4QJVoDjNI{Xb_qS$>EA`Y4{A{{}4NTK-{?laIZ^``+>8W}1W zk$hXM%mB|ovmZxw{YSodD+2!*64qC7IF0>=KkcMcu%HZ&RY8;C3<#n zwGoUzWk>k$44h#N|A*Z@{_lbs@V~GDR=9mRm)Y^{b~|zG;>xPi7pI6mgyeIC%^qJU zC|6Tx{UF;v$eL~!fM^4EZ)r>?i@Mqz&rODXVrZ}>Y=lmkPhP{?EO=!`0P z3=#KGNH-7&KYjWMZ0qWyVJD2iBvNp71GZ(vYyh*OX^nvl1kUiwIfjh5_?j_jU0r?r z{}$NLYPaAXMEnL?pIS)`3vN)rJtz@z7lu9aNd1dwI;CF>PZ=4WdQCT>y8ed?cgqJs z>*BwjQ`P@|Z*Tv1Lk%jUH^AfaJ&7C417$+NJjh^#`e4rksm_R+7ZNTu`k}ggLyOF5 z{Bf9ec~C%@@v99Z0PTo0CY;W6ja10hrTGFQ!d6CM@hWyue6G+&F(Fzi zI{wGO?At9yfot)cB4HbHCvSW!XQk|LzRhvxt zTktN3xJnanTC!;>^ce2j35=QvpW2DDog0c_p1IR3oueYZtyfLjzoN?98f)Fy-uTxQ za8E%ao{8e*m(pF24(!ubYuDj_E((7-T897I%mA*#|L&+)#s3q>+2j8%Xes_zu|IbW zmnFTohS=ZX6_MQ_f8)KAhQo!mS5W>OP;WZ#b-dog^>d>-{>SmX@jK*pE&;4P|F7Nu z8IA_~{O?Yv0spHTVAUmnN>ZqF{$Gg<3U>esXGirD{bDeoM=gpoh98T?$7iSJM4kyW z=~~LEYPVv)^DsTEZ9ee!^(fjWj$eh^JI(+&$&*BrvqE)JOcEO9ca3=r{i3P(h%jp# za&IIyBsm=7ec&TWjp>{Hl_UN*wJ?-gx SrvC;20RR6=ftWo2LI40EJ}F}W literal 0 HcmV?d00001 diff --git a/charts/onechart/Chart.lock b/charts/onechart/Chart.lock index f5151d6..57a2876 100644 --- a/charts/onechart/Chart.lock +++ b/charts/onechart/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: file://../common - version: 0.3.1 -digest: sha256:64689b29ef8b2262efbd5d49bccf40f798698d426dcfdc7c632aaf183a8cc681 -generated: "2023-08-18T08:31:18.469039683+02:00" + version: 0.4.0 +digest: sha256:d4eccd332ada7362f429e04b82022f5605a02e2d3aa7b9fdf8adaf4f6c9e03eb +generated: "2023-10-20T10:52:47.237955041+02:00" diff --git a/charts/onechart/Chart.yaml b/charts/onechart/Chart.yaml index 2f9539f..cefae42 100644 --- a/charts/onechart/Chart.yaml +++ b/charts/onechart/Chart.yaml @@ -19,5 +19,5 @@ version: 0.58.0 dependencies: - name: common - version: 0.3.1 + version: 0.4.0 repository: file://../common diff --git a/charts/onechart/charts/common-0.3.1.tgz b/charts/onechart/charts/common-0.3.1.tgz deleted file mode 100644 index 502b2c64f72c8e55478c071ef073bb1f03c58850..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2138 zcmV-g2&MNQiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI`qZreEa&u2Zw`8%0Q@{eUZz5xdMp-88*i`}+CGDxvNfP$8e zZB8gkB`K#FCyRZDeZzf{1*!YRcHD8DX5jvwv+Zhv?-JZN{$dc(5=XnzA)DilgZ#6kN{^D0m7 zg%AnoH3~_6K7#p~<)U;14U{RrhQA>5z|ngHCcc2bg<}*P6-tW}4@VH~9!uQ^I08n; zf{1%-o{ZPFyLQKV?iucB6~+3m&<%?Q8< z%N-WF2#pysuW1m>j@mT9h6mu3yT}#vboWR`-AxcaML4>}`%^fY69%JKl}T#`rU^Vg z8ktPP2lyQN%1EOJLhdek)XVwYA3aAk`X5T=dv7Vj^DQC4TK(?~OZq?TclY|g6ROky znhj7uf=EkJz3^G+VX7JtP)sPpM2EitOyq|zL&Q-%MkE|Gh~ⅅ2{MKQ-AJrrIDe8 z5%Jt2Wd?Wwn*B7Y>Ob=NTj6_`IN6p1utxtogMPbg|8?`d{_lWl^gp)&$_{`p;OFwc zynQ^*iV_`x>K9JN4Bg{n$m$70_sYDL`D$IEl`^ZtFH|bZrzup(>brO#BV;W22!4#8 zmia9JO>mMyFL4t24PWh~l(3)(k7Yq)_R)Onc-uS$Hch?>#t4hvC8ZME6@0VBd(zCm zntN`U3!i@dgi~LwX04A_E%p+|nPFJD%(Z=1&MLQY*N^|zTd3ZD{8sv3#eZ!Cqgn0< z|J(icpo0JX;U52YK{fcF+W;%vzO0o|hGw%FJ9bfJ+3AZ?L>~h3ImCL8FA$Wg2{e9? z%^ze%^K-bgfxEXfrjvO!u8-%&gC26{#RYU5QdR$F$O05nfBP-*SgZeMy|Vtdhn>Ct z?}8SK)(On1Hv)+Yv{GwLedXz8ab`GzlU8JtS|`@IKyA=6Lk4O_6gY$KDC0+G2S zF$k1?C>%5@dkTb`1~MGGzDFq6g*#--y19e@{OjNFccLf66uENQLelcx|$nf0XbQ7xTe=v8pd=RuQ{_D2O z`mZ1M`o9aRQ5n4fo|f;4J!I}H6AETA2P4!2d*(}ZLDVdlaIw(~)cqTpZ=8f9$H|aK zIfNO#+Au!Qj!137=|a~?goFR&x2$YS?*f- z{~#W#bSNdH3i&8Y2I%M!h~uD??|c{I0h=b)$*SQ&e{K>o1&vE2?nglte&7x^iqcBu z3o_M$!LzGG;(Nf$y9*X`^5U=wqEhB5a`}N#9^pdHH z|52R#c8gKqTKw;n@qaKJcK7(d3#!5Y$_7|r49acgH^J~RRh)R#c6_fj?+_NuNGFXp zv#iVxz`O$3(E`Nbq@5SkVWCtgns?O25j2ztv6135a!1?;3f(v9u|yiFPE3TVO{VCHXil*(4Eq1P{#^M$Ljx?AY1P48G|UiYn`CtaWXF<6oD+ zJpqkqCGv}3$b>yPuupoe{SN+;b=(k;C@RlQEMv`=B=;>Fcf z18#Bww!|bocZpvn<%CC&!cX$109)CrrLWa}kn{PYyBvl7#Ri4oBPU#34(d)~MkU_G zv!rxrM;G5$SH0M3u_!PsciSinXPX_6(Uvr`#8~eI9G?|8&d$|Lbhn?(gmYF6a<0h*BuH1m#1t1K@6k z9L6DKF6C1Qh;vJ(C~fNyew$GVG7JJ=C<$_gjKP%oWAKP_W|U7)K_DZF&e52eTs`5g zbqE}%CW!_=2PPgv7w)K>o2yS($`@!I!nxV9aD9FS zE)~+Ur&P7fZzR5DkN*%Y^P5!6rY-%G6y=<^vVq3LxeWtz_eokOw!90h6MIZwBYMuPkI)rN?s2@uB>ziMsWe39l9UW!a)J4*YnhXDT%brWecd@lcmp$!iPv0~B QHvjDc zVQyr3R8em|NM&qo0PI`qZreEa?`J*5`Ma4*@{eUXz5xdMp-88*i`}+CGDxvNfP$8e zZB8gkB`K$wB#V8AeZzf{1*!YRc06^RX5j>~ygoA6mJ%)n?VK9DG`)ECYVS$GS zBa>mghtE-VJ1s(f`q)x7YujP?P>Q zY=9CH#9ET+MZh8-Gu4QJVoDjNI{Xb_qS$>EA`Y4{A{{}4NTK-{?laIZ^``+>8W}1W zk$hXM%mB|ovmZxw{YSodD+2!*64qC7IF0>=KkcMcu%HZ&RY8;C3<#n zwGoUzWk>k$44h#N|A*Z@{_lbs@V~GDR=9mRm)Y^{b~|zG;>xPi7pI6mgyeIC%^qJU zC|6Tx{UF;v$eL~!fM^4EZ)r>?i@Mqz&rODXVrZ}>Y=lmkPhP{?EO=!`0P z3=#KGNH-7&KYjWMZ0qWyVJD2iBvNp71GZ(vYyh*OX^nvl1kUiwIfjh5_?j_jU0r?r z{}$NLYPaAXMEnL?pIS)`3vN)rJtz@z7lu9aNd1dwI;CF>PZ=4WdQCT>y8ed?cgqJs z>*BwjQ`P@|Z*Tv1Lk%jUH^AfaJ&7C417$+NJjh^#`e4rksm_R+7ZNTu`k}ggLyOF5 z{Bf9ec~C%@@v99Z0PTo0CY;W6ja10hrTGFQ!d6CM@hWyue6G+&F(Fzi zI{wGO?At9yfot)cB4HbHCvSW!XQk|LzRhvxt zTktN3xJnanTC!;>^ce2j35=QvpW2DDog0c_p1IR3oueYZtyfLjzoN?98f)Fy-uTxQ za8E%ao{8e*m(pF24(!ubYuDj_E((7-T897I%mA*#|L&+)#s3q>+2j8%Xes_zu|IbW zmnFTohS=ZX6_MQ_f8)KAhQo!mS5W>OP;WZ#b-dog^>d>-{>SmX@jK*pE&;4P|F7Nu z8IA_~{O?Yv0spHTVAUmnN>ZqF{$Gg<3U>esXGirD{bDeoM=gpoh98T?$7iSJM4kyW z=~~LEYPVv)^DsTEZ9ee!^(fjWj$eh^JI(+&$&*BrvqE)JOcEO9ca3=r{i3P(h%jp# za&IIyBsm=7ec&TWjp>{Hl_UN*wJ?-gx SrvC;20RR6=ftWo2LI40EJ}F}W literal 0 HcmV?d00001