From 2c29c9545bd3d15dc2df351f5e269668c44e14dd Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Fri, 17 Nov 2023 11:35:25 +0300 Subject: [PATCH 01/30] Enable sequencer relayer to take a passed in token --- .../files/scripts/start-relayer.sh | 18 ++++++++++-------- .../templates/configmaps.yaml | 1 + charts/sequencer-relayer/values.yaml | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/charts/sequencer-relayer/files/scripts/start-relayer.sh b/charts/sequencer-relayer/files/scripts/start-relayer.sh index 97aeddd7..47b6bc57 100644 --- a/charts/sequencer-relayer/files/scripts/start-relayer.sh +++ b/charts/sequencer-relayer/files/scripts/start-relayer.sh @@ -2,17 +2,19 @@ set -o errexit -o nounset -o pipefail -# FIXME - how to use `token-svc` port here instead of hardcoding? -BEARER_TOKEN=$(wget -qO- http://celestia-service:5353) +if [ -z "$ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" ]; then + # FIXME - how to use `token-svc` port here instead of hardcoding? + BEARER_TOKEN=$(wget -qO- http://celestia-service:5353) -if [ -z "$BEARER_TOKEN" ]; then - echo "Failed to fetch the Celestia bearer token." - exit 1 -fi + if [ -z "$BEARER_TOKEN" ]; then + echo "Failed to fetch the Celestia bearer token." + exit 1 + fi -echo "Celestia Bearer token fetched successfully." + echo "Celestia Bearer token fetched successfully." + export ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN="$BEARER_TOKEN" +fi -export ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN="$BEARER_TOKEN" /usr/local/bin/astria-sequencer-relayer diff --git a/charts/sequencer-relayer/templates/configmaps.yaml b/charts/sequencer-relayer/templates/configmaps.yaml index b2982f9f..5eabf95e 100644 --- a/charts/sequencer-relayer/templates/configmaps.yaml +++ b/charts/sequencer-relayer/templates/configmaps.yaml @@ -12,6 +12,7 @@ data: ASTRIA_SEQUENCER_RELAYER_VALIDATOR_KEY_FILE: /cometbft/config/priv_validator_key.json ASTRIA_SEQUENCER_RELAYER_RPC_PORT: "{{ .Values.ports.relayerRPC }}" ASTRIA_SEQUENCER_RELAYER_RELAY_ONLY_VALIDATOR_KEY_BLOCKS: "false" + ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: "{{ .Values.config.relayer.celestiaBearerToken }}" --- apiVersion: v1 kind: ConfigMap diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index 28fc679a..fef0df15 100644 --- a/charts/sequencer-relayer/values.yaml +++ b/charts/sequencer-relayer/values.yaml @@ -10,6 +10,7 @@ global: config: relayer: + celestiaBearerToken: "" celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 sequencerRpc: http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657 From 4918771cbd84e5066c1fbf14cc0d571ed25b7ac8 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Fri, 17 Nov 2023 12:00:29 +0300 Subject: [PATCH 02/30] Updates to relayer startup --- charts/sequencer-relayer/files/scripts/start-relayer.sh | 2 +- charts/sequencer-relayer/templates/configmaps.yaml | 1 + charts/sequencer-relayer/values.yaml | 3 ++- charts/sequencer/map.yaml | 3 +++ charts/sequencer/values.yaml | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 charts/sequencer/map.yaml diff --git a/charts/sequencer-relayer/files/scripts/start-relayer.sh b/charts/sequencer-relayer/files/scripts/start-relayer.sh index 47b6bc57..1fa53a03 100644 --- a/charts/sequencer-relayer/files/scripts/start-relayer.sh +++ b/charts/sequencer-relayer/files/scripts/start-relayer.sh @@ -4,7 +4,7 @@ set -o errexit -o nounset -o pipefail if [ -z "$ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" ]; then # FIXME - how to use `token-svc` port here instead of hardcoding? - BEARER_TOKEN=$(wget -qO- http://celestia-service:5353) + BEARER_TOKEN=$(wget -qO- $TOKEN_SERVER) if [ -z "$BEARER_TOKEN" ]; then echo "Failed to fetch the Celestia bearer token." diff --git a/charts/sequencer-relayer/templates/configmaps.yaml b/charts/sequencer-relayer/templates/configmaps.yaml index 5eabf95e..832820d4 100644 --- a/charts/sequencer-relayer/templates/configmaps.yaml +++ b/charts/sequencer-relayer/templates/configmaps.yaml @@ -13,6 +13,7 @@ data: ASTRIA_SEQUENCER_RELAYER_RPC_PORT: "{{ .Values.ports.relayerRPC }}" ASTRIA_SEQUENCER_RELAYER_RELAY_ONLY_VALIDATOR_KEY_BLOCKS: "false" ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: "{{ .Values.config.relayer.celestiaBearerToken }}" + TOKEN_SERVER: "{{ .Values.config.relayer.tokenServer }}" --- apiVersion: v1 kind: ConfigMap diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index fef0df15..b0d6f602 100644 --- a/charts/sequencer-relayer/values.yaml +++ b/charts/sequencer-relayer/values.yaml @@ -12,7 +12,8 @@ config: relayer: celestiaBearerToken: "" celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 - sequencerRpc: http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657 + tokenServer: http://celestia-service.astria-dev-cluster.svc.cluster.local:5353 + sequencerRpc: "" # sequencer core images images: diff --git a/charts/sequencer/map.yaml b/charts/sequencer/map.yaml new file mode 100644 index 00000000..7bec2801 --- /dev/null +++ b/charts/sequencer/map.yaml @@ -0,0 +1,3 @@ +sequencer-relayer: + config: "http://{{ .Values.config.moniker }}-sequencer-rpc-service.{{ .Values.global.namespace }}.svc.cluster.local:{{ .Values.ports.cometBFTRPC }}" + diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index 07e3eeec..05d3fd31 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -71,6 +71,8 @@ config: sequencer-relayer: enabled: false + config: + sequencerRpc: "http://{{ .Values.config.moniker }}-sequencer-rpc-service.{{ .Values.global.namespace }}.svc.cluster.local:{{ .Values.ports.cometBFTRPC }}" # sequencer core images images: From 069745397c4369c30d1447e2b4f279c728108fba Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Fri, 17 Nov 2023 12:35:14 +0300 Subject: [PATCH 03/30] test --- charts/sequencer-relayer/files/scripts/start-relayer.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/sequencer-relayer/files/scripts/start-relayer.sh b/charts/sequencer-relayer/files/scripts/start-relayer.sh index 1fa53a03..ea84ce81 100644 --- a/charts/sequencer-relayer/files/scripts/start-relayer.sh +++ b/charts/sequencer-relayer/files/scripts/start-relayer.sh @@ -2,6 +2,8 @@ set -o errexit -o nounset -o pipefail +echo "Starting the Astria Sequencer Relayer..." +echo "ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: $ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" if [ -z "$ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" ]; then # FIXME - how to use `token-svc` port here instead of hardcoding? BEARER_TOKEN=$(wget -qO- $TOKEN_SERVER) @@ -14,6 +16,7 @@ if [ -z "$ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" ]; then echo "Celestia Bearer token fetched successfully." export ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN="$BEARER_TOKEN" fi +echo "ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: $ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" /usr/local/bin/astria-sequencer-relayer From 773ed64531a61f90425623652e9f846e2a48d9c7 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Fri, 17 Nov 2023 12:36:27 +0300 Subject: [PATCH 04/30] dependency update --- .../charts/sequencer-relayer-0.1.0.tgz | Bin 1591 -> 1680 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz index 4fe1d054d9643daab8baad01e85d2c460089c45f..3f8a4241ddc14cb554d47a1500d1362cd5089ea7 100644 GIT binary patch delta 1640 zcmV-u2ABD_43G_wJAYYUbK*D>&$B;8ADM@{s)Q~?1+}x$Mwpd}e zv36w1E6HTp+4=5Qk_{M=A(_l5=eZ2hP2H9X&mP=%6a+P><-zmTO6nh=3lNQf|FVoCWN2$TT? zcL@y>xRX?)f{17Wu@otEm6nviI^Y}tj`~i>_n-yzkfG9)cuq)W97Sj`Qz8Pz6*0f!pro(2a#miPjiFOc|O1=NK{~5q}m$QZi$xOg_&LGNKelK)DvM z6uAVAX~u{~kqa84`T_0|;(>#_)|!=?s`Bq4cPz7jp|a zuis;)!1qo)-*xX3vy%y_RmHiZn_d9TR{Oi8G1l^x&%zuVL2`5dmZ5{pV#&QY~J** z&Tp;2Pp4Fo2CBa`uit z8(#O`PA7xQeyOl`^t)>RGvDs7t%+fKCGV!tBs=g+#^Y!jOz+U&y-~f!wkg1}tAzAkDpr@0Z$}kKz?Vox`q1qZ6 z9n)Db47DiRtCZ+48CKS{XJxCnFMl;FCR;Vmg|?SIYox*xWwTVh)-uAjCfzeFz{*hD z^NG#f*Gkph_#veE&~|ES3=)NRA&En#%&k3qAT-uTe7k!t|Sy`N=#V% z2(>+x?(h=nk?OM?p7yGpmt(Q+7ihOY)MH*CI87GCSVmrck``c!-wto+=D_IDZ zr+8_CNbRDg=Iss9NdRlJoqf>dAh!T@sxv&Wr+c-^fGDimUf8G35F3e#Yn@9GVE}&H z|3oW%pa1tC7M{Z~kMV!2vBUpOztij-`2Qv3_%HPt<@Fg+iQ_2L;0iz~@i%IJa*^}$ zZALSU31yChVIrV5HjzR39Dj6ztIPfI`rfBx5zq5#<@nD%!@v4Gg_=WS_z~RSq4v3& z@Y6qx5!~j_FU;Nn~`CYXLe+JX$K!Os1a;1?(AYw>}j6xAnKL4jh zsp7wW_1C+(@!_x6F1)IC8Gm!^;LXB6y(~+7){hs2GK|d1V$@+`-C@7_?+MIoS5sW` zc^m$=+u5*x#ba72 mduM4QeYak3E)lwl delta 1551 zcmV+q2Jrci4Yv%CJAYVTlj67$-)DV_4s#Dl)!7(!fRs~LDVAY2)G~jgFJ!+WIS+ ziWi?rf*=UGr>Dg;2!j1*&}nsEv`#zi({8Wb?)F{;ty8BC!GGtPz%j{M5D;dJFO=y;F{sw-_4@iWDX`b2QRUiI_A_eAB1Y)Hj!c3?YmkXd!B@o;v zoF#CtxkUpJwG?8lQs^72IfYHa5dewyUg+ zfo7>>N;823Ab-~)1X^JFN-s8=#v=ZT^IR_q6CYChNoi#gKBo`pR6zTcLF_8S5NMVO z&Zt`uvfN#(FCENJki+_4Qjw$ioCNSl{kPh^)4lrdw1Uoa{Xd1Az!}Cg7Z%F67gfDU z3ZI<7G~oug0SdSMi?J6gols5up(;{ckX$tc4R8f6W75iUI@a$`|92!O_-;07v}HiQ-dIDvmAXcN@V zQf?5eU4cd#IrAXYV&NFcc|zBuqnDha`4;XIln_&4uo(E0QPM9EU!k$p#LLfILZ(%e zGgs+=a(~ISk||1Sz6GmuEby5?DxF0G$~_qs5aH56<_4$J+py3jgee*GMOe5~)S3GU zz$)6CWGsZl+AM4~*YCV)*8btL_-4uc_3y%J*zR^ae=aaL(W`?>6=C4jsy$=>Iew3j zlPx?jr4e{a7idWNa87N_SB}CWVcO@aS=v#0(SJN(oiOlwe&BhBq)RfTt*I^CFig4ew`-a{rjWP zgW-61GadCm4!K6^j{(2#-^|9Ni;)9tm6>x?|JC?v@Mbn0T@0%MN44Mf$D_0U^lCDD zGrXOhkH*6gnoOl==drEIyP0XeoGq!~5r4Hx&+c&LyIt`Z?&NwfyS|$2twKT6{+6X5 z^SyY^t}e&7dlN03ya}OEY{U)Xc^>)XJS|Tz=96;OQG@k136q5ITd~8wd*^|F&IKC( zHCkx6PRKMXOU?aJ4fqWtmk~+}rw-ov^QG&4Eywu3JlwgK=fBJUz0S)6{_l35`G5Z@ zq+VAv%S>}qTxXl;KTutVeHwtEa}=iRYiX7}tn~3kXfkBsw*5B`4X7Ut+!)t=3S?GQ z?R82mOUAW%9huoW@2inDmy2OiDq9@-H%R45RLyh!TEmIhF?z%-z}nH`JfOCBAM2ss zku_gS(SBd&LR>4s*(!ule5vfUMt|etx2LyD+hynO@3-w0d#{D5G^H*rzK6yUru(5b z#Mp?-hoV-VjLLYe#oE=!s-j$;Yn6tzS8kEmdNY_{y!&k%tlj2iElVZx6fay7nSIpM zy}hP331QRTX-O*M@Ll&QF^sIu@CKWTZzhJ{e_A!grF0A;D5Mu$p6PT zvrple$L@c--QF($w}Wn{{mlPQAt!%m&be&PsYwViXu(r}TH`Og_$gH`tG5}?Fs57( zasub0e_ag0gGAl0uV8+(>JFu6mh4AxoggHr5x6uKX#^^UgzAW?h|9%a$*W<1GMvn& zS8s-w-+lAP`-L;{^Og6ZD}Ru%^Rn~uPlWIoz6bADXna#gXuuDD0h^#K3IJK6pm9#Q zz{pK5M#~cSd2`1MbELYsJi0^amn>H}+#)e2qy*R~zp5#hU>JeP8AD^@T!@w5AOwFY ze17}@vE%uk8-z4-qnpKjOA(d*y=8kT@}<+}S)S!t{tx8e0RRC1{|M;#QHTH@0082# B8Z7_- From 068d2d563982483d35443b91c39115d6a562c864 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Fri, 17 Nov 2023 13:11:08 +0300 Subject: [PATCH 05/30] cleanup --- .../charts/sequencer-relayer-0.1.0.tgz | Bin 1680 -> 1680 bytes charts/sequencer/map.yaml | 3 --- charts/sequencer/values.yaml | 2 -- 3 files changed, 5 deletions(-) delete mode 100644 charts/sequencer/map.yaml diff --git a/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz index 3f8a4241ddc14cb554d47a1500d1362cd5089ea7..5cfea5169ae7a12bc286549f22c033eafb3bdf60 100644 GIT binary patch delta 1546 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 w^reEraq78}bt8LcX(N5NUT-cDzjZ1e Date: Sat, 18 Nov 2023 11:28:28 +0300 Subject: [PATCH 06/30] use cheaper relayer --- charts/sequencer-relayer/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index b0d6f602..f91cef40 100644 --- a/charts/sequencer-relayer/values.yaml +++ b/charts/sequencer-relayer/values.yaml @@ -17,7 +17,7 @@ config: # sequencer core images images: - sequencerRelayer: ghcr.io/astriaorg/sequencer-relayer:0.7.0--sequencer-relayer + sequencerRelayer: ghcr.io/astriaorg/sequencer-relayer:pr-590 ports: relayerRPC: 2450 From 736e5462e1a21a523f28a68d55f1bbc4767a31fa Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sat, 18 Nov 2023 11:29:40 +0300 Subject: [PATCH 07/30] dependency update --- .../charts/sequencer-relayer-0.1.0.tgz | Bin 1680 -> 1677 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz index 5cfea5169ae7a12bc286549f22c033eafb3bdf60..078c0dcc599c633435bc4357048c5a57a8804c8f 100644 GIT binary patch delta 1636 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 From b2d7715f745a02aa2a6a14c897b3eea0a54502b2 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sat, 18 Nov 2023 12:21:59 +0300 Subject: [PATCH 08/30] remove config option --- charts/sequencer-relayer/templates/configmaps.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/sequencer-relayer/templates/configmaps.yaml b/charts/sequencer-relayer/templates/configmaps.yaml index 832820d4..071e6dc8 100644 --- a/charts/sequencer-relayer/templates/configmaps.yaml +++ b/charts/sequencer-relayer/templates/configmaps.yaml @@ -7,7 +7,6 @@ data: ASTRIA_SEQUENCER_RELAYER_LOG: "astria_sequencer_relayer=debug" ASTRIA_SEQUENCER_RELAYER_SEQUENCER_ENDPOINT: "{{ .Values.config.relayer.sequencerRpc }}" ASTRIA_SEQUENCER_RELAYER_CELESTIA_ENDPOINT: "{{ .Values.config.relayer.celestiaRpc }}" - ASTRIA_SEQUENCER_RELAYER_GAS_LIMIT: "1000000" ASTRIA_SEQUENCER_RELAYER_BLOCK_TIME: "1000" ASTRIA_SEQUENCER_RELAYER_VALIDATOR_KEY_FILE: /cometbft/config/priv_validator_key.json ASTRIA_SEQUENCER_RELAYER_RPC_PORT: "{{ .Values.ports.relayerRPC }}" From 95bc8bf825f2694c487901cfc6fb43f7bce353d3 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sat, 18 Nov 2023 12:22:20 +0300 Subject: [PATCH 09/30] chart update --- .../charts/sequencer-relayer-0.1.0.tgz | Bin 1677 -> 1654 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz index 078c0dcc599c633435bc4357048c5a57a8804c8f..63f0b01cffc04633c61d62cc849a32a55a70f2f1 100644 GIT binary patch delta 1614 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 From 9900fa7e35383d76724489b6088a1ca3671b1926 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sat, 18 Nov 2023 17:30:25 +0300 Subject: [PATCH 10/30] test new releases --- charts/rollup/values.yaml | 2 +- charts/sequencer-relayer/values.yaml | 2 +- .../charts/sequencer-relayer-0.1.0.tgz | Bin 1654 -> 1656 bytes charts/sequencer/values.yaml | 3 +-- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index 41926321..cb916f46 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -76,7 +76,7 @@ celestia-node: images: # Core images for the rollup, developed for Astria geth: "ghcr.io/astriaorg/go-ethereum:0.4.1" - conductor: "ghcr.io/astriaorg/conductor:0.9.0--conductor" + conductor: "ghcr.io/astriaorg/conductor:pr-591" composer: "ghcr.io/astriaorg/composer:0.2.5--composer" # Rollup faucet diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index f91cef40..f50f1ce7 100644 --- a/charts/sequencer-relayer/values.yaml +++ b/charts/sequencer-relayer/values.yaml @@ -17,7 +17,7 @@ config: # sequencer core images images: - sequencerRelayer: ghcr.io/astriaorg/sequencer-relayer:pr-590 + sequencerRelayer: ghcr.io/astriaorg/sequencer-relayer:pr-591 ports: relayerRPC: 2450 diff --git a/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz index 63f0b01cffc04633c61d62cc849a32a55a70f2f1..80e3d39b5f7d72f7424dc162170829f4028bb9f9 100644 GIT binary patch delta 1615 zcmV-V2C(_|4EPL?Jbzzvt z_d5}qv-hYplOlxq0ik)m`WyHyKOiycNU_|wS3USA@(d!IB9KT0G3Hz@n3w^DDuLiO zWl;*ZiW$@pQ$rz9GJ~Ericwf4903q$Zl(GFMnWGsYQv~cGRlOZOrX*s@j%cFL%5|$ z!cotq$Y{=y0DlyUhd>>sFV$={QX9lya9XIDo8qBiKT0Ka%BJ+5F%{5uWe~H-F$9|D zoJG_Igv>W%^;<9IGvsdl&nYiZe@y~-r2bont?pL+cY>qNYyH23?86BrwBQEHb$3<0 zN(!Is!#HIcm<9?rz4M`$NR?4zFouM2v;$5s;#48bsefX0%2C^To+9K_Ym9*jBVi#6 z1qQR6Q-j(kGcKo;hn53qhB~JahR`T$(2H^IMZC}kRf7O1bOqO!g)kws2*5u4Cq` zPk^YRy=T#p0cSGjudE_sDJBz}DZnyJShiU8# z*Qn;Gz7Vr>*g15Nt7LI@HX4NNuirr=6#~oX41YB#AJ*};P8AH8rIGTPY?gCNHEZ5s zrZ87t=Wi`Sa;c22g>rP&58cP}{;SnL1q7oQGn*$=)A7g8#nk9ZGihS0CZiC$dE8 zU4M^9XT8bw;9vh9T=WN{$!IX_-3&&P;pMlhEnu=r%Skog+Zduj zF%F?ov#LyIzXJ5@yak^=?S$?RhJ)+zS?_7cHR65@_;`5Pe>WMQoex52w1ObmIr@EX zcy`hoUydg41~-$_v*93wW+XE-)5KKe+JDRyn@{GHvzQvGCLeI&+g)xK?&zvNxw;%} zdF5!6G9qy=wBg~k*J#G`n84?zJD?4j%fjwj=G*-uJ1mUs@{&6FU7UiR|V%+lCx+L z!dY@5&6PrJ*KcdwCK;Apxxd|#S0uWWNM;$eY4II2b}-NPH5F}QChl9c@?=!5*HVmG zJas6F`KgjwSbJrI6fMblgvsW&^Duq8Y_fyD1RBv;ZV?r4x1fx_!*c3V#j468H|hU!d{1n(+PKtrNo4&pw=<{r7wT9;EVidB607 zYY{y?kA48#7DI{(feCGp#vl_&sfr^RGco&zL#gAxee>trnT_F3mma*Sccp(JZt&Xh zhs|=t=i+!u8OPXKmY|7J7yjk#IZRy_Twe3|YyNi2*>ZmqR!&-itw#-NKR zLamd6^F@V*KRf?FFT!uPJR=EvsiYvJS!mUCcUCUbxA*JSX8L-0^eV6NDt|2bUjP6A N|NkN4a>)Q7006KRB~1VT delta 1613 zcmV-T2D1714E79=Jb!I-`7GkfLnM*Rpfdk!?BkocvN*z1EY-C=j_6 zkplq+0Ocr``|llqFQQ~y_Px}ZOuSzxk=O^ji`@qcX#A-_5ux%Fa=Jv-Jx-}I{*q>V z=POAN1i|6KfqMo)u=x!7z5Y(`pucz63wpg^Zzt#-9QOJ<5Py6v1GY(_4OKhA7tgin z-0wta&fcNYOo|W|dxYkB^EdE&en4W>kz%=VuLkf>hI4}m&NU#fXCQX9lya8{_fo8qBiKT0Ka%4YPQF%{5eWe~H>F$9|D zoJG_Ige=x$^;<9IXUN_9Ur=74{+a~vNd5QrdxsnK-w*oxFZKT%vI{4e(1IH%*WFch zlN3JLg-OaZFbx!L2InI$kt(CcU zp8!!sdq+qWs)>A$B7{z7?b|qyLP(9t!)~{J=T#p0cSGjuMda7Nokii^;bH%;4%65f zu2C&eeIaIlzrXJwn`Cizb~=RYuHHc;6#~oX9Dg+_AJ*}eP8AH8r;+lR?3Qy&HSgYG zrZ87t|8D^yxl~5CLOH%V4q@-0|GOmM-&pSQe^aI1GG{ZIf8lQM82`WS2OIqV`gO4P z!vD`9YyDr3yk{Z~;n*$wIn7CihT0acX6mr6IS<8RoxMMN0RLUtJCyA1Hy`2SM^d8< zu74-vv%&Ow_^*EtFOG-f>3BFA+ziLl(dDdUZM8 z@XFDwzv9@(d~wg|<;Cb`!%*ksbqF1|u|6%(N5jE*IG#=}-wrRH6ztXxS{dqer`N;r zyWw~%L~B!Ys-EYO&#sH|w4^_)HY^nxuSw7}gkRkj`{9EJ{wd?A{cq7g$97)2TYt^e z-PG#9uOOI+Q5ZO|@YbJ)>VF&mmxnvs^8CN~fBz2u@4tTG|L2f)p3^+n-6q*jn$^E2 z+wUHZ0XUr@*JWQz^ZfonPcI6cV-&91e|?`q`)FWwY-h$fp(oeaya+}~`;D-x|Gl37M=T6_ncEzI+MOGTTQiThTqJQ8rv!+|Ms)Q)LS~u*WJ!d6xd8|K|F@_NIg9i>rclm$&=JGil^BDgh^fvf^FF5S= zUikkxWcN?q857+Z)hQtw4R{hzDg2qapF$R*dYiKx6UsOt7^M!jd(S)t+2&i_w~@S6?KNWz{gDG2EnT6Nu>mCN+a{kqvqUoMYc Date: Sat, 18 Nov 2023 18:04:48 +0300 Subject: [PATCH 11/30] conductor updates --- charts/rollup/templates/configmap.yaml | 1 + charts/rollup/values.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/charts/rollup/templates/configmap.yaml b/charts/rollup/templates/configmap.yaml index 1237748f..8bb6a1bf 100644 --- a/charts/rollup/templates/configmap.yaml +++ b/charts/rollup/templates/configmap.yaml @@ -16,6 +16,7 @@ data: ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.rollup.executionCommitLevel }}" ASTRIA_CONDUCTOR_SEQUENCER_URL: "{{ .Values.config.sequencer.websocket }}" ASTRIA_CONDUCTOR_INITIAL_SEQUENCER_BLOCK_HEIGHT: "{{ .Values.config.sequencer.initialBlockHeight }}" + ASTRIA_CONDUCTOR_ENABLE_OPTIMISM: "{{ .Values.config.rollup.enableOptimism }}" --- apiVersion: v1 kind: ConfigMap diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index cb916f46..1d18163e 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -22,6 +22,7 @@ config: # - "FirmOnly" -> blocks are only pulled from DA # - "SoftAndFirm" -> blocks are pulled from both the sequencer and DA executionCommitLevel: 'SoftAndFirm' + enableOptimism: false # Definitions around who has funding on startup genesisAccounts: - address: "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30" From 83e296093e3d21064c7b927336429a92e72f6e83 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sat, 18 Nov 2023 18:20:55 +0300 Subject: [PATCH 12/30] configure rest of conductor optimism fields --- charts/rollup/templates/configmap.yaml | 5 ++++- charts/rollup/values.yaml | 12 ++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/charts/rollup/templates/configmap.yaml b/charts/rollup/templates/configmap.yaml index 8bb6a1bf..884018f5 100644 --- a/charts/rollup/templates/configmap.yaml +++ b/charts/rollup/templates/configmap.yaml @@ -16,7 +16,10 @@ data: ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.rollup.executionCommitLevel }}" ASTRIA_CONDUCTOR_SEQUENCER_URL: "{{ .Values.config.sequencer.websocket }}" ASTRIA_CONDUCTOR_INITIAL_SEQUENCER_BLOCK_HEIGHT: "{{ .Values.config.sequencer.initialBlockHeight }}" - ASTRIA_CONDUCTOR_ENABLE_OPTIMISM: "{{ .Values.config.rollup.enableOptimism }}" + ASTRIA_CONDUCTOR_ENABLE_OPTIMISM: "{{ .Values.config.rollup.optimism.enabled }}" + ASTRIA_CONDUCTOR_ETHEREUM_L1_URL: "{{ .Values.config.rollup.optimism.ethereumL1Websocket }}", + ASTRIA_CONDUCTOR_OPTIMISM_PORTAL_CONTRACT_ADDRESS: "{{ .Values.config.rollup.optimism.portalContractAddress }}", + ASTRIA_CONDUCTOR_INITIAL_ETHEREUM_L1_BLOCK_HEIGHT: "{{ .Values.config.rollup.optimism.initialEthereumL1BlockHeight }}", --- apiVersion: v1 kind: ConfigMap diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index 1d18163e..b2f92270 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -22,13 +22,21 @@ config: # - "FirmOnly" -> blocks are only pulled from DA # - "SoftAndFirm" -> blocks are pulled from both the sequencer and DA executionCommitLevel: 'SoftAndFirm' - enableOptimism: false # Definitions around who has funding on startup genesisAccounts: - address: "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30" # The balance must be a string due to size balance: "1000000000000000000000" - + optimism: + # set to true to enable op-stack integration, and setup rest of config + enabled: false + # Websocket URL of Ethereum L1 node. + ethereumL1Websocket: "ws://127.0.0.1:8545" + # Contract address of the OptimismPortal contract on L1. + portalContractAddress: "" + # The block height of the Ethereum L1 chain that the + # OptimismPortal contract was deployed at. + initialEthereumL1BlockHeight: 1 faucet: # The account from which the faucet disburses funds, likely want to have # the corresponding account given a balance in genesis accounts. From 953122d69b1f73c150961252edec90a358ca8625 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sat, 18 Nov 2023 18:24:26 +0300 Subject: [PATCH 13/30] test --- charts/rollup/templates/configmap.yaml | 6 +++--- charts/rollup/values.yaml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/rollup/templates/configmap.yaml b/charts/rollup/templates/configmap.yaml index 884018f5..42e4dad9 100644 --- a/charts/rollup/templates/configmap.yaml +++ b/charts/rollup/templates/configmap.yaml @@ -17,9 +17,9 @@ data: ASTRIA_CONDUCTOR_SEQUENCER_URL: "{{ .Values.config.sequencer.websocket }}" ASTRIA_CONDUCTOR_INITIAL_SEQUENCER_BLOCK_HEIGHT: "{{ .Values.config.sequencer.initialBlockHeight }}" ASTRIA_CONDUCTOR_ENABLE_OPTIMISM: "{{ .Values.config.rollup.optimism.enabled }}" - ASTRIA_CONDUCTOR_ETHEREUM_L1_URL: "{{ .Values.config.rollup.optimism.ethereumL1Websocket }}", - ASTRIA_CONDUCTOR_OPTIMISM_PORTAL_CONTRACT_ADDRESS: "{{ .Values.config.rollup.optimism.portalContractAddress }}", - ASTRIA_CONDUCTOR_INITIAL_ETHEREUM_L1_BLOCK_HEIGHT: "{{ .Values.config.rollup.optimism.initialEthereumL1BlockHeight }}", + ASTRIA_CONDUCTOR_ETHEREUM_L1_URL: "{{ .Values.config.rollup.optimism.ethereumL1Websocket }}" + ASTRIA_CONDUCTOR_OPTIMISM_PORTAL_CONTRACT_ADDRESS: "{{ .Values.config.rollup.optimism.portalContractAddress }}" + ASTRIA_CONDUCTOR_INITIAL_ETHEREUM_L1_BLOCK_HEIGHT: "{{ .Values.config.rollup.optimism.initialEthereumL1BlockHeight }}" --- apiVersion: v1 kind: ConfigMap diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index b2f92270..d9d51b21 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -37,6 +37,7 @@ config: # The block height of the Ethereum L1 chain that the # OptimismPortal contract was deployed at. initialEthereumL1BlockHeight: 1 + faucet: # The account from which the faucet disburses funds, likely want to have # the corresponding account given a balance in genesis accounts. From dc5edaa07f5e67368426dd1176d77a47abd84a25 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sat, 18 Nov 2023 19:11:39 +0300 Subject: [PATCH 14/30] use new images --- charts/rollup/values.yaml | 2 +- charts/sequencer-relayer/values.yaml | 2 +- charts/sequencer/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index d9d51b21..02c549be 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -86,7 +86,7 @@ celestia-node: images: # Core images for the rollup, developed for Astria geth: "ghcr.io/astriaorg/go-ethereum:0.4.1" - conductor: "ghcr.io/astriaorg/conductor:pr-591" + conductor: "ghcr.io/astriaorg/conductor:0.10.0--conductor" composer: "ghcr.io/astriaorg/composer:0.2.5--composer" # Rollup faucet diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index f50f1ce7..0d32e2e5 100644 --- a/charts/sequencer-relayer/values.yaml +++ b/charts/sequencer-relayer/values.yaml @@ -17,7 +17,7 @@ config: # sequencer core images images: - sequencerRelayer: ghcr.io/astriaorg/sequencer-relayer:pr-591 + sequencerRelayer: ghcr.io/astriaorg/sequencer-relayer:0.8.0--sequencer-relayer ports: relayerRPC: 2450 diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index e06f0649..27f84876 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -75,7 +75,7 @@ sequencer-relayer: # sequencer core images images: cometBFT: docker.io/cometbft/cometbft:v0.37.x - sequencer: ghcr.io/astriaorg/sequencer:pr-591 + sequencer: ghcr.io/astriaorg/sequencer:0.6.0--sequencer ports: cometBFTP2P: 26656 From a3e6196d6d352748a793368e590dd8f7621125ec Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sat, 18 Nov 2023 19:34:14 +0300 Subject: [PATCH 15/30] update dependency --- .../charts/sequencer-relayer-0.1.0.tgz | Bin 1656 -> 1656 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz index 80e3d39b5f7d72f7424dc162170829f4028bb9f9..3c6ab9473511336324dd71f2cdea24b4f7fccdbd 100644 GIT binary patch delta 1615 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 N|NkN4a>)Q7006wRB~JhV From af3a70690ba4849dd0968d2c63736729f60b57be Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sat, 18 Nov 2023 23:41:45 +0300 Subject: [PATCH 16/30] fix volume namespace --- charts/rollup/templates/volumes.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/rollup/templates/volumes.yaml b/charts/rollup/templates/volumes.yaml index 071d04ac..7c32f64a 100644 --- a/charts/rollup/templates/volumes.yaml +++ b/charts/rollup/templates/volumes.yaml @@ -34,7 +34,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-geth - namespace: astria-dev-cluster + namespace: {{ $.Values.global.namespace }} labels: "app.kubernetes.io/name": "{{ $.Values.config.rollup.name }}-{{ $.Chart.Name }}" "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }} @@ -53,7 +53,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-blockscout - namespace: astria-dev-cluster + namespace: {{ $.Values.global.namespace }} labels: "app.kubernetes.io/name": {{ $.Values.config.rollup.name }}-{{ $.Chart.Name }} "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }} From d0fd01ac93ada90f47183dab1e3a0582657e5e3b Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 00:03:33 +0300 Subject: [PATCH 17/30] key should be kebab --- charts/rollup/templates/secretproviderclass.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rollup/templates/secretproviderclass.yaml b/charts/rollup/templates/secretproviderclass.yaml index 665c85db..63b0fffe 100644 --- a/charts/rollup/templates/secretproviderclass.yaml +++ b/charts/rollup/templates/secretproviderclass.yaml @@ -8,7 +8,7 @@ metadata: spec: provider: gcp secretObjects: - - secretName: {{ $key }} + - secretName: {{ kebabcase $key }} type: Opaque data: - objectName: {{ $value.filename }} From ea5aad8b4f542101051a94a2f5a42af4fc7412a6 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 00:10:46 +0300 Subject: [PATCH 18/30] quote change --- charts/rollup/templates/secretproviderclass.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rollup/templates/secretproviderclass.yaml b/charts/rollup/templates/secretproviderclass.yaml index 63b0fffe..aec20ed6 100644 --- a/charts/rollup/templates/secretproviderclass.yaml +++ b/charts/rollup/templates/secretproviderclass.yaml @@ -15,7 +15,7 @@ spec: key: {{ $value.key }} parameters: secrets: | - - resourceName: "{{ $value.resourceName }}" + - resourceName: {{ $value.resourceName }} filename: "{{ $value.filename }}" {{- end }} {{- end }} From 072f8ce5ea5b4da4675479221f3c7a527c4f5089 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 00:39:20 +0300 Subject: [PATCH 19/30] fix filename --- charts/rollup/templates/secretproviderclass.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rollup/templates/secretproviderclass.yaml b/charts/rollup/templates/secretproviderclass.yaml index aec20ed6..55bd7882 100644 --- a/charts/rollup/templates/secretproviderclass.yaml +++ b/charts/rollup/templates/secretproviderclass.yaml @@ -16,6 +16,6 @@ spec: parameters: secrets: | - resourceName: {{ $value.resourceName }} - filename: "{{ $value.filename }}" + fileName: "{{ $value.filename }}" {{- end }} {{- end }} From 5b65b4463e9e8cd1ef63b0bef1a5d0d64976a3b3 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 13:20:58 +0300 Subject: [PATCH 20/30] secret provider for seq faucet --- charts/sequencer-faucet/templates/secretproviderclass.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sequencer-faucet/templates/secretproviderclass.yaml b/charts/sequencer-faucet/templates/secretproviderclass.yaml index 0652f5ea..1d44aba5 100644 --- a/charts/sequencer-faucet/templates/secretproviderclass.yaml +++ b/charts/sequencer-faucet/templates/secretproviderclass.yaml @@ -15,7 +15,7 @@ spec: key: {{ $value.key }} parameters: secrets: | - - resourceName: "{{ $value.resourceName }}" - filename: "{{ $value.filename }}" + - resourceName: {{ $value.resourceName }} + fileName: "{{ $value.filename }}" {{- end }} {{- end }} From 025c6b269d67f1c81dfff53d24fef902ec83213b Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 13:48:21 +0300 Subject: [PATCH 21/30] faucet ingress update --- charts/sequencer-faucet/templates/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sequencer-faucet/templates/ingress.yaml b/charts/sequencer-faucet/templates/ingress.yaml index c4f10acf..17ed4e2b 100644 --- a/charts/sequencer-faucet/templates/ingress.yaml +++ b/charts/sequencer-faucet/templates/ingress.yaml @@ -48,7 +48,7 @@ spec: service: name: {{ $serviceName }} port: - number: {{ $servicePort }} + name: {{ $servicePort }} {{- else }} serviceName: {{ $serviceName }} servicePort: {{ $servicePort }} From 5d733cc1b35cdb5f43a7bfcd83c3b3d340c2317e Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 18:57:11 +0300 Subject: [PATCH 22/30] first stab at rollup ingress --- charts/rollup/templates/ingress.yaml | 70 +++++++++++++++++++--------- 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/charts/rollup/templates/ingress.yaml b/charts/rollup/templates/ingress.yaml index 27c0f313..f58b3752 100644 --- a/charts/rollup/templates/ingress.yaml +++ b/charts/rollup/templates/ingress.yaml @@ -2,20 +2,24 @@ {{- $ingressApiIsStable := eq (include "rollup.ingress.isStable" .) "true" -}} {{- $ingressSupportsIngressClassName := eq (include "rollup.ingress.supportsIngressClassName" .) "true" -}} {{- $ingressSupportsPathType := eq (include "rollup.ingress.supportsPathType" .) "true" -}} -{{- $ingressPathType := .Values.ingress.pathType -}} -{{- $extraPaths := .Values.ingress.extraPaths -}} -apiVersion: networking.k8s.io/v1 + +{{- range $service, $ingress := .Values.ingress.services }} +{{- $servicePort := $ingress.service.port -}} +{{- $serviceName := $ingress.service.name -}} +{{- $ingressPath := $ingress.path -}} +{{- $ingressPathType := $ingress.pathType -}} +{{- $extraPaths := $ingress.extraPaths -}} kind: Ingress metadata: - name: {{ .Values.config.rollup.name }}-ingress - namespace: {{ .Values.global.namespace }} + name: {{ $.Values.config.rollup.name }}-{{ $service }}-ingress + namespace: {{ $.Values.global.namespace }} labels: - {{- with .Values.ingress.labels }} + {{- with $ingress.labels }} {{- toYaml . | nindent 4 }} {{- end }} annotations: - {{- if .Values.ingress.annotations }} - {{- with .Values.ingress.annotations }} + {{- if $ingress.annotations }} + {{- with $ingress.annotations }} {{- range $key, $value := . }} {{ $key }}: {{ tpl $value $ | quote }} {{- end }} @@ -24,61 +28,83 @@ metadata: kubernetes.io/ingress.class: nginx {{- end }} spec: - {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }} - ingressClassName: {{ .Values.ingress.ingressClassName }} + {{- if and $ingressSupportsIngressClassName $ingress.ingressClassName }} + ingressClassName: {{ $ingress.ingressClassName }} {{- end -}} - {{- with .Values.ingress.defaultBackend }} + {{- with $ingress.defaultBackend }} defaultBackend: {{- tpl (toYaml .) $ | nindent 4 }} {{- end }} rules: - {{- if .Values.ingress.hosts }} - {{- with .Values.ingress.hosts }} + {{- if $ingress.hosts }} + {{- range $ingress.hosts }} + - host: {{ tpl . $ }} + http: + paths: + {{- with $extraPaths }} + {{- toYaml . | nindent 10 }} + {{- end }} + - path: {{ $ingressPath }} + {{- if $ingressSupportsPathType }} + pathType: {{ $ingressPathType }} + {{- end }} + backend: + {{- if $ingressApiIsStable }} + service: + name: {{ $serviceName }} + port: + name: {{ $servicePort }} + {{- else }} + serviceName: {{ $serviceName }} + servicePort: {{ $servicePort }} + {{- end }} + {{- end -}} + {{- end }} {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} - {{- with .Values.ingress.tls }} + {{- with $ingress.tls }} tls: {{- tpl (toYaml .) $ | nindent 4 }} {{- end }} {{- else }} - - host: executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + - host: executor.{{ $.Values.config.rollup.name }}.{{ $.Values.ingress.hostname }} http: paths: - path: "/" pathType: Prefix backend: service: - name: {{ .Values.config.rollup.name }}-evm-service + name: {{ $.Values.config.rollup.name }}-evm-service port: name: json-rpc-svc - - host: ws-executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + - host: ws-executor.{{ $.Values.config.rollup.name }}.{{ $.Values.ingress.hostname }} http: paths: - path: "/" pathType: Prefix backend: service: - name: {{ .Values.config.rollup.name }}-evm-service + name: {{ $.Values.config.rollup.name }}-evm-service port: name: ws-rpc-svc - - host: faucet.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + - host: faucet.{{ $.Values.config.rollup.name }}.{{ $.Values.ingress.hostname }} http: paths: - path: "/" pathType: Prefix backend: service: - name: {{ .Values.config.rollup.name }}-faucet-service + name: {{ $.Values.config.rollup.name }}-faucet-service port: name: faucet-svc - - host: blockscout.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + - host: blockscout.{{ $.Values.config.rollup.name }}.{{ $.Values.ingress.hostname }} http: paths: - path: "/" pathType: Prefix backend: service: - name: {{ .Values.config.rollup.name }}-blockscout-svc + name: {{ $.Values.config.rollup.name }}-blockscout-svc port: name: blockscout-svc {{- end -}} From f81e65aadbaf59fb37978bcfd0cb6001ca4a95bd Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 19:03:10 +0300 Subject: [PATCH 23/30] update 1 --- charts/rollup/templates/ingress.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/charts/rollup/templates/ingress.yaml b/charts/rollup/templates/ingress.yaml index f58b3752..7719e659 100644 --- a/charts/rollup/templates/ingress.yaml +++ b/charts/rollup/templates/ingress.yaml @@ -15,14 +15,14 @@ metadata: namespace: {{ $.Values.global.namespace }} labels: {{- with $ingress.labels }} - {{- toYaml . | nindent 4 }} + {{- toYaml . | nindent 4 }} {{- end }} annotations: {{- if $ingress.annotations }} {{- with $ingress.annotations }} - {{- range $key, $value := . }} + {{- range $key, $value := . }} {{ $key }}: {{ tpl $value $ | quote }} - {{- end }} + {{- end }} {{- end }} {{- else }} kubernetes.io/ingress.class: nginx @@ -58,9 +58,6 @@ spec: serviceName: {{ $serviceName }} servicePort: {{ $servicePort }} {{- end }} - {{- end -}} - {{- end }} - {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} {{- with $ingress.tls }} tls: @@ -109,4 +106,4 @@ spec: name: blockscout-svc {{- end -}} {{- end }} - +{{- end }} From 740ebe157c678f25c6ce486117d68d075ec8958e Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 19:46:01 +0300 Subject: [PATCH 24/30] locally builds --- charts/rollup/templates/ingress.yaml | 69 ++-------- charts/rollup/values.yaml | 130 ++++++++++++------ .../sequencer-faucet/templates/ingress.yaml | 8 +- 3 files changed, 104 insertions(+), 103 deletions(-) diff --git a/charts/rollup/templates/ingress.yaml b/charts/rollup/templates/ingress.yaml index 7719e659..461178c2 100644 --- a/charts/rollup/templates/ingress.yaml +++ b/charts/rollup/templates/ingress.yaml @@ -8,7 +8,8 @@ {{- $serviceName := $ingress.service.name -}} {{- $ingressPath := $ingress.path -}} {{- $ingressPathType := $ingress.pathType -}} -{{- $extraPaths := $ingress.extraPaths -}} +{{- $extraPaths := $ingress.extraPaths -}} +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $.Values.config.rollup.name }}-{{ $service }}-ingress @@ -18,12 +19,10 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} annotations: - {{- if $ingress.annotations }} - {{- with $ingress.annotations }} + {{- with $ingress.annotations }} {{- range $key, $value := . }} {{ $key }}: {{ tpl $value $ | quote }} {{- end }} - {{- end }} {{- else }} kubernetes.io/ingress.class: nginx {{- end }} @@ -36,9 +35,9 @@ spec: {{- tpl (toYaml .) $ | nindent 4 }} {{- end }} rules: - {{- if $ingress.hosts }} - {{- range $ingress.hosts }} - - host: {{ tpl . $ }} + {{- with $ingress.hosts }} + {{- range $host := . }} + - host: {{ tpl $host $ }} http: paths: {{- with $extraPaths }} @@ -51,59 +50,19 @@ spec: backend: {{- if $ingressApiIsStable }} service: - name: {{ $serviceName }} + name: {{ tpl $serviceName $ }} port: - name: {{ $servicePort }} + name: {{ tpl $servicePort $ }} {{- else }} - serviceName: {{ $serviceName }} - servicePort: {{ $servicePort }} + serviceName: {{ tpl $serviceName $ }} + servicePort: {{ tpl $servicePort $ }} {{- end }} {{- end }} - {{- with $ingress.tls }} + {{- if $ingress.tls }} tls: - {{- tpl (toYaml .) $ | nindent 4 }} + {{- tpl (toYaml $ingress.tls) $ | nindent 4 }} {{- end }} - {{- else }} - - host: executor.{{ $.Values.config.rollup.name }}.{{ $.Values.ingress.hostname }} - http: - paths: - - path: "/" - pathType: Prefix - backend: - service: - name: {{ $.Values.config.rollup.name }}-evm-service - port: - name: json-rpc-svc - - host: ws-executor.{{ $.Values.config.rollup.name }}.{{ $.Values.ingress.hostname }} - http: - paths: - - path: "/" - pathType: Prefix - backend: - service: - name: {{ $.Values.config.rollup.name }}-evm-service - port: - name: ws-rpc-svc - - host: faucet.{{ $.Values.config.rollup.name }}.{{ $.Values.ingress.hostname }} - http: - paths: - - path: "/" - pathType: Prefix - backend: - service: - name: {{ $.Values.config.rollup.name }}-faucet-service - port: - name: faucet-svc - - host: blockscout.{{ $.Values.config.rollup.name }}.{{ $.Values.ingress.hostname }} - http: - paths: - - path: "/" - pathType: Prefix - backend: - service: - name: {{ $.Values.config.rollup.name }}-blockscout-svc - port: - name: blockscout-svc - {{- end -}} + {{- end }} +--- {{- end }} {{- end }} diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index 02c549be..cf79f6ce 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -121,51 +121,93 @@ secretProvider: ingress: enabled: true - # This is only used when using the default hosts and not overriding below. - hostname: localdev.me - # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName - # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress - # ingressClassName: nginx - # Values can be templated - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" labels: {} - hosts: {} - # - host: executor.example.com - # http: - # paths: - # - path: "/" - # pathType: Prefix - # backend: - # service: - # name: astria-evm-service - # port: - # name: json-rpc-svc - # - host: faucet.example.com - # http: - # paths: - # - path: "/" - # pathType: Prefix - # backend: - # service: - # name: astria-faucet-service - # port: - # name: faucet-svc - # - host: blockscout.example.com - # http: - # paths: - # - path: "/" - # pathType: Prefix - # backend: - # service: - # name: astria-blockscout-svc - # port: - # name: blockscout-svc - tls: {} - # - secretName: chart-example-tls - # hosts: - # - chart-example.local + hostname: localdev.me + services: + rpc: + hosts: + - executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + path: / + pathType: Prefix + defaultBackend: + service: + name: "{{ .Values.config.rollup.name }}-evm-service" + port: + name: json-rpc-svc + service: + name: "{{ .Values.config.rollup.name }}-evm-service" + port: json-rpc-svc + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + labels: {} + tls: {} + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + ws: + hosts: + - ws-executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + path: / + pathType: Prefix + defaultBackend: + service: + name: "{{ .Values.config.rollup.name }}-evm-service" + port: + name: ws-rpc-svc + service: + name: "{{ .Values.config.rollup.name }}-evm-service" + port: ws-rpc-svc + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + labels: {} + tls: {} + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + faucet: + hosts: + - faucet.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + path: / + pathType: Prefix + defaultBackend: + service: + name: "{{ .Values.config.rollup.name }}-faucet-service" + port: + name: faucet-svc + service: + name: "{{ .Values.config.rollup.name }}-faucet-service" + port: faucet-svc + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + labels: {} + tls: {} + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + explorer: + hosts: + - blockscout.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + path: / + pathType: Prefix + defaultBackend: + service: + name: "{{ .Values.config.rollup.name }}-blockscout-service" + port: + name: blockscout-svc + service: + name: "{{ .Values.config.rollup.name }}-blockscout-service" + port: blockscout-svc + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + labels: {} + tls: {} + # - secretName: chart-example-tls + # hosts: + # - chart-example.local # Default persistent storage values # NOTE - `rollupName` will be used with `persistentVolumeName` to generate names for kubernetes resources. diff --git a/charts/sequencer-faucet/templates/ingress.yaml b/charts/sequencer-faucet/templates/ingress.yaml index 17ed4e2b..d887309b 100644 --- a/charts/sequencer-faucet/templates/ingress.yaml +++ b/charts/sequencer-faucet/templates/ingress.yaml @@ -2,11 +2,11 @@ {{- $ingressApiIsStable := eq (include "sequencer.ingress.isStable" .) "true" -}} {{- $ingressSupportsIngressClassName := eq (include "sequencer.ingress.supportsIngressClassName" .) "true" -}} {{- $ingressSupportsPathType := eq (include "sequencer.ingress.supportsPathType" .) "true" -}} -{{- $servicePort := .Values.ingress.service.port -}} -{{- $serviceName := .Values.ingress.service.name -}} +{{- $servicePort := tpl .Values.ingress.service.port . -}} +{{- $serviceName := tpl .Values.ingress.service.name . -}} {{- $ingressPath := .Values.ingress.path -}} {{- $ingressPathType := .Values.ingress.pathType -}} -{{- $extraPaths := .Values.ingress.extraPaths -}} +{{- $extraPaths := tpl .Values.ingress.extraPaths . -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -46,7 +46,7 @@ spec: backend: {{- if $ingressApiIsStable }} service: - name: {{ $serviceName }} + name: {{ tpl $serviceName }} port: name: {{ $servicePort }} {{- else }} From f3d56577da7321ce3f251a8acaa1ec2c783c9075 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 20:06:20 +0300 Subject: [PATCH 25/30] cleanup logging --- charts/sequencer-relayer/files/scripts/start-relayer.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/charts/sequencer-relayer/files/scripts/start-relayer.sh b/charts/sequencer-relayer/files/scripts/start-relayer.sh index ea84ce81..2f6acb69 100644 --- a/charts/sequencer-relayer/files/scripts/start-relayer.sh +++ b/charts/sequencer-relayer/files/scripts/start-relayer.sh @@ -3,8 +3,8 @@ set -o errexit -o nounset -o pipefail echo "Starting the Astria Sequencer Relayer..." -echo "ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: $ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" if [ -z "$ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" ]; then + echo "Fetching the Celestia bearer token..." # FIXME - how to use `token-svc` port here instead of hardcoding? BEARER_TOKEN=$(wget -qO- $TOKEN_SERVER) @@ -16,8 +16,7 @@ if [ -z "$ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" ]; then echo "Celestia Bearer token fetched successfully." export ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN="$BEARER_TOKEN" fi -echo "ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: $ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" - +echo "ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN set" /usr/local/bin/astria-sequencer-relayer From f1afd6a8afeff10113b09fe12b81a862eaf30f9e Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Sun, 19 Nov 2023 20:12:09 +0300 Subject: [PATCH 26/30] version bumps --- charts/rollup/Chart.yaml | 2 +- charts/sequencer-faucet/Chart.yaml | 2 +- charts/sequencer-relayer/Chart.yaml | 4 ++-- charts/sequencer/Chart.lock | 6 +++--- charts/sequencer/Chart.yaml | 6 +++--- .../sequencer/charts/sequencer-relayer-0.1.0.tgz | Bin 1656 -> 0 bytes .../sequencer/charts/sequencer-relayer-0.2.0.tgz | Bin 0 -> 1662 bytes 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 charts/sequencer/charts/sequencer-relayer-0.1.0.tgz create mode 100644 charts/sequencer/charts/sequencer-relayer-0.2.0.tgz diff --git a/charts/rollup/Chart.yaml b/charts/rollup/Chart.yaml index e8063fc3..68c6337e 100644 --- a/charts/rollup/Chart.yaml +++ b/charts/rollup/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.5.0 +version: 0.6.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/sequencer-faucet/Chart.yaml b/charts/sequencer-faucet/Chart.yaml index 9a3091f1..53b0bca2 100644 --- a/charts/sequencer-faucet/Chart.yaml +++ b/charts/sequencer-faucet/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.4 +version: 0.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/sequencer-relayer/Chart.yaml b/charts/sequencer-relayer/Chart.yaml index 9f47f438..68e20b77 100644 --- a/charts/sequencer-relayer/Chart.yaml +++ b/charts/sequencer-relayer/Chart.yaml @@ -15,13 +15,13 @@ 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.1.0 +version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.0" +appVersion: "0.2.0" maintainers: - name: wafflesvonmaple diff --git a/charts/sequencer/Chart.lock b/charts/sequencer/Chart.lock index a609088c..a8604556 100644 --- a/charts/sequencer/Chart.lock +++ b/charts/sequencer/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: sequencer-relayer repository: file://../sequencer-relayer - version: 0.1.0 -digest: sha256:b590f80d592cca01e643d5b55ac539aa8a0ff57f6d0956c6b0bd0997d04e484e -generated: "2023-11-09T19:41:12.348179+03:00" + version: 0.2.0 +digest: sha256:e4bf6b0b4488f90c4c7240039c06dc4e2034149a7f0ec2b1d1cf9532942c9235 +generated: "2023-11-19T20:10:10.344601+03:00" diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index 94df603e..52c980bc 100644 --- a/charts/sequencer/Chart.yaml +++ b/charts/sequencer/Chart.yaml @@ -15,17 +15,17 @@ 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.6.0 +version: 0.7.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.6.0" +appVersion: "0.7.0" dependencies: - name: sequencer-relayer - version: "0.1.0" + version: "0.2.0" repository: "file://../sequencer-relayer" condition: sequencer-relayer.enabled diff --git a/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz deleted file mode 100644 index 3c6ab9473511336324dd71f2cdea24b4f7fccdbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1656 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 Date: Sun, 19 Nov 2023 20:13:40 +0300 Subject: [PATCH 27/30] explorer path --- charts/rollup/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index cf79f6ce..487654cc 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -194,11 +194,11 @@ ingress: pathType: Prefix defaultBackend: service: - name: "{{ .Values.config.rollup.name }}-blockscout-service" + name: "{{ .Values.config.rollup.name }}-blockscout-svc" port: name: blockscout-svc service: - name: "{{ .Values.config.rollup.name }}-blockscout-service" + name: "{{ .Values.config.rollup.name }}-blockscout-svc" port: blockscout-svc annotations: {} # kubernetes.io/ingress.class: nginx From f70507bd23c0bdd99ff89c3ac6bb1a5deb6fd778 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Mon, 27 Nov 2023 14:46:20 -0800 Subject: [PATCH 28/30] cleanup ingress defs --- charts/rollup/charts/celestia-node-0.1.0.tgz | Bin 4779 -> 4779 bytes charts/rollup/templates/ingress.yaml | 24 +++++++------- charts/rollup/values.yaml | 33 +++++-------------- values/validators/node0.yml | 1 - 4 files changed, 20 insertions(+), 38 deletions(-) diff --git a/charts/rollup/charts/celestia-node-0.1.0.tgz b/charts/rollup/charts/celestia-node-0.1.0.tgz index 6920974bae77544f1c216beb7af11e66714d9b86..7bc7eedc41ba736c6cd43a3064892efb89b7a2ce 100644 GIT binary patch delta 4762 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 delta 4762 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 diff --git a/charts/rollup/templates/ingress.yaml b/charts/rollup/templates/ingress.yaml index 461178c2..db710201 100644 --- a/charts/rollup/templates/ingress.yaml +++ b/charts/rollup/templates/ingress.yaml @@ -19,23 +19,23 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} annotations: - {{- with $ingress.annotations }} - {{- range $key, $value := . }} + kubernetes.io/ingress.class: {{ $.Values.ingress.className }} + {{- if $ingressApiIsStable }} + {{- range $key, $value := $ingress.annotations }} {{ $key }}: {{ tpl $value $ | quote }} {{- end }} - {{- else }} - kubernetes.io/ingress.class: nginx {{- end }} spec: - {{- if and $ingressSupportsIngressClassName $ingress.ingressClassName }} - ingressClassName: {{ $ingress.ingressClassName }} + {{- if $ingressSupportsIngressClassName }} + ingressClassName: {{ $.Values.ingress.className }} {{- end -}} - {{- with $ingress.defaultBackend }} + {{- with $ingress.service }} defaultBackend: - {{- tpl (toYaml .) $ | nindent 4 }} + service: + {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} rules: - {{- with $ingress.hosts }} + {{- with $ingress.hosts }} {{- range $host := . }} - host: {{ tpl $host $ }} http: @@ -49,10 +49,8 @@ spec: {{- end }} backend: {{- if $ingressApiIsStable }} - service: - name: {{ tpl $serviceName $ }} - port: - name: {{ tpl $servicePort $ }} + service: + {{- tpl (toYaml $ingress.service) $ | nindent 16 }} {{- else }} serviceName: {{ tpl $serviceName $ }} servicePort: {{ tpl $servicePort $ }} diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index 487654cc..cedfbced 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -123,20 +123,17 @@ ingress: enabled: true labels: {} hostname: localdev.me + className: nginx services: rpc: hosts: - executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} path: / pathType: Prefix - defaultBackend: - service: - name: "{{ .Values.config.rollup.name }}-evm-service" - port: - name: json-rpc-svc service: name: "{{ .Values.config.rollup.name }}-evm-service" - port: json-rpc-svc + port: + name: json-rpc-svc annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" @@ -150,14 +147,10 @@ ingress: - ws-executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} path: / pathType: Prefix - defaultBackend: - service: - name: "{{ .Values.config.rollup.name }}-evm-service" - port: - name: ws-rpc-svc service: name: "{{ .Values.config.rollup.name }}-evm-service" - port: ws-rpc-svc + port: + name: ws-rpc-svc annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" @@ -171,14 +164,10 @@ ingress: - faucet.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} path: / pathType: Prefix - defaultBackend: - service: - name: "{{ .Values.config.rollup.name }}-faucet-service" - port: - name: faucet-svc service: name: "{{ .Values.config.rollup.name }}-faucet-service" - port: faucet-svc + port: + name: faucet-svc annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" @@ -192,14 +181,10 @@ ingress: - blockscout.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} path: / pathType: Prefix - defaultBackend: - service: - name: "{{ .Values.config.rollup.name }}-blockscout-svc" - port: - name: blockscout-svc service: name: "{{ .Values.config.rollup.name }}-blockscout-svc" - port: blockscout-svc + port: + name: blockscout-svc annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/values/validators/node0.yml b/values/validators/node0.yml index fb2bf754..bcc822af 100644 --- a/values/validators/node0.yml +++ b/values/validators/node0.yml @@ -47,7 +47,6 @@ ingress: sequencer-relayer: enabled: true config: - useTTY: true relayer: celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 sequencerRpc: http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657 From 38b4fbdb579cb8fc43a327ca2631a1902d5058e1 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Mon, 27 Nov 2023 14:58:49 -0800 Subject: [PATCH 29/30] minor updates --- charts/rollup/templates/ingress.yaml | 4 ++-- charts/sequencer-faucet/templates/ingress.yaml | 11 +++++------ charts/sequencer-faucet/values.yaml | 14 +++++--------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/charts/rollup/templates/ingress.yaml b/charts/rollup/templates/ingress.yaml index db710201..397c87a5 100644 --- a/charts/rollup/templates/ingress.yaml +++ b/charts/rollup/templates/ingress.yaml @@ -36,7 +36,7 @@ spec: {{- end }} rules: {{- with $ingress.hosts }} - {{- range $host := . }} + {{- range $host := . }} - host: {{ tpl $host $ }} http: paths: @@ -55,12 +55,12 @@ spec: serviceName: {{ tpl $serviceName $ }} servicePort: {{ tpl $servicePort $ }} {{- end }} + {{- end }} {{- end }} {{- if $ingress.tls }} tls: {{- tpl (toYaml $ingress.tls) $ | nindent 4 }} {{- end }} - {{- end }} --- {{- end }} {{- end }} diff --git a/charts/sequencer-faucet/templates/ingress.yaml b/charts/sequencer-faucet/templates/ingress.yaml index d887309b..cecd77d4 100644 --- a/charts/sequencer-faucet/templates/ingress.yaml +++ b/charts/sequencer-faucet/templates/ingress.yaml @@ -2,7 +2,7 @@ {{- $ingressApiIsStable := eq (include "sequencer.ingress.isStable" .) "true" -}} {{- $ingressSupportsIngressClassName := eq (include "sequencer.ingress.supportsIngressClassName" .) "true" -}} {{- $ingressSupportsPathType := eq (include "sequencer.ingress.supportsPathType" .) "true" -}} -{{- $servicePort := tpl .Values.ingress.service.port . -}} +{{- $servicePort := tpl .Values.ingress.service.port.name . -}} {{- $serviceName := tpl .Values.ingress.service.name . -}} {{- $ingressPath := .Values.ingress.path -}} {{- $ingressPathType := .Values.ingress.pathType -}} @@ -18,15 +18,16 @@ metadata: {{- end }} {{- with .Values.ingress.annotations }} annotations: + kubernetes.io/ingress.class: {{ $.Values.ingress.className }} {{- range $key, $value := . }} {{ $key }}: {{ tpl $value $ | quote }} {{- end }} {{- end }} spec: {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }} - ingressClassName: {{ .Values.ingress.ingressClassName }} + ingressClassName: {{ .Values.ingress.className }} {{- end -}} - {{- with .Values.ingress.defaultBackend }} + {{- with .Values.ingress.service }} defaultBackend: {{- tpl (toYaml .) $ | nindent 4 }} {{- end }} @@ -46,9 +47,7 @@ spec: backend: {{- if $ingressApiIsStable }} service: - name: {{ tpl $serviceName }} - port: - name: {{ $servicePort }} + {{- tpl (toYaml $.Values.ingress.service) $ | nindent 16 }} {{- else }} serviceName: {{ $serviceName }} servicePort: {{ $servicePort }} diff --git a/charts/sequencer-faucet/values.yaml b/charts/sequencer-faucet/values.yaml index a21e694d..82f02369 100644 --- a/charts/sequencer-faucet/values.yaml +++ b/charts/sequencer-faucet/values.yaml @@ -38,6 +38,7 @@ ingress: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated + className: nginx annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" @@ -47,15 +48,10 @@ ingress: pathType: Prefix hosts: {} # - chart-example.local - service: {} - # name: sequencer-faucet-service - # port: - # name: seq-faucet-svc - defaultBackend: {} - # service: - # name: sequencer-faucet-service - # port: - # name: seq-faucet-svc + service: + name: sequencer-faucet-service + port: + name: seq-faucet-svc ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services. extraPaths: {} # - path: /* From 8a660a3d69fad0e466479d6e96a0e162b4a36e5f Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Mon, 27 Nov 2023 15:17:05 -0800 Subject: [PATCH 30/30] ingree adjustments --- charts/rollup/templates/ingress.yaml | 6 +++--- .../sequencer-faucet/templates/ingress.yaml | 20 +++++-------------- charts/sequencer-faucet/values.yaml | 9 ++++----- justfile | 2 +- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/charts/rollup/templates/ingress.yaml b/charts/rollup/templates/ingress.yaml index 397c87a5..79e95033 100644 --- a/charts/rollup/templates/ingress.yaml +++ b/charts/rollup/templates/ingress.yaml @@ -8,8 +8,9 @@ {{- $serviceName := $ingress.service.name -}} {{- $ingressPath := $ingress.path -}} {{- $ingressPathType := $ingress.pathType -}} -{{- $extraPaths := $ingress.extraPaths -}} -apiVersion: networking.k8s.io/v1 +{{- $extraPaths := $ingress.extraPaths }} +--- +apiVersion: {{ include "rollup.ingress.apiVersion" $ }} kind: Ingress metadata: name: {{ $.Values.config.rollup.name }}-{{ $service }}-ingress @@ -61,6 +62,5 @@ spec: tls: {{- tpl (toYaml $ingress.tls) $ | nindent 4 }} {{- end }} ---- {{- end }} {{- end }} diff --git a/charts/sequencer-faucet/templates/ingress.yaml b/charts/sequencer-faucet/templates/ingress.yaml index cecd77d4..e0b15378 100644 --- a/charts/sequencer-faucet/templates/ingress.yaml +++ b/charts/sequencer-faucet/templates/ingress.yaml @@ -6,8 +6,8 @@ {{- $serviceName := tpl .Values.ingress.service.name . -}} {{- $ingressPath := .Values.ingress.path -}} {{- $ingressPathType := .Values.ingress.pathType -}} -{{- $extraPaths := tpl .Values.ingress.extraPaths . -}} -apiVersion: networking.k8s.io/v1 +{{- $extraPaths := .Values.ingress.extraPaths -}} +apiVersion: {{ include "sequencer.ingress.apiVersion" . }} kind: Ingress metadata: name: sequencer-faucet-ingress @@ -24,12 +24,13 @@ metadata: {{- end }} {{- end }} spec: - {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }} + {{- if and $ingressSupportsIngressClassName .Values.ingress.className }} ingressClassName: {{ .Values.ingress.className }} {{- end -}} {{- with .Values.ingress.service }} defaultBackend: - {{- tpl (toYaml .) $ | nindent 4 }} + service: + {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} rules: {{- if .Values.ingress.hosts }} @@ -57,16 +58,5 @@ spec: tls: {{- tpl (toYaml .) $ | nindent 4 }} {{- end }} - {{- else }} - - host: sequencer-faucet.localdev.me - http: - paths: - - path: "/" - pathType: Prefix - backend: - service: - name: sequencer-faucet-service - port: - name: seq-faucet-svc {{- end -}} {{- end }} diff --git a/charts/sequencer-faucet/values.yaml b/charts/sequencer-faucet/values.yaml index 82f02369..2887c7c2 100644 --- a/charts/sequencer-faucet/values.yaml +++ b/charts/sequencer-faucet/values.yaml @@ -43,14 +43,13 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} - path: {} - # pathType is only for k8s >= 1.1= + path: / pathType: Prefix - hosts: {} - # - chart-example.local + hosts: + - sequencer-faucet.localdev.me service: name: sequencer-faucet-service - port: + port: name: seq-faucet-svc ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services. extraPaths: {} diff --git a/justfile b/justfile index 4383d1e5..9422e2e4 100644 --- a/justfile +++ b/justfile @@ -25,7 +25,7 @@ load-image image: kind load docker-image {{image}} --name astria-dev-cluster deploy-chart chart: - helm install --debug {{chart}}-chart ./charts/{{chart}} + helm install --debug --dry-run {{chart}}-chart ./charts/{{chart}} delete-chart chart: helm uninstall {{chart}}-chart