From 11d1506ccc79c7700df827f76ce9cd287ba183d1 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Fri, 24 Mar 2023 23:24:51 +0200 Subject: [PATCH] Move Pihole to ix-dev and fix DHCP/DNS (#1049) * move pihole to ix-dev * always use the web_port for webUI * Apply fixes for DHCP/DNS + hostnetwork * Don't attempt to generate service at all on hostnet * clean url --- charts/pihole/1.0.12/Chart.lock | 6 --- charts/pihole/1.0.12/Chart.yaml | 14 ------ .../pihole/1.0.12/charts/common-2207.0.0.tgz | Bin 4976 -> 0 bytes .../templates/tests/deployment-check.yaml | 21 -------- .../ix-dev/charts}/pihole/.helmignore | 0 library/ix-dev/charts/pihole/Chart.lock | 6 +++ library/ix-dev/charts/pihole/Chart.yaml | 24 ++++++++++ .../ix-dev/charts/pihole}/README.md | 0 .../ix-dev/charts/pihole}/app-readme.md | 0 .../charts/pihole/charts/common-2207.0.0.tgz | Bin 0 -> 4975 bytes .../charts/pihole/ci/hostnet-values.yaml | 22 +++++++++ .../ix-dev/charts/pihole/ci/test-values.yaml | 4 -- .../ix-dev/charts}/pihole/item.yaml | 0 .../ix-dev/charts/pihole}/questions.yaml | 45 ++++++++++++++---- .../charts/pihole}/templates/deployment.yaml | 41 +++++++++++++++- .../pihole}/templates/pre-install-job.yaml | 0 .../charts/pihole}/templates/secret.yaml | 0 .../charts/pihole}/templates/service.yaml | 7 ++- .../ix-dev/charts}/pihole/upgrade_info.json | 0 .../ix-dev/charts}/pihole/upgrade_strategy | 6 +-- .../ix-dev/charts/pihole/values.yaml | 2 +- 21 files changed, 137 insertions(+), 61 deletions(-) delete mode 100644 charts/pihole/1.0.12/Chart.lock delete mode 100644 charts/pihole/1.0.12/Chart.yaml delete mode 100644 charts/pihole/1.0.12/charts/common-2207.0.0.tgz delete mode 100644 charts/pihole/1.0.12/templates/tests/deployment-check.yaml rename {charts => library/ix-dev/charts}/pihole/.helmignore (100%) create mode 100644 library/ix-dev/charts/pihole/Chart.lock create mode 100644 library/ix-dev/charts/pihole/Chart.yaml rename {charts/pihole/1.0.12 => library/ix-dev/charts/pihole}/README.md (100%) rename {charts/pihole/1.0.12 => library/ix-dev/charts/pihole}/app-readme.md (100%) create mode 100644 library/ix-dev/charts/pihole/charts/common-2207.0.0.tgz create mode 100644 library/ix-dev/charts/pihole/ci/hostnet-values.yaml rename charts/pihole/1.0.12/test_values.yaml => library/ix-dev/charts/pihole/ci/test-values.yaml (83%) rename {charts => library/ix-dev/charts}/pihole/item.yaml (100%) rename {charts/pihole/1.0.12 => library/ix-dev/charts/pihole}/questions.yaml (89%) rename {charts/pihole/1.0.12 => library/ix-dev/charts/pihole}/templates/deployment.yaml (64%) rename {charts/pihole/1.0.12 => library/ix-dev/charts/pihole}/templates/pre-install-job.yaml (100%) rename {charts/pihole/1.0.12 => library/ix-dev/charts/pihole}/templates/secret.yaml (100%) rename {charts/pihole/1.0.12 => library/ix-dev/charts/pihole}/templates/service.yaml (84%) rename {charts => library/ix-dev/charts}/pihole/upgrade_info.json (100%) rename {charts => library/ix-dev/charts}/pihole/upgrade_strategy (73%) rename charts/pihole/1.0.12/ix_values.yaml => library/ix-dev/charts/pihole/values.yaml (78%) diff --git a/charts/pihole/1.0.12/Chart.lock b/charts/pihole/1.0.12/Chart.lock deleted file mode 100644 index 9d78dd0ba2..0000000000 --- a/charts/pihole/1.0.12/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506 -generated: "2022-07-25T00:20:48.289564886+05:00" diff --git a/charts/pihole/1.0.12/Chart.yaml b/charts/pihole/1.0.12/Chart.yaml deleted file mode 100644 index 5fcd136e25..0000000000 --- a/charts/pihole/1.0.12/Chart.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v2 -appVersion: 2022.12.1 -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -description: DNS and Ad-filtering for your network. -home: https://pi-hole.net/ -icon: https://github.com/pi-hole/graphics/raw/master/Vortex/Vortex_Vertical_wordmark_lightmode.png?raw=true) -keywords: -- networking -- dns -name: pihole -version: 1.0.12 diff --git a/charts/pihole/1.0.12/charts/common-2207.0.0.tgz b/charts/pihole/1.0.12/charts/common-2207.0.0.tgz deleted file mode 100644 index 2adf94b4383245692b6eecaf85bbd43bd62e89de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4976 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 diff --git a/charts/pihole/1.0.12/templates/tests/deployment-check.yaml b/charts/pihole/1.0.12/templates/tests/deployment-check.yaml deleted file mode 100644 index ca148e6b40..0000000000 --- a/charts/pihole/1.0.12/templates/tests/deployment-check.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- $serviceName := (include "common.names.fullname" .) -}} -apiVersion: v1 -kind: Pod -metadata: - name: {{ .Release.Name }}-test-pod - labels: - app: {{ .Release.Name }} - release: {{ .Release.Name }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: test-curl - image: alpine/curl - imagePullPolicy: "IfNotPresent" - command: - - /bin/sh - - -ec - - | - curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}:{{.Values.web_port}}/admin/login.php - restartPolicy: Never diff --git a/charts/pihole/.helmignore b/library/ix-dev/charts/pihole/.helmignore similarity index 100% rename from charts/pihole/.helmignore rename to library/ix-dev/charts/pihole/.helmignore diff --git a/library/ix-dev/charts/pihole/Chart.lock b/library/ix-dev/charts/pihole/Chart.lock new file mode 100644 index 0000000000..fc9d0c4c85 --- /dev/null +++ b/library/ix-dev/charts/pihole/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +digest: sha256:a301ba0f99ec1e08a60a7f0a0320aa02d225993572f2f056f09520f06df88b37 +generated: "2023-03-22T14:34:22.657500007Z" diff --git a/library/ix-dev/charts/pihole/Chart.yaml b/library/ix-dev/charts/pihole/Chart.yaml new file mode 100644 index 0000000000..bbb20a318b --- /dev/null +++ b/library/ix-dev/charts/pihole/Chart.yaml @@ -0,0 +1,24 @@ +name: pihole +description: DNS and Ad-filtering for your network. +annotations: + title: Pi-hole +type: application +version: 1.0.13 +apiVersion: v2 +appVersion: '2023.02.2' +kubeVersion: '>=1.16.0-0' +maintainers: + - name: truenas + url: https://www.truenas.com/ +dependencies: + - name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +home: https://pi-hole.net/ +icon: https://github.com/pi-hole/graphics/raw/master/Vortex/Vortex_Vertical_wordmark_lightmode.png?raw=true +sources: + - https://pi-hole.net/ + - https://github.com/truenas/charts/tree/master/library/ix-dev/charts/pihole +keywords: + - networking + - dns diff --git a/charts/pihole/1.0.12/README.md b/library/ix-dev/charts/pihole/README.md similarity index 100% rename from charts/pihole/1.0.12/README.md rename to library/ix-dev/charts/pihole/README.md diff --git a/charts/pihole/1.0.12/app-readme.md b/library/ix-dev/charts/pihole/app-readme.md similarity index 100% rename from charts/pihole/1.0.12/app-readme.md rename to library/ix-dev/charts/pihole/app-readme.md diff --git a/library/ix-dev/charts/pihole/charts/common-2207.0.0.tgz b/library/ix-dev/charts/pihole/charts/common-2207.0.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..f106775893801fc023dc40482ae02db307f60e55 GIT binary patch literal 4975 zcmV-#6Oim5iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PH<$bKAC-{j6VcmPzN@*_wLzwd0x2tk=%H^)z)daVGb6c6MBd zge24?zyP2eZR-8)J9v@cOOowaNm}89Es_TZ2f%sp-~fzRnljoyn;|a41xl0eK7Sbu z27{x61O0z67}Wm{MuWk3!-Ipt(a~^ta4`ICFdQ8mj=qDz6VTEqxsZr|H+Xbg_0D}G z1!d$t=7KPK0`pN1Wm$PS?8R6_oMcj8pF%>$9PtH2id$g9IFNtA>&b*f1SN2WBudz{ zM^TDTz%W)%E;4-LD)#0M_h>XY4hP|&_oe&)S1(rnB~G&hNi6!;0`obEFp46UQyI$a z(JEn;{2v?-Yw~||u)mf6jg(KH`Y(ECnhC(pJlLu4z3AWF^*(*tgBVW;#Sj=~39B3u zz~0?mucAkWy&FQ~6Sy*frxss|C5n+mCp`e8BtCrtLZc*)OXTW-a81~nmng*ngzyJ^ z$eF}&cV{t(3`GV__!cJ^2^?O!+g0cUjd3Cr=w72q^DGoN!I5PAmA*9XQ9@%(B^>BZ zs>+zg`uCTfxX)A?@*gEg2u}}u1_iJ}{znI+gSz}54!82Zk)q}Q-HZruETGi@7JvjG z7$-T-IHAVcqa<-M4Q%{7j-&uNLlO|j5OItoj(fL6&IkoL!`26I)<5i2D3<4()CYyI zJ)ff_#{y1%gwVjc<_id0M~S@xYgZ?eJV~fkBCaNxzzm6>@uFxYP#{1=sW?T z1zY4<#<;{W5b8u)zX1eYlUw7jns|o_n+RYhCXs}|5*v6OGb0idg1HNSfaE0gW_Dzn zb2fVwbFVP&o^Aj0nD({GO8bAUXX{a3zzX|692^|g?Emrc!C-6uH&L|xe~W31jd@pQ zThF*w2q=z;QnDy{qwi@apymRsZPuOKdzRHR@Ajwn(2(I-NONPaVnqCV`nOZ&9MLI; z=hqs6fzm*G8qB;is9(-PNW`aDzA2uS*S=AnNtp$%O2(OF5lbvGd*y?_J9|?=7Y158 z2c1ZrAyUJyEm7Fi_q(t|nRMnTr1t)l;0LWr=^(s5XXRua&+Pi>YqqqqQ!fLLwS1tIth$FH1BEv{*g~-`nLA z{84grRioHI+h~mIj*j@4YGF$)Td7!R5hw7y2+Hc=4PJOxIy?mBDogFxHj1&NEYtsH z_Md$H_h2}x=YJjTA8prvH&V2&digO!G}b<$j!m+OS-#c!vQtI*%B5w&cE_&RdXdhU zL~^%;rFPAB$33?iTCZF>^`L-W&oSpD#(Ehjrx6_O+Z7?R#tOk+unYHI*QFf`y7V3^ zxyGe6RrcEKz?oha2UHBgBu|nBe8^EkCPZ0;EYqVN_Wp@Y_cXjzom4X*V2mS_3k-s# z7=A9ax0$O6!AWcu>JpL?iDQrq z&4eY5#jqJ9l^mohe%0s7({(txNv6-NVo%w`D%R(8ZQP}G{AvWIOLjb_RBFolbc!K0 zV_GgZP}*-=#hljttdQglsm}oBcj+*4oFyp25d3=p!F8|}xA|Q<#}e~YkyOjJv(n5s z#9kDGga6jQqFZfAb1f3p1nZKmC6M=&GH-}2(!C;maAzH_bN8NOUk@r&0wMLO@O7a{ zhSHi3#W5fd2B}u6RZumkCAR|+AaHlqWJ|9es2bOk)|!yk6h%W=%TZF(Rzp*(-6Gc8 z;LW#L+WmiH*Dx3TYfR^aGpb{w4}29^;s5UshNG(gKN=hz9c}&pO%y->!<%ZDBTmpb z!QDaMf=5EH-g{fk(`}f}-Ch0KUuv?N+85Cbr%1iclNd?-GhUQQVns%nk1dF1IJ&WL z2@%q$!eFUu%5NpdSN zy~PuA2Rcxd1XK~Ka)TFL6_jnMN5-5@c&f3|a1R`sCZGujbu2r#Es1opfA{+La{d?X zIn0k6Luc=s!`DiICk8hBRue_%1hm!eq;!?sR~jjEEC}0R$3F0|>G_ zN#3x8M1|j_sXKwd+j&vegS)$qckGM_>0Yq+yt?+jt!Q=Wi3cFj6z=W<)9#ysoXXaZ zlFE(e$gPzBjPb{A0$#QLKNvRh|M!R6{LhV)s{ETg`A5pXtFBYdMKuIjrt8~eea|~p zUdqQGOtQY#6D9D2m4(LDqAFanexT4<%1vs$j*#zFbNe-#GQr<$;_|C`P?h^G#opH_ zhNKx2((T=HzdbDOmewnNvVIejS!KDqE8m$k25QzInhW7uA8=dB(yIT<6$sJ4&Lw$d z64(m;KN>d9e>pxnJlyL4O_Zws_m-aA-r`P;@8!%oSflG(cO@6Q%eyyb*Uo8p^iEE1 zsi){5$5}!mB>F;fB=L07cj(sXr@3=2G91}G4;G!Kw@70c77J+Zxi%`U$rFFCZc!0+V7Jp^DQQbM-hN-fzB6#2Hq%T}2VD`C8?$MB~rt@fW{dCT|> zq0|0#{K(CJYs7!{4;uS_hWiIw`@e}|G9fOn;A|~jRdPlcQ&FiCl!?LWSsBkLE==-t zG zYn&$iY`u~EDn{_R9Ri)V_V9sfMB6*&qG+ztzG{4m<$de=r!zGu&hl|Wq7vLx5B-^I zCPrAGjFUN%_y#v(`CnzwZI%AlIpvQ$17hX+Uw!|_XmB{%#(y?av~B_bcx&ezycu`O zs9P76z@GcJ!+5#7iz?OTkiSykqIfvX@`?+oBOC>C<@9O%dYQn_U~WZfQ=6hJH-4st zjj~(=xaTQO8DCUDQk)hb4TrRY)aDs@osf+XLfa;_FXgPZ%D*uepCk0E%PRkGxZgPc z_i!8k-Apn2ER@~XDOL!y-DeZH!3(pi$og!`=|egfoiK{{qWg5qkg)Ay2bR ziE!mfxYX`DH^i^u?&~8Oi+wh~7zp@Y7>}`>g#dOc_5Xn18KDsT0KTJEY2ELKISKOA zL#St>!UK|l9xvTX7%PTga}wit`6i1m&Dh(rR%zG&l5sS}{cDtESLXKO-#GvI z_;`P-|2IuJ3| z%IMVZ`HHyxnX?`0?feILj^?S(ovs6yc#0)G$#bkLScf$(Hbm;y=4qKM(%gkt?6zD9 zXgx!>>Cn6u0_w7Yluky5+m7-xdMzKCvSU+%AC64Oz zuH=+eDJ#VWKFx?aS4I)0PbYQL(jAlPW>~Rd2JLW$ic_yUc(u-uelC9p54W*p$(5bl zV`?&Pz|%}F&IyO-#ZNnI2H4#^flrllr_EkMH%rBF-G*gCcmJg!rZ`*Gu^z`Ca>8+J zQ>N5BQzk)R8C2@~XPXwMUAG?z{m3*^^3idNoy$kHgXV2*#7H7xHxJcXc|K>!xx#Vs zBN$vhupSfdhEHz6B*m=)aWUMDK3HMlHhlS$9qzw#mXd!NG(kyI>jAUfhqA1(OZOjG z>Vt{rmg4o+)E(Ie^6YG~DETI++Ax$P>=wt@stt4Qfw6ljl>r1o zS;8R3^8f<-S&X1+1dR(67WWFos_E-YVH8z{MJvY>`O#%`hulc zf&KNn+&mGHmmARVz(;EyQH5-dV}WJbLUF3^TQz>dzgFFHKfHDkXE zJBfrHcl!@WFx`dyDk_IgM~}Q=sW<07TGG*8b7pI_wvjSwLa#&48YB%BNirT^o0Iyk z=PYR$5qHDOr=__VN zpOEHyv@M^4R^-j;*x1m!w~ofBuMRJ`cH0NMi`uTq z3fHRLE{4rzh|>Nq_y5R8I{;7m{fEPYQDgtd(f0iJjg)F`Qt9{Ubtdw$5P&ffI0i<+ z#uk<*E3FqbsKv8ZDwyY9;KIGA#=?F1Pf@s*0x8$~o>w9z4p;FKye6)e@8x_uZ=+WJ z!x>IeGNp{;&)>#M`QJaRfB*aFczgcqM#?kwt|Bp~dZE{FfO_AcFwRL56FP+qMK@@Q zMc8`=`fxn^K|ldwhLZ%Q2^*WeNQ6#*0FDzR$s8L!Qr<^2?mYvFr$(N4GL9$YBaY3N z9{+7O1idi8sII9%Z>CY}!|U+@+Y)eu-#|qMJN}3DL*>gyJ^qy$HwXruQP0srt=0nf6}%U+)>bN1U)+ zz{UAX(F-%qe#epQg(SwPZ@@YGy%)|!#A4k4%0*unEB|j_o}T~mGEC#AXk%sm&!8dy zgYEZUHdCI#EBjIZvt=LkSNAkPulM4`KTqFYUR?g;1m690aRp~ToxXhs7guok`W^i8 z^7Qf@yn7A*^%5>Fuil-$diC-g&M)4+JbU-**B38(=6Fpa0KtF%gp;(|{QvCCq|C%g zzwf>z5VJ`1CCf;pT~h^mt&eXN{bvehH-ro2m}fc9n9zCZstZ%j@=Pf&_X%P)B@v9V zyv5jj{N(08#DC6MYR`=oA@q7zghm(;Buodv%mbJ(^*XNW2<09)<)n{Twj{wV5?WzO zrA0Z8^9VzV2$h&3g*0M17F0HGk?XG~=R%*htdHR43qa9KJ7Wl@3?+(^F;-nUfBS3L z>pgo07gTZ<=Q?G_4yZZ&)@J4i*Xv@l;0z}j<^pbKB$`2lXmP5uWDw&yPFMyM-#W5# too=Kjs4*qG&LDvKECLU|1wFSd+p;a&vMtr}{{a91|Npei>gNE8007=>xvc;I literal 0 HcmV?d00001 diff --git a/library/ix-dev/charts/pihole/ci/hostnet-values.yaml b/library/ix-dev/charts/pihole/ci/hostnet-values.yaml new file mode 100644 index 0000000000..110f705716 --- /dev/null +++ b/library/ix-dev/charts/pihole/ci/hostnet-values.yaml @@ -0,0 +1,22 @@ +appVolumeMounts: + config: + emptyDir: true + mountPath: /etc/pihole + dnsmasq: + emptyDir: true + mountPath: /etc/dnsmasq.d +dhcp: true +dhcp_start: 192.168.10.2 +dhcp_end: 192.168.10.254 +dhcp_gateway: 192.168.10.1 +dnsConfig: + options: [] +emptyDirVolumes: true +environmentVariables: [] +extraAppVolumeMounts: [] +hostNetwork: true +ownerGID: 568 +ownerUID: 568 +password: admin123 +timezone: America/Los_Angeles +web_port: 32000 diff --git a/charts/pihole/1.0.12/test_values.yaml b/library/ix-dev/charts/pihole/ci/test-values.yaml similarity index 83% rename from charts/pihole/1.0.12/test_values.yaml rename to library/ix-dev/charts/pihole/ci/test-values.yaml index 36caf64883..7c8b3220b6 100644 --- a/charts/pihole/1.0.12/test_values.yaml +++ b/library/ix-dev/charts/pihole/ci/test-values.yaml @@ -15,10 +15,6 @@ emptyDirVolumes: true environmentVariables: [] extraAppVolumeMounts: [] hostNetwork: false -image: - pullPolicy: IfNotPresent - repository: pihole/pihole - tag: 2022.12.1 ownerGID: 568 ownerUID: 568 password: admin123 diff --git a/charts/pihole/item.yaml b/library/ix-dev/charts/pihole/item.yaml similarity index 100% rename from charts/pihole/item.yaml rename to library/ix-dev/charts/pihole/item.yaml diff --git a/charts/pihole/1.0.12/questions.yaml b/library/ix-dev/charts/pihole/questions.yaml similarity index 89% rename from charts/pihole/1.0.12/questions.yaml rename to library/ix-dev/charts/pihole/questions.yaml index 3c7c2e6795..1a13f03b2d 100644 --- a/charts/pihole/1.0.12/questions.yaml +++ b/library/ix-dev/charts/pihole/questions.yaml @@ -39,6 +39,7 @@ questions: min: 8000 max: 65535 default: 20721 + show_if: [["hostNetwork", "=", false]] required: true - variable: dns_udp_port label: "DNS UDP Port for pihole" @@ -48,6 +49,7 @@ questions: min: 8000 max: 65535 default: 20721 + show_if: [["hostNetwork", "=", false]] required: true - variable: dhcp label: "Enable DHCP" @@ -55,16 +57,39 @@ questions: schema: type: boolean default: false - - variable: dhcp_port - label: "DHCP Port for pihole" - group: Networking - schema: - type: int - min: 8000 - max: 65535 - default: 20722 - required: true - show_if: [["dhcp", "=", true]] + show_subquestions_if: true + subquestions: + - variable: dhcp_port + label: "DHCP Port for pihole" + group: Networking + schema: + type: int + min: 8000 + max: 65535 + default: 20722 + show_if: [["hostNetwork", "=", false]] + required: true + - variable: dhcp_start + label: "DHCP Start Address" + group: Networking + schema: + type: ipaddr + cidr: false + required: true + - variable: dhcp_end + label: "DHCP End Address" + group: Networking + schema: + type: ipaddr + cidr: false + required: true + - variable: dhcp_gateway + label: "Gateway" + group: Networking + schema: + type: ipaddr + cidr: false + required: true - variable: dnsConfig label: "DNS Configuration" diff --git a/charts/pihole/1.0.12/templates/deployment.yaml b/library/ix-dev/charts/pihole/templates/deployment.yaml similarity index 64% rename from charts/pihole/1.0.12/templates/deployment.yaml rename to library/ix-dev/charts/pihole/templates/deployment.yaml index eb404f4835..bb8eece8e0 100644 --- a/charts/pihole/1.0.12/templates/deployment.yaml +++ b/library/ix-dev/charts/pihole/templates/deployment.yaml @@ -37,9 +37,17 @@ spec: - name: extrappvolume-{{ $index }} mountPath: {{ $hostPathConfiguration.mountPath }} {{ end }} + securityContext: + capabilities: + {{ if .Values.hostNetwork }} + {{/* This is needed to be able to bind 53(DNS) and 67(DHCP) ports */}} + add: ["NET_ADMIN"] + {{ else }} + add: [] + {{ end }} ports: - name: web - containerPort: 80 + containerPort: {{ .Values.web_port }} - name: dns-tcp containerPort: 53 protocol: TCP @@ -51,13 +59,44 @@ spec: containerPort: 67 protocol: UDP {{ end }} + readinessProbe: + httpGet: + path: /admin/login.php + port: {{ .Values.web_port }} + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 2 + livenessProbe: + httpGet: + path: /admin/login.php + port: {{ .Values.web_port }} + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 1 + startupProbe: + httpGet: + path: /admin/login.php + port: {{ .Values.web_port }} + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 2 + failureThreshold: 60 + successThreshold: 1 env: {{ $secretName := (include "common.names.fullname" .) }} {{ $envList := (default list .Values.environmentVariables) }} {{ $envList = mustAppend $envList (dict "name" "WEBPASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "password") }} {{ $envList = mustAppend $envList (dict "name" "TZ" "value" (printf "%s" .Values.timezone)) }} + {{ $envList = mustAppend $envList (dict "name" "WEB_PORT" "value" .Values.web_port) }} {{ if .Values.dhcp }} {{ $envList = mustAppend $envList (dict "name" "DHCP_ACTIVE" "value" "true") }} + {{ $envList = mustAppend $envList (dict "name" "DHCP_START" "value" .Values.dhcp_start) }} + {{ $envList = mustAppend $envList (dict "name" "DHCP_END" "value" .Values.dhcp_end) }} + {{ $envList = mustAppend $envList (dict "name" "DHCP_ROUTER" "value" .Values.dhcp_gateway) }} {{ end }} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} diff --git a/charts/pihole/1.0.12/templates/pre-install-job.yaml b/library/ix-dev/charts/pihole/templates/pre-install-job.yaml similarity index 100% rename from charts/pihole/1.0.12/templates/pre-install-job.yaml rename to library/ix-dev/charts/pihole/templates/pre-install-job.yaml diff --git a/charts/pihole/1.0.12/templates/secret.yaml b/library/ix-dev/charts/pihole/templates/secret.yaml similarity index 100% rename from charts/pihole/1.0.12/templates/secret.yaml rename to library/ix-dev/charts/pihole/templates/secret.yaml diff --git a/charts/pihole/1.0.12/templates/service.yaml b/library/ix-dev/charts/pihole/templates/service.yaml similarity index 84% rename from charts/pihole/1.0.12/templates/service.yaml rename to library/ix-dev/charts/pihole/templates/service.yaml index 566328dbc1..dfe6923507 100644 --- a/charts/pihole/1.0.12/templates/service.yaml +++ b/library/ix-dev/charts/pihole/templates/service.yaml @@ -1,8 +1,11 @@ +{{/* Create services only if we are not using hostNetwork */}} +{{ if not .Values.hostNetwork }} + {{ $selectors := list }} {{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }} {{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }} {{ $ports := list }} -{{ $ports = mustAppend $ports (dict "name" "web" "port" .Values.web_port "nodePort" .Values.web_port "targetPort" 80) }} +{{ $ports = mustAppend $ports (dict "name" "web" "port" .Values.web_port "nodePort" .Values.web_port "targetPort" .Values.web_port) }} {{ $ports = mustAppend $ports (dict "name" "dns-tcp" "port" .Values.dns_tcp_port "nodePort" .Values.dns_tcp_port "targetPort" 53) }} {{ $ports = mustAppend $ports (dict "name" "dns-udp" "port" .Values.dns_udp_port "nodePort" .Values.dns_udp_port "targetPort" 53 "protocol" "UDP") }} {{ if .Values.dhcp }} @@ -12,3 +15,5 @@ {{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }} {{ $_1 := set .Values "extraSelectorLabels" $selectors }} {{ include "common.classes.service" $params }} + +{{ end }} diff --git a/charts/pihole/upgrade_info.json b/library/ix-dev/charts/pihole/upgrade_info.json similarity index 100% rename from charts/pihole/upgrade_info.json rename to library/ix-dev/charts/pihole/upgrade_info.json diff --git a/charts/pihole/upgrade_strategy b/library/ix-dev/charts/pihole/upgrade_strategy similarity index 73% rename from charts/pihole/upgrade_strategy rename to library/ix-dev/charts/pihole/upgrade_strategy index 39bb56546a..d584440143 100755 --- a/charts/pihole/upgrade_strategy +++ b/library/ix-dev/charts/pihole/upgrade_strategy @@ -2,13 +2,13 @@ import json import sys -from catalog_update.upgrade_strategy import semantic_versioning +from catalog_update.upgrade_strategy import datetime_versioning def newer_mapping(image_tags): key = list(image_tags.keys())[0] - tags = {t: t for t in image_tags[key]} - version = semantic_versioning(list(tags)) + tags = {t for t in image_tags[key]} + version = datetime_versioning(list(tags), '%Y-%m-%d') if not version: return {} diff --git a/charts/pihole/1.0.12/ix_values.yaml b/library/ix-dev/charts/pihole/values.yaml similarity index 78% rename from charts/pihole/1.0.12/ix_values.yaml rename to library/ix-dev/charts/pihole/values.yaml index b0713af98e..f5a7eaab14 100644 --- a/charts/pihole/1.0.12/ix_values.yaml +++ b/library/ix-dev/charts/pihole/values.yaml @@ -1,4 +1,4 @@ image: pullPolicy: IfNotPresent repository: pihole/pihole - tag: 2022.12.1 + tag: 2023.02.2