From 1961a557560f09d7ea79b8c699d3938917c86317 Mon Sep 17 00:00:00 2001 From: Tim Moreton Date: Mon, 19 Oct 2020 17:52:24 -0700 Subject: [PATCH] Deploy Attestation Service 1.0.5 to cLabs validators on baklava (#5440) ### Description * Bump Attestation Service version to 1.0.5 * New Twilio secrets for new Twilio app * New Nexmo applications configured. Right now, we've configured 15, so that the first 15 of 30 correctly get Delivery info. Can extend this later. There is a per month $ fee for the numbers reserved for each application. ### Other changes _Describe any minor or "drive-by" changes here._ ### Tested Deployed ### Backwards compatibility Yes --- .env.baklava | 6 +++++- .env.mnemonic.baklava.enc | Bin 608 -> 608 bytes .../celotool/src/lib/attestation-service.ts | 3 +++ .../templates/attestation.secret.yaml | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.env.baklava b/.env.baklava index 68131007dad..2cc5e5fe137 100644 --- a/.env.baklava +++ b/.env.baklava @@ -3,6 +3,7 @@ ENV_TYPE="production" GETH_VERBOSITY=2 +GETH_ENABLE_METRICS=false VM_BASED=true @@ -76,7 +77,10 @@ EKSPORTISTO_DOCKER_IMAGE_TAG="b199a634866ef34c4fa1925381dff4de40eb0a3c" EKSPORTISTO_SUFFIX='1' ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo" -ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-dc5e5dfa07231a4ff4664816a95eae606293eae9" +ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-1-0-5" + +# We only configured 15 nexmo applications. So delivery receipts from the second 15 will always go to the wrong place for now +NEXMO_APPLICATIONS=ef341798-ab17-4029-8e35-eb574aaf3a59,dfffa813-14a9-4788-a920-9ba3ea6b954f,e4dec04f-9f80-4cdf-b640-db1a5ce6f891,089bad07-739a-45e5-a0ab-c24de477cfd2,fa5fad11-5a18-4f46-954b-250915003fa6,5c53815b-658e-415b-a6e2-709cc099b5da,0b494350-524d-4e0e-8b96-96e7f6d79e62,5e5fed3e-841f-4b09-b17c-c54dfea16493,2b537eeb-8409-4477-8922-c4f1a112b8d8,9870cd94-4281-45b5-b292-c0249632126b,1fdb10b6-45c0-4555-816b-2c11007286c1,1b1f3644-8e3c-47fb-af3f-49c44c133a7e,fba4f241-14ad-402a-a871-073e40eb8b48,2cec3a9e-cdbb-4f11-ad25-d83abd23e299,e6c77355-7113-4e57-b825-17078dec0c31,ef341798-ab17-4029-8e35-eb574aaf3a59,dfffa813-14a9-4788-a920-9ba3ea6b954f,e4dec04f-9f80-4cdf-b640-db1a5ce6f891,089bad07-739a-45e5-a0ab-c24de477cfd2,fa5fad11-5a18-4f46-954b-250915003fa6,5c53815b-658e-415b-a6e2-709cc099b5da,0b494350-524d-4e0e-8b96-96e7f6d79e62,5e5fed3e-841f-4b09-b17c-c54dfea16493,2b537eeb-8409-4477-8922-c4f1a112b8d8,9870cd94-4281-45b5-b292-c0249632126b,1fdb10b6-45c0-4555-816b-2c11007286c1,1b1f3644-8e3c-47fb-af3f-49c44c133a7e,fba4f241-14ad-402a-a871-073e40eb8b48,2cec3a9e-cdbb-4f11-ad25-d83abd23e299,e6c77355-7113-4e57-b825-17078dec0c31 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter" GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261" diff --git a/.env.mnemonic.baklava.enc b/.env.mnemonic.baklava.enc index 05bfe011e91b34fc739714a689c72abbfb6cb3cd..a49189025f3b25971bf486d78054e62b99181871 100644 GIT binary patch literal 608 zcmV-m0-yZ~Bmi5&XOd(~W99TR?w0kNL+*$Kw5?5i=q|sEWKBY0jRE*Vwu|dyx8WJG}?fpP-6ZrG3U_&_} zloFprhncP&GtXy4BS?@sC15~XpfKH3xVjMPiO}31d-MoceIlBF-AfI4*MAup3Iksu zV-B@yw@Zmq>O9KI(=!u;?zKIK;1xV!sC22r5l4ShIKVBLKt{vX13v8y>P(9j4E{*$ zAgEqMI5`yz21)T&^p92RR<88irL%iOg*c8RjRhreoYgE$AD*RzU8P%CK^=|K*9_WM z)T<0RET6<&kHJm&6qBLLiQb_Abal)M(STtOj!xfUqBYkch(9Z5+xdd%XWJsRZOyK1 z6tN86uY{|E+CB^;0bv}hatpWLP@SAm{lZ5rfh+ z;0?TG8O0_yoIq13bo)t&ij{I!?VIG7T&RI;4LySwMdafBCuNhDYCTt_002pR7#>p=!oJIiPm&X{Uf3P literal 608 zcmV-m0-yZ~Bmi5&XOdbJ9>gQ60iaNba(FQuCvpGgK3Acgf+%TAe-ZGQ*Alk`02zV- zE@+-O4)9q10|_q`vdY@x*51KTttFV_ZWh;PFd0S9!47I{;~hJw^_#76wqT~=8(zAK zp>`S608YucRKJSx1Iq}Y@Us3lUcr3NWL7U?2yoBGH;|TG4Zeo3i}pQNU)vYL2T2x>&#Cd<^!_O-ce{ zyo2!Bd&ZC2^*9{(=&g)c>+|Rhh$_%}xr57kiI0a6DJMYUc5h$`wG!$k8Ga4xsEcrg z0KzF0=MaM(qm9BWNt77L-vCy2HEmUJ3eA^_;l+;xm6C!rp5r|9@pJgSU2eSXCz(5y$|due2Hu zE`$f;MGUz;wGSMhnk8>m43nN29m~vo(~2FmRt uuieCG+2xhlg8UJL>ULoJqjP8!g(;D*s=w*Lq3tC;q@8AW+#Z1**MCesfh6q! diff --git a/packages/celotool/src/lib/attestation-service.ts b/packages/celotool/src/lib/attestation-service.ts index 8b46dcf7a68..9aa1ccbd4f3 100644 --- a/packages/celotool/src/lib/attestation-service.ts +++ b/packages/celotool/src/lib/attestation-service.ts @@ -47,6 +47,9 @@ async function helmParameters(celoEnv: string) { envVar.ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY )}`, `--set attestation_service.image.tag=${fetchEnv(envVar.ATTESTATION_SERVICE_DOCKER_IMAGE_TAG)}`, + `--set attestation_service.twilio.accountSid="${fetchEnv(envVar.TWILIO_ACCOUNT_SID)}"`, + `--set attestation_service.twilio.authToken="${fetchEnv(envVar.TWILIO_ACCOUNT_AUTH_TOKEN)}"`, + `--set attestation_service.twilio.addressSid="${fetchEnv(envVar.TWILIO_ADDRESS_SID)}"`, `--set attestation_service.nexmo.apiKey="${fetchEnv(envVar.NEXMO_KEY)}"`, `--set attestation_service.nexmo.apiSecret="${fetchEnv(envVar.NEXMO_SECRET)}"`, ...setHelmArray('attestation_service.nexmo.applications', fetchEnv(envVar.NEXMO_APPLICATIONS).split(',')), diff --git a/packages/helm-charts/attestation-service/templates/attestation.secret.yaml b/packages/helm-charts/attestation-service/templates/attestation.secret.yaml index 91f62260610..d447b465566 100644 --- a/packages/helm-charts/attestation-service/templates/attestation.secret.yaml +++ b/packages/helm-charts/attestation-service/templates/attestation.secret.yaml @@ -11,4 +11,7 @@ type: Opaque data: NEXMO_KEY: {{ .Values.attestation_service.nexmo.apiKey | b64enc | quote }} NEXMO_SECRET: {{ .Values.attestation_service.nexmo.apiSecret | b64enc | quote }} - MNEMONIC: {{ .Values.mnemonic | b64enc | quote }} \ No newline at end of file + MNEMONIC: {{ .Values.mnemonic | b64enc | quote }} + TWILIO_ACCOUNT_SID: {{ .Values.attestation_service.twilio.accountSid | b64enc }} + TWILIO_AUTH_TOKEN: {{ .Values.attestation_service.twilio.authToken | b64enc }} + TWILIO_MESSAGING_SERVICE_SID: {{ .Values.attestation_service.twilio.addressSid | b64enc }}