From 83bc8a23f2a77a8bbe49babdffc703d499368992 Mon Sep 17 00:00:00 2001 From: mels Date: Mon, 20 May 2024 11:49:43 +0700 Subject: [PATCH 1/5] feat: update onechart/template/ingress.yaml to handle mutliple path --- charts/onechart/templates/ingress.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/charts/onechart/templates/ingress.yaml b/charts/onechart/templates/ingress.yaml index 6121414..2efb303 100644 --- a/charts/onechart/templates/ingress.yaml +++ b/charts/onechart/templates/ingress.yaml @@ -5,6 +5,9 @@ {{- if .longName }} {{- $resourceName = printf "%s-%s" $robustName (include "robustName" .ingress.host) -}} {{- end }} +{{- $svcPort := .root.Values.service.port -}} +{{- $containerPort := .root.Values.containerPort -}} + --- apiVersion: networking.k8s.io/v1 kind: Ingress @@ -43,6 +46,7 @@ spec: rules: - host: {{ .ingress.host | quote }} http: + {{- if not .ingress.paths }} paths: - path: {{ .ingress.path | default "/" | quote }} pathType: {{ .ingress.pathType | default "Prefix" | quote }} @@ -50,7 +54,19 @@ spec: service: name: {{ $robustName }} port: - number: {{ if .root.Values.svcPort }}{{ .root.Values.svcPort }}{{ else }}{{ .root.Values.containerPort }}{{ end }} + number: {{ if $svcPort }}{{ $svcPort }}{{ else }}{{ $containerPort }}{{ end }} + {{- else }} + paths: + {{- range .ingress.paths }} + - path: {{ .path | quote }} + pathType: {{ .pathType | quote }} + backend: + service: + name: {{ $robustName }} + port: + number: {{ if $svcPort }}{{ $svcPort }}{{ else }}{{ $containerPort }}{{ end }} + {{- end }} + {{- end }} {{- end }} {{- with .Values.ingress }} From 71d1472a64251b0cd6f80d26367c41388bcb9b9a Mon Sep 17 00:00:00 2001 From: mels Date: Mon, 20 May 2024 13:04:58 +0700 Subject: [PATCH 2/5] fix: fixed ingress tests error --- charts/cron-job/charts/common-0.5.1.tgz | Bin 3075 -> 3075 bytes charts/onechart/charts/common-0.5.1.tgz | Bin 3075 -> 3075 bytes charts/onechart/templates/ingress.yaml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/cron-job/charts/common-0.5.1.tgz b/charts/cron-job/charts/common-0.5.1.tgz index d02dd1ee3c9d1e48cf9e822df25a2caa6f885d26..dd40e5be8f6704ab5505d9aedbf25c70c40f9719 100644 GIT binary patch delta 3029 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 Q1^@v6|5H>^#{gIW0CdO#RsaA1 delta 2970 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 Q0{{U3|8o4CgaB9o07?q!&Hw-a diff --git a/charts/onechart/templates/ingress.yaml b/charts/onechart/templates/ingress.yaml index 2efb303..3e01a68 100644 --- a/charts/onechart/templates/ingress.yaml +++ b/charts/onechart/templates/ingress.yaml @@ -5,7 +5,7 @@ {{- if .longName }} {{- $resourceName = printf "%s-%s" $robustName (include "robustName" .ingress.host) -}} {{- end }} -{{- $svcPort := .root.Values.service.port -}} +{{- $svcPort := .root.Values.svcPort -}} {{- $containerPort := .root.Values.containerPort -}} --- From d8f81e61349bc719749a777f80cbc184209fc36a Mon Sep 17 00:00:00 2001 From: mels Date: Mon, 20 May 2024 13:12:15 +0700 Subject: [PATCH 3/5] feat: added default pathType when using 'paths' --- charts/cron-job/charts/common-0.5.1.tgz | Bin 3075 -> 3075 bytes charts/onechart/charts/common-0.5.1.tgz | Bin 3075 -> 3075 bytes charts/onechart/templates/ingress.yaml | 2 +- .../tests/ingress_multipath_test.yaml | 21 ++++++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 charts/onechart/tests/ingress_multipath_test.yaml diff --git a/charts/cron-job/charts/common-0.5.1.tgz b/charts/cron-job/charts/common-0.5.1.tgz index dd40e5be8f6704ab5505d9aedbf25c70c40f9719..47d0115532c9b4e7a30254291719cc81754a9606 100644 GIT binary patch delta 385 zcmV-{0e=327=sv)v47I<_8xS)M<;{s1L%AKUTTy{MZ|;7XZPg~?i(SJ(zhriC_Nkr@ub?w&whr8tCyjsy``!Mtd%6ZXPx zaNi@`(<;j4U*RlGh(dYzKH_XlCo__64Gz}He{azBz9mV9GMp13;r2FYx7$GlK)S&P%HkoMnI>M4G?<|xF;Qd~ z09eepzJ_AAm0b!x%A|TpX4r!8H6}>W%;m!z@a& z7@;-AWY#t)7EszUEePQT7-cas1t+??3337mXmj+N09XJ39a6Ia delta 385 zcmV-{0e=327=sv)v47kjbRTrOM<;`$2hjNfywoU@iiiiD&+f|~+&4lbrEgJ4%GnU+ zM?s7-5;Rrj{S+Q4u0p$V#yOZSv*aLUa f*|Wd}8Uq2|liLWb0l%|}3337m@Y6xy09XJ3z4o#l diff --git a/charts/onechart/charts/common-0.5.1.tgz b/charts/onechart/charts/common-0.5.1.tgz index 56572b4c75672f2ce30f79a4c85a9a1c9ae5b709..538ffecb1bba4f94fd52cefa225d624fae5d6450 100644 GIT binary patch delta 2765 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 delta 2765 zcmV;;3NrPB7=sv)O#*BOkxxv2&Y;&b|93ha|Nl<6cl4m!8yp?=2gid!|3RmF)H~@v zfX)}-rAC=lL_Fwxc3=MBz7ZlReTza;&W12Q3SyLzps6zNr|=6VGl=xwfH4>FYc@i` zP@xPMnc)!Z?g`XYibF`~NDy%q%!~FqVL$8!_dUWrt)g8170%LxD3phP?<3B}bTT99 z*5F{B{P$0~p8WUwy`#PS?}Dzc+YsZJGK7}h3*lk|s5EIo`}Q`_rRW&KwhI1k$ z+};N5b~~s5NH_RESv-U@)5Hss1~XJ7CW;IL0E-#d*HG-XvP;27nN%;y3|kPs#srDP zP`~P4Y(<%p$kwhDFv+%mR6<6WNZk>DVVFfp79+H#n9SM+#X?)A1tHu3qbx?Ipr@-_ z9(6TA*aYF=171CWgE>iH_+xG0x&u=LZf^}wrr-_ynQ>*f(G4Msmptkzz3+w3sZstF zp$x^Y4U)T3WFHJX-vF)}ZrMPjh5tS^3}Sj263B;GY>vj1Du{=0+v`G3&gpZ|A44f5}70N(+?1^nRubI-<) z7OxT`f$EvHSROrcjDC_}d|`5>o2(OF8mTSP@FSIf+Kwo3Le}&0h76NAeo4D;j_sA1q01Uh(FfYsMruJvL%vF@+mV#I~4m z7NN2q)=x+2ylGg8gLO+$>vrKvTDb&`byl_QY~}UMf7b5$QubjT|FxF0W7-k^clsUQ z{_78a27CP92{quqvjJ9^eT!11E7)3fHqp2EY>4PpO8(5S+1%T}pu4j@x7432U7>CE z<&FkDWYIU}%>4wa%l{OU6ou4lzokCb%KuT%m;cU5Z!iD5pzG_y$1ta}AxKo9g<4DM zk25_j(G-X9_)s5jbg|$}pjKZCwFPQQ6hwr7!3ZIf7z2?`kQfU0hY{H)K$s~Yvr)`v zgfjhdiAfT?yM+Jz>)-GjQItV~N}-TXAf^+lI?)Sg9AcR)C1vemU4z%94@|1*MqJSHJ zP$FXy435nson2((G5u)DRFUDn*Yqw_m;aQ<7b!+tybQ8N{`;NIi7)@%ljFVo?}8dc zrq}=#)d+%hi&WzVs~n-5MUXVBtAj{2lU>Ydgr`x&Gp1}uZpzF0 zS-`L0Fi9CzXN9}mA8|2Pl`{S`)DByJZqUm-7a=Z1CMI%K7V@K4UZQh4Yds&od zQKvjUWs06U6>UtE3XGp-g0jg)G{rbeD4RSt(bGKn*++~rb33$LaC4=9${lV&GoqsD zvyZ7jDJf^t&C?Y>;MEXXBu&E)<&hzz{E#xK2#c^)DG$I?6h!v{&zYAsH^UuzsRjIO zc4wuiqj<^_KDqkUuvcYm%B9k%&}zD|;LN+bJdHwM7Pv!PxU%OIPxNf)dDZ#O>m7I8 zPNU6x`r4@B{5Rj`+3&%B2Jye+j_?2J9q;|WyP>A@-#pqd-tXMf(PsG~+LRDFgHWTT zHnW|GdWf@BT|K34;UWlCSwskdeXhRMxb(GEX%^+PXI zLpqO68RKdJ+5lvcP(KxT6;{|T5XclG-2#asl=6jE^}}FckS&sb-DBZvB=PUsmVc$S zZIxT8xF8cfNiyfvO<5e1>*XqXv2sDnzjsx(nKwoMs<7Annfji!X7~Gj%h0z>b^Nzc z&7Zay1zd~&T_67kCntkF{_lbs@V~YJRwx6%to$MvKBC&{ruraxIPa1qosw=DZCu3Q zcL3%!z_t^RhZ948m(eK6q(afYq%jVmr9_6U5~qcIeB8QLN@}XWe8UBoFQP*he#`-3{;(>bs8g?e! z$*(xlHV*6-wbrh~|6COI{%9HgZ}SGoI{fdR9Q*ix)amYj@qZVz6#sqfultt#+fQ3V z?62_iz}+B!<2Q#5x6Iale)wrXeb;%frZ;YKRxdiSxg(~;Iy_11+2i&xd0s<4F=p2nQancEk zgNMLyVw`ANiRsfB#`a#*-yVga?Ox!_)YL3#bpQ!v7zW|fi}x3b3k)8@nc1@N_Ur<9 zVk%@1PN+IGe=Yk#IQmN*n!iQDbaJTw6t8m54i^oLNc15~&9^TycpS>hG Date: Mon, 20 May 2024 13:18:59 +0700 Subject: [PATCH 4/5] fix: fixed typo on ingress.yaml --- charts/onechart/templates/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/onechart/templates/ingress.yaml b/charts/onechart/templates/ingress.yaml index f0e0cb9..722813c 100644 --- a/charts/onechart/templates/ingress.yaml +++ b/charts/onechart/templates/ingress.yaml @@ -59,7 +59,7 @@ spec: paths: {{- range .ingress.paths }} - path: {{ .path | quote }} - pathType: {{ .ingress.pathType | default "Prefix" | quote }} + pathType: {{ .pathType | default "Prefix" | quote }} backend: service: name: {{ $robustName }} From 970df1841e3a762bacea1dc524dda00a2e571b25 Mon Sep 17 00:00:00 2001 From: mels Date: Mon, 20 May 2024 13:21:17 +0700 Subject: [PATCH 5/5] feat: create new test in ingress_multipath_test.yaml --- charts/cron-job/charts/common-0.5.1.tgz | Bin 3075 -> 3075 bytes charts/onechart/charts/common-0.5.1.tgz | Bin 3075 -> 3075 bytes .../tests/ingress_multipath_test.yaml | 9 +++++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/cron-job/charts/common-0.5.1.tgz b/charts/cron-job/charts/common-0.5.1.tgz index 47d0115532c9b4e7a30254291719cc81754a9606..3d4dc108cf64b151255816d012d2a3f7a33055ff 100644 GIT binary patch delta 2918 zcmV-s3z_tT7=sv)NgL*B#ZF=eFtC3FX?M5SZ5uR27Y7t5XlZP7Bavh#f1Pr6a5f=A zh1X=7JlZ^UI-O4c_}Kj4>2&=6JKf{MN8RK8;bE`e>-A3_b-IVWPUjJHz5p*Z%A_LV zQRlP!@(1^g5J~Af6q0f_fZ1UXql^Sim3cpfUoe?Mr1u7lxPV`?Aqs{HWx&W32Vi$k zpsrIKKthLti0fchwATrHe_=Ox=n?K{8Rhb?aGEAWp*;8yaWd52dm`2chdFb zzt=nN?c{$ObaT^&7)O*LwCr98=Nmw!NekL{cY!WNM-aXvNrp0<5h3C3E@-#gK?Oj% z!6jw!0M1MkFG(6qQIVJ^G6(=HX58FBvD?Zn1s`Toy&_X=LHGs}eI68Db)JM*xOl7A0AX(3)T}Z5tE|ZJ8E?a0`sG7@2}&UET7is|mu!2z!@! z{S@|QB!R(?wSnsnOcA)dGd!7sxA14imElG=ge+e0sHgOy7e1#(`B#K86x)*j!~RiS z{`*He`QHXL%YVKBe@gjpkldvrD>2FhRo7>nDg3Agft5(b|3RinDNSA}MiHso}K5tVIr}BxB?89bgjE!B~UkVuzuHe@Rb*D z;#0wg7$PIX1Wmp`5>tj!p6eVvWqLAxMrHLtO4Ot>54HiFTynD3RLN+9dc429eOs`5 zMb*S>SE5pse~smQ7{!+NH+OB2&Erkz49n5EG-k-S+||&qSmJ zbj-LwyZU*WBP)x_|3;^@*u4V(%up)FSn!}}Ub!gh8w|d*EN|vMU{^?XE9ne;?NIUu!u#rY+%rr`PfAzh1w;!~d;N z1O7W3V2Rl`FIBpNtyO0eeT&bAh+e1U&kUQ*y)_KFd)sph{khT=+Gbzwuz!p!`lg(@ zpFnl_pJ0-rkb3Pm)W=HsKRov3zjJc3lmBhd&CS6+%;~GGVetNUQ=B9T3^N7quOJKzn+;&* z>R1b8AaINy-(Z@M2v3s)TJPWg{`VGyf6!{T;1-0o1D zJ#h>GKW$KrAXv9ZHEyuX5xQOkNwc~Wg$O$a-K_}V@@sq!6C%$A z8uXPDA~0^Z3YVXor{})Rd6M_uhN53Ru{v>{7498uIT~Sp@?NdT?Uhi-hPQlO+cqe=(oHR3M2@Bf+J7#bcCZ z4jGL!xS6{N#dAXpwBCRjb;{#Yrs%0t(Z)on!1!4vC>viy6O6NjvhfQOJ)Os?mOcKErkA9}7D(phxM7*})91|ai<`l-OHu*7zOK&BY!7DyDKlrOca9|UuQ zY@X~M3*R7#f7iDBYprdo+)Bj-8S6=sIj?TY{Fq!XSJ8`=3tIlYtFq0!Df(B1z3$J{ z_pCL$f8QTkhQ4L02!DazYS`@|Jnvvq73}9@{3^jkZP-& z>VxFLtV@z~Lb_$NaUO%;0+`nT+fG0pP7GZ}qa>3GMf-}zIDnQC8MaECMiz35N2?uRZ&WZnfZMj?e^uBUg?X^0!GU0l9PGR0L%nJ;{2A4} zuF=+w^-X-m1NQ`b_mUvZ?Z9oQ{utz3uyxhU+z(IWicm6KwYgEU7-*x`^ ze=1-V{-1RG```VO-tPAwwn7c~-xxbta0%RV3RUiZdnW_u4!Co7uzsW4Jxu6ctI^`M z{ZWg;z_s9B#Q)Y~izKxW$1>=Urx))7xN)Q~k!VZ%fr{yX{m;J}FLJ!wQN@gw+3GrVP6PIqf2Dr4K+`=c=M(C*DMmB!`mRQqf6AsK z{ralDBGpniHqyYlthnN63Q?P!e=NV|Ygd<(Y&R&z{R5Oa=b~BNc=+Msi?_3;stC&Sb=6Jovu>ksa-5N8cp< QHvj_5fG_02m9(Z2$lO delta 2918 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 a4T$V%PkZ_%>AwL00RR8F{5h-uSO5U9sLP%J delta 2928 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 a8xYykp7!)j(tiU00RR8+i=RFKSO5Tr<<0~E diff --git a/charts/onechart/tests/ingress_multipath_test.yaml b/charts/onechart/tests/ingress_multipath_test.yaml index e49df84..647611e 100644 --- a/charts/onechart/tests/ingress_multipath_test.yaml +++ b/charts/onechart/tests/ingress_multipath_test.yaml @@ -10,12 +10,17 @@ tests: - equal: path: spec.rules[0].http.paths[0].path value: "/" - - it: Should use path + - it: Should use paths set: ingress: host: chart-example.local - path: "/mypath" + paths: + - path: /mypath + - path: /mypath2 asserts: - equal: path: spec.rules[0].http.paths[0].path value: "/mypath" + - equal: + path: spec.rules[0].http.paths[1].path + value: "/mypath2"