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

Fix/reth ports #227

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
feat(charts/xatu-mimicry): add probe (#228)
* feat(charts/xatu-mimicry): add probe

* feat(charts/xatu-mimicry): add default captureDelay
  • Loading branch information
Savid authored Sep 20, 2023
commit 6fdf401c4f773bf03f8c6fb852c42b94f145cefc
2 changes: 1 addition & 1 deletion charts/xatu-mimicry/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: xatu-mimicry
description: Ethereum p2p monitoring tool that collects data from the execution layer.
home: https://github.com/ethpandaops/xatu
type: application
version: 0.0.5
version: 0.0.6
maintainers:
- name: samcm
email: sam.calder-mason@ethereum.org
Expand Down
4 changes: 3 additions & 1 deletion charts/xatu-mimicry/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# xatu-mimicry

![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

Ethereum p2p monitoring tool that collects data from the execution layer.

Expand All @@ -14,6 +14,7 @@ Ethereum p2p monitoring tool that collects data from the execution layer.
| affinity | object | `{}` | Affinity configuration for pods |
| annotations | object | `{}` | Annotations for the Deployment |
| args | list | `[]` | Command arguments |
| config.captureDelay | string | `"3m"` | |
| config.coordinator.config.nodeRecords[0] | string | `"enode://dd47aff4da11c82496fec9253a1d2dac8c4abdbf93ff7458cf7965447355c265907b41dbd8c4b1dded6ae28b5a4d2d6b4d3fdad2950e5b6ef56169958b80b450@127.0.0.1:30301"` | |
| config.coordinator.config.retryInterval | string | `"60s"` | |
| config.coordinator.type | string | `"static"` | |
Expand All @@ -29,6 +30,7 @@ Ethereum p2p monitoring tool that collects data from the execution layer.
| config.outputs[0].config.maxQueueSize | int | `51200` | |
| config.outputs[0].name | string | `"basic"` | |
| config.outputs[0].type | string | `"http"` | |
| config.probeAddr | string | `":8080"` | |
| containerSecurityContext | object | See `values.yaml` | The security context for containers |
| customArgs | list | `[]` | Custom args for the xatu container |
| customCommand | list | `[]` | Command replacement for the xatu container |
Expand Down
6 changes: 6 additions & 0 deletions charts/xatu-mimicry/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,9 @@ Create the name of the service account to use
{{ (split ":" .Values.config.pprofAddr)._1 | default "6060" }}
{{- end -}}
{{- end -}}

{{- define "xatu-mimicry.probePort" -}}
{{- if .Values.config.probeAddr -}}
{{ (split ":" .Values.config.probeAddr)._1 | default "8080" }}
{{- end -}}
{{- end -}}
5 changes: 5 additions & 0 deletions charts/xatu-mimicry/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ spec:
containerPort: {{ include "xatu-mimicry.pprofPort" . }}
protocol: TCP
{{- end }}
{{- if (include "xatu-mimicry.probePort" .) }}
- name: probe
containerPort: {{ include "xatu-mimicry.probePort" . }}
protocol: TCP
{{- end }}
livenessProbe:
{{- toYaml .Values.livenessProbe | nindent 12 }}
readinessProbe:
Expand Down
6 changes: 6 additions & 0 deletions charts/xatu-mimicry/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ spec:
protocol: TCP
name: pprof
{{- end }}
{{- if (include "xatu-mimicry.probePort" .) }}
- port: {{ include "xatu-mimicry.probePort" . }}
targetPort: probe
protocol: TCP
name: probe
{{- end }}
{{- if .Values.extraPorts }}
{{ toYaml .Values.extraPorts | nindent 4}}
{{- end }}
Expand Down
10 changes: 6 additions & 4 deletions charts/xatu-mimicry/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ args: []
config:
logging: "info"
metricsAddr: ":9090"
probeAddr: ":8080"
name: example-instance
ntpServer: time.google.com
captureDelay: 3m
coordinator:
type: static
config:
Expand Down Expand Up @@ -67,16 +69,16 @@ annotations: {}
# @default -- See `values.yaml`
livenessProbe:
tcpSocket:
port: metrics
initialDelaySeconds: 60
port: probe
initialDelaySeconds: 180 # should match config.captureDelay
periodSeconds: 120

# -- Readiness probe
# @default -- See `values.yaml`
readinessProbe:
tcpSocket:
port: metrics
initialDelaySeconds: 10
port: probe
initialDelaySeconds: 180 # should match config.captureDelay
periodSeconds: 10

# -- Node selector for pods
Expand Down
Loading