Merge branch 'master' into bbusa/blutgang

Signed-off-by: Barnabas Busa <busa.barnabas@gmail.com>

.github/workflows/test-charts.yaml

@@ -66,4 +66,5 @@ jobs:
           --excluded-charts beacon-metrics-gazer
           --excluded-charts tracoor-server
           --excluded-charts tracoor-agent
+          --excluded-charts tracoor-single
           --excluded-charts xatu-cl-mimicry

README.md

@@ -93,6 +93,9 @@ Tooling
 - [`stubbies`](charts/stubbies) - Ethereum execution client stub for consensus layer clients.
 - [`testnet-faucet`](charts/testnet-faucet) - Web faucet that can be used to distribute testnet ETH to users.
 - [`testnet-homepage`](charts/testnet-homepage) - Simple website that can be used to display useful information about your testnet.
+- [`tracoor-single`](charts/tracoor-single) - An Ethereum beacon data and execution trace explorer in single mode.
+- [`tracoor-server`](charts/tracoor-server) - An Ethereum beacon data and execution trace explorer in server mode.
+- [`tracoor-agent`](charts/tracoor-agent) - An Ethereum beacon data and execution trace explorer in agent mode.
 - [`web3signer`](charts/web3signer) - An open-source remote signing service.
 - [`xatu-discovery`](charts/xatu-discovery) - Ethereum p2p monitoring tool that discovers node records.
 - [`xatu-mimicry`](charts/xatu-mimicry) - Ethereum p2p monitoring tool that collects data from the execution layer.

charts/assertoor/Chart.yaml

@@ -6,7 +6,7 @@ home: https://github.com/ethpandaops/assertoor
 sources:
   - https://github.com/ethpandaops/assertoor
 type: application
-version: 0.0.1
+version: 0.0.4
 appVersion: "1.0.0"
 maintainers:
   - name: pk910

charts/assertoor/README.md

@@ -1,7 +1,7 @@
 
 # assertoor
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Testing tool that is capable of doing actions and checking conditions on ethereum pos networks.
 
@@ -69,7 +69,8 @@ assertoorTests:
 | extraVolumes | list | `[]` | Additional volumes |
 | fullnameOverride | string | `""` | Overrides the chart's computed fullname |
 | globalVariables | object | `{"walletPrivkey":"feedbeef12340000feedbeef12340000feedbeef12340000feedbeef12340000"}` | global assertoor variables -- global variables are passed to all tests. |
-| httpPort | int | `8080` | HTTP port for assertoor interface |
+| httpPort | int | `8082` | HTTP port for assertoor interface |
+| httpPortAdmin | int | `8080` | HTTP port for assertoor admin interface |
 | image.pullPolicy | string | `"IfNotPresent"` | assertoor container pull policy |
 | image.repository | string | `"ethpandaops/assertoor"` | assertoor container image repository |
 | image.tag | string | `"latest"` | assertoor container image tag |
@@ -78,6 +79,11 @@ assertoorTests:
 | ingress.hosts[0].host | string | `"chart-example.local"` |  |
 | ingress.hosts[0].paths | list | `[]` |  |
 | ingress.tls | list | `[]` | Ingress TLS |
+| ingressAdmin.annotations | object | `{}` | Annotations for Ingress |
+| ingressAdmin.enabled | bool | `false` | Ingress resource for the HTTP API -- This is the admin interface -- Please ensure you put this behind authorization |
+| ingressAdmin.hosts[0].host | string | `"chart-example-admin.local"` |  |
+| ingressAdmin.hosts[0].paths | list | `[]` |  |
+| ingressAdmin.tls | list | `[]` | Ingress TLS |
 | initContainers | list | `[]` | Additional init containers |
 | nameOverride | string | `""` | Overrides the chart's name |
 | nodeSelector | object | `{}` | Node selector for pods |

charts/assertoor/templates/_helpers.tpl

@@ -62,5 +62,9 @@ Create the name of the service account to use
 {{- end }}
 
 {{- define "assertoor.httpPort" -}}
+{{- printf "8082" -}}
+{{- end -}}
+
+{{- define "assertoor.httpPortAdmin" -}}
 {{- printf "8080" -}}
 {{- end -}}

charts/assertoor/templates/deployment.yaml

@@ -64,6 +64,9 @@ spec:
             - name: http
               containerPort: {{ include "assertoor.httpPort" . }}
               protocol: TCP
+            - name: http-admin
+              containerPort: {{ include "assertoor.httpPortAdmin" . }}
+              protocol: TCP
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:

charts/assertoor/templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "assertoor.fullname" . -}}
-{{- $svcPort := include "assertoor.httpPort" . -}}
+{{- $svcPortPublic := include "assertoor.httpPort" . -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
@@ -51,10 +51,72 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: {{ $svcPort }}
+                  number: {{ $svcPortPublic }}
               {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+              servicePort: {{ $svcPortPublic }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}
+---
+{{- if .Values.ingressAdmin.enabled -}}
+{{- $fullName := include "assertoor.fullname" . -}}
+{{- $svcPortAdmin := include "assertoor.httpPortAdmin" . -}}
+{{- if and .Values.ingressAdmin.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingressAdmin.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingressAdmin.annotations "kubernetes.io/ingress.class" .Values.ingressAdmin.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-admin
+  labels:
+    {{- include "assertoor.labels" . | nindent 4 }}
+  {{- with .Values.ingressAdmin.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingressAdmin.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingressAdmin.className }}
+  {{- end }}
+  {{- if .Values.ingressAdmin.tls }}
+  tls:
+    {{- range .Values.ingressAdmin.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingressAdmin.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPortAdmin }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPortAdmin }}
               {{- end }}
           {{- end }}
     {{- end }}

charts/assertoor/templates/service.yaml

@@ -11,6 +11,10 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+    - port: {{ include "assertoor.httpPortAdmin" . }}
+      targetPort: http-admin
+      protocol: TCP
+      name: http-admin
   {{- if .Values.extraPorts }}
     {{ toYaml .Values.extraPorts | nindent 4}}
   {{- end }}

charts/assertoor/templates/tests/test-connection.yaml

@@ -15,5 +15,5 @@ spec:
        - --location
        - --request
        - GET
-       - '{{ include "assertoor.fullname" . }}:{{ include "assertoor.httpPort" . }}/'
+       - '{{ include "assertoor.fullname" . }}:{{ include "assertoor.httpPortAdmin" . }}/'
   restartPolicy: Never

charts/assertoor/values.yaml

@@ -26,7 +26,7 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
-  # -- Ingress host
+  # -- Ingress host for public service
   hosts:
     - host: chart-example.local
       paths: []
@@ -36,6 +36,25 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
+ingressAdmin:
+  # -- Ingress resource for the HTTP API
+  # -- This is the admin interface
+  # -- Please ensure you put this behind authorization
+  enabled: false
+  # -- Annotations for Ingress
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  # -- Ingress host for admin service
+  hosts:
+    - host: chart-example-admin.local
+      paths: []
+  # -- Ingress TLS
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
 service:
   # -- Service type
   type: ClusterIP
@@ -135,7 +154,10 @@ extraEnv: []
 
 
 # -- HTTP port for assertoor interface
-httpPort: 8080
+httpPort: 8082
+
+# -- HTTP port for assertoor admin interface
+httpPortAdmin: 8080
 
 # -- An array of endpoints to use for assertoor
 # -- executionUrl & consensusUrl are the only required fields
@@ -178,6 +200,9 @@ assertoorTests: []
 config: |
   web:
     server:
+      host: "0.0.0.0"
+      port: {{ .Values.httpPortAdmin }}
+    publicServer:
       host: "0.0.0.0"
       port: {{ .Values.httpPort }}
     frontend:
@@ -213,7 +238,7 @@ config: |
     inventoryUrl: "{{ .Values.validatorNamesInventory }}"
 
   globalVars:
-    {{- toYaml .globalVariables | nindent 2 }}
+    {{- toYaml .Values.globalVariables | nindent 2 }}
 
   # Test definitions
   externalTests:

charts/blockscout/Chart.yaml

@@ -8,7 +8,7 @@ icon: https://github.com/blockscout/blockscout/raw/master/apps/block_scout_web/a
 sources:
   - https://github.com/blockscout/blockscout/
 type: application
-version: 0.2.1
+version: 0.2.2
 maintainers:
   - name: skylenet
     email: rafael@skyle.net

charts/blockscout/README.md

@@ -1,7 +1,7 @@
 
 # blockscout
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 BlockScout provides a comprehensive, easy-to-use interface for users to view, confirm, and inspect transactions on EVM (Ethereum Virtual Machine) blockchains
 
@@ -60,9 +60,9 @@ BlockScout provides a comprehensive, easy-to-use interface for users to view, co
 | postgresql.image.registry | string | `"docker.io"` |  |
 | postgresql.image.repository | string | `"bitnami/postgresql"` |  |
 | postgresql.image.tag | string | `"15.3.0-debian-11-r7"` |  |
-| postgresql.persistence.enabled | bool | `true` |  |
-| postgresql.persistence.size | string | `"8Gi"` |  |
 | postgresql.primary.extendedConfiguration | string | `"max_connections = 1024\n"` |  |
+| postgresql.primary.persistence.enabled | bool | `true` |  |
+| postgresql.primary.persistence.size | string | `"8Gi"` |  |
 | postgresql.pullPolicy | string | `"IfNotPresent"` |  |
 | priorityClassName | string | `nil` | Pod priority class |
 | readinessProbe | object | See `values.yaml` | Readiness probe |

charts/blockscout/values.yaml

@@ -259,9 +259,9 @@ postgresql:
   primary:
     extendedConfiguration: |
       max_connections = 1024
-  persistence:
-    enabled: true
-    size: 8Gi
+    persistence:
+      enabled: true
+      size: 8Gi
 
 redis:
   enabled: false

charts/blutgang/Chart.yaml

@@ -8,6 +8,7 @@ sources:
   - https://github.com/rainshowerLabs/blutgang
 type: application
 version: 0.1.0
+version: 0.0.11
 maintainers:
   - name: barnabasbusa
     email: busa.barnabas@gmail.com

charts/blutgang/templates/deployment.yaml

@@ -110,7 +110,8 @@ spec:
             name: {{ include "blutgang.fullname" . }}
   {{- if not .Values.persistence.enabled }}
         - name: storage
-          emptyDir: {}
+          emptyDir:
+            medium: Memory
   {{- else if .Values.persistence.existingClaim }}
         - name: storage
           persistentVolumeClaim:

charts/blutgang/templates/poddisruptionbudget.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.podDisruptionBudget }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "blutgang.fullname" . }}
+  labels:
+    {{- include "blutgang.labels" . | nindent 4 }}
+spec:
+{{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+{{- end }}
+{{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+{{- end }}
+  selector:
+    matchLabels:
+      {{- include "blutgang.selectorLabels" . | nindent 6 }}
+{{- end }}

charts/dugtrio/Chart.yaml

@@ -6,7 +6,7 @@ home: https://github.com/ethpandaops/dugtrio
 sources:
   - https://github.com/ethpandaops/dugtrio
 type: application
-version: 0.0.5
+version: 0.0.6
 appVersion: "1.0.0"
 maintainers:
   - name: pk910

charts/dugtrio/README.md

@@ -1,7 +1,7 @@
 
 # dugtrio
 
-![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)
 
 Fault tolerant load balancer for beacon chain RPC apis
 
@@ -50,7 +50,7 @@ endpoints:
 | dugtrioProxyBlockedPaths | list | `[]` | blocked proxy paths (regular expressions, eg. "^/eth/v[0-9]+/debug/.*") |
 | dugtrioProxyCallRateBurst | int | `1000` | dugtrio call rate burst (burst number of calls per ip) |
 | dugtrioProxyCallRateLimit | int | `100` | dugtrio call rate limit (number of calls per second per ip) |
-| dugtrioProxyCallTimeout | string | `"55s"` | timeout for dugtrio proxy calls |
+| dugtrioProxyCallTimeout | string | `"10m"` | timeout for dugtrio proxy calls |
 | dugtrioProxyCount | int | `1` | number of HTTP proxies in front of dugtrio |
 | dugtrioProxySessionTimeout | string | `"10m"` | timeout for dugtrio sessions (used for rate limiting & endpoint stickiness) |
 | dugtrioProxyStickyEndpoint | bool | `true` | reuse the same endpoint for sessions as long as available |

charts/dugtrio/values.yaml

@@ -189,7 +189,7 @@ dugtrioPoolMaxHeadDistance: 2
 dugtrioProxyCount: 1
 
 # -- timeout for dugtrio proxy calls
-dugtrioProxyCallTimeout: 55s
+dugtrioProxyCallTimeout: 10m
 
 # -- timeout for dugtrio sessions (used for rate limiting & endpoint stickiness)
 dugtrioProxySessionTimeout: 10m

charts/ethereum-address-metrics-exporter/Chart.yaml

@@ -3,7 +3,7 @@ name: ethereum-address-metrics-exporter
 description: A prometheus exporter for Ethereum externally owned account and contract addresses
 home: https://github.com/ethpandaops/ethereum-address-metrics-exporter
 type: application
-version: 0.1.4
+version: 0.1.5
 maintainers:
   - name: savid
     email: andrew.davis@ethereum.org

charts/ethereum-address-metrics-exporter/README.md

@@ -1,7 +1,7 @@
 
 # ethereum-address-metrics-exporter
 
-![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A prometheus exporter for Ethereum externally owned account and contract addresses
 
@@ -55,7 +55,7 @@ A prometheus exporter for Ethereum externally owned account and contract address
 | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
 | serviceMonitor.annotations | object | `{}` | Additional ServiceMonitor annotations |
 | serviceMonitor.enabled | bool | `false` | If true, a ServiceMonitor CRD is created for a prometheus operator https://github.com/coreos/prometheus-operator |
-| serviceMonitor.interval | string | `"15s"` | ServiceMonitor scrape interval |
+| serviceMonitor.interval | string | `"1m"` | ServiceMonitor scrape interval |
 | serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels |
 | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor |
 | serviceMonitor.path | string | `"/metrics"` | Path to scrape |

charts/ethereum-address-metrics-exporter/values.yaml

@@ -180,7 +180,7 @@ serviceMonitor:
   # -- Additional ServiceMonitor annotations
   annotations: {}
   # -- ServiceMonitor scrape interval
-  interval: 15s
+  interval: 1m
   # -- ServiceMonitor scheme
   scheme: http
   # -- ServiceMonitor TLS configuration