Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: simplify otel config, 1val setup, fix pod dns, retries #10344

Merged
merged 34 commits into from
Dec 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b418f24
show ethereum node logs
ludamad Nov 29, 2024
19bf367
fix
ludamad Nov 29, 2024
be93a1e
remove gotcha from deploy spartan script
ludamad Nov 29, 2024
e55f705
fix
ludamad Nov 29, 2024
19923b2
try to fix OTEL_COLLECTOR_ENDPOINT
ludamad Nov 29, 2024
b1f5fcd
try to fix OTEL_COLLECTOR_ENDPOINT
ludamad Nov 29, 2024
432d9b8
try to fix OTEL_COLLECTOR_ENDPOINT
ludamad Nov 29, 2024
978a0b6
perms
ludamad Nov 29, 2024
7e2ec05
validator set
ludamad Nov 29, 2024
556590a
fix
ludamad Nov 29, 2024
0449974
retry on l1 contract depoy
ludamad Nov 29, 2024
1538531
verifier deploy fix
ludamad Nov 29, 2024
2059d4b
verifier deploy fix
ludamad Nov 29, 2024
c8684e4
fix
ludamad Nov 29, 2024
e0263a9
retries
ludamad Nov 29, 2024
e7bf831
values file
ludamad Nov 29, 2024
550ce53
one more try...
ludamad Nov 29, 2024
6be0148
paranoia
ludamad Nov 30, 2024
576ac0f
try with service disabled?
ludamad Nov 30, 2024
2367cbf
-
ludamad Nov 30, 2024
398ccee
fix broker being external
ludamad Dec 2, 2024
d8044f4
dns policy
ludamad Dec 2, 2024
b88c328
fixes
ludamad Dec 2, 2024
d1fb96e
helper
ludamad Dec 2, 2024
1ec3679
detect telemetry and dont set endpoint
ludamad Dec 2, 2024
f0b774b
devnet fix
ludamad Dec 2, 2024
2d4dcd4
bot settings
ludamad Dec 2, 2024
1bd2ba1
Merge branch 'master' into ad/fix/deploy_spartan.sh
ludamad Dec 4, 2024
0614f4a
chore: devnet extras (#10414)
alexghr Dec 5, 2024
e3ddd72
Fixes
PhilWindle Dec 5, 2024
54fc32e
Merge remote-tracking branch 'origin/master' into ad/fix/deploy_spart…
PhilWindle Dec 5, 2024
e2d6be4
Remove collector endpoint config
PhilWindle Dec 5, 2024
292e351
Merge remote-tracking branch 'origin/master' into ad/fix/deploy_spart…
PhilWindle Dec 5, 2024
8a8d600
Fix
PhilWindle Dec 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
detect telemetry and dont set endpoint
  • Loading branch information
ludamad committed Dec 2, 2024
commit 1ec367923a34c460f9bf349f9dd6810dd8ab0772
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ else
fi

# Configure OTEL_COLLECTOR_ENDPOINT if not set in values file
if [ "${OTEL_COLLECTOR_ENDPOINT}" = "" ]; then
if [ "${TELEMETRY:-false}" = "true" ] && [ "${OTEL_COLLECTOR_ENDPOINT}" = "" ]; then
OTEL_COLLECTOR_PORT=${OTEL_COLLECTOR_PORT:-4318}
OTEL_COLLECTOR_ENDPOINT="http://metrics-opentelemetry-collector.metrics:$OTEL_COLLECTOR_PORT"
fi
2 changes: 2 additions & 0 deletions spartan/aztec-network/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -129,6 +129,8 @@ Service Address Setup Container
value: "{{ .Values.network.public }}"
- name: NAMESPACE
value: {{ .Release.Namespace }}
- name: TELEMETRY
value: "{{ .Values.telemetry.enabled }}"
- name: OTEL_COLLECTOR_ENDPOINT
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otel collector port is not provided here although it is available for use in the script above?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we want to keep it as the default

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I wanted to make it available potentially in future but it is a bit misleading. You can change the port by changing the full URL but no real reason to change ports imo

value: "{{ .Values.telemetry.otelCollectorEndpoint }}"
- name: EXTERNAL_ETHEREUM_HOST
10 changes: 5 additions & 5 deletions spartan/scripts/get_service_address
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
set -eu
local SERVICE_LABEL=$1
local PORT=$2
local MAX_RETRIES=30
local RETRY_INTERVAL=2
local attempt=1
SERVICE_LABEL=$1
PORT=$2
MAX_RETRIES=30
RETRY_INTERVAL=2
attempt=1

# Get pod name
while [ $attempt -le $MAX_RETRIES ]; do
6 changes: 3 additions & 3 deletions spartan/scripts/post_deploy_spartan.sh
Original file line number Diff line number Diff line change
@@ -24,9 +24,9 @@ function get_load_balancer_url() {


# Fetch the service URLs based on the namespace for injection in the test-transfer.sh
export BOOTNODE_URL=http://$($(dirname $0)/get_service_address boot-node 8080)
export PXE_URL=http://$($(dirname $0)/get_service_address pxe 8080)
export ETHEREUM_HOST=http://$($(dirname $0)/get_service_address ethereum 8545)
export BOOTNODE_URL=$($(dirname $0)/get_service_address boot-node 8080)
export PXE_URL=$($(dirname $0)/get_service_address pxe 8080)
export ETHEREUM_HOST=$($(dirname $0)/get_service_address ethereum 8545)

echo "BOOTNODE_URL: $BOOTNODE_URL"
echo "PXE_URL: $PXE_URL"