From 096bdb7c42771c4d490b4c56fd15cf8c3e4320fb Mon Sep 17 00:00:00 2001 From: "github-merge-queue[bot]" Date: Mon, 6 May 2024 22:48:40 +0000 Subject: [PATCH] Update from https://github.com/astriaorg/astria/commit/0cbcfcda3b5f1bed0ce3d1eac5d2f780d4f4a329 --- charts/evm-rollup/Chart.yaml | 2 +- charts/evm-rollup/templates/service.yaml | 12 ++++++------ charts/evm-rollup/templates/servicemonitor.yaml | 6 +++--- charts/evm-rollup/templates/statefulsets.yaml | 6 +++--- charts/sequencer/Chart.yaml | 2 +- charts/sequencer/templates/service.yaml | 4 ++-- charts/sequencer/templates/servicemonitor.yaml | 2 +- charts/sequencer/templates/statefulsets.yaml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml index 9a97024..1e27671 100644 --- a/charts/evm-rollup/Chart.yaml +++ b/charts/evm-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.15.2 +version: 0.15.3 # 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/evm-rollup/templates/service.yaml b/charts/evm-rollup/templates/service.yaml index 8865115..2c76543 100644 --- a/charts/evm-rollup/templates/service.yaml +++ b/charts/evm-rollup/templates/service.yaml @@ -55,13 +55,13 @@ spec: selector: app: {{ .Values.config.rollup.name }}-astria-dev-cluster ports: - - name: geth-metrics + - name: geth-metr port: {{ .Values.ports.metrics }} - targetPort: geth-metrics - - name: composer-metrics + targetPort: geth-metr + - name: composer-metr port: {{ .Values.ports.composerMetrics }} - targetPort: composer-metrics - - name: conductor-metrics + targetPort: composer-metr + - name: conductor-metr port: {{ .Values.ports.conductorMetrics }} - targetPort: conductor-metrics + targetPort: conductor-metr {{- end }} diff --git a/charts/evm-rollup/templates/servicemonitor.yaml b/charts/evm-rollup/templates/servicemonitor.yaml index 9e8a00e..c0a6f7e 100644 --- a/charts/evm-rollup/templates/servicemonitor.yaml +++ b/charts/evm-rollup/templates/servicemonitor.yaml @@ -17,7 +17,7 @@ spec: matchLabels: app: {{ .Values.config.rollup.name }}-astria-dev-cluster endpoints: - - port: geth-metrics + - port: geth-metr path: /debug/metrics/prometheus {{- with .Values.config.rollup.serviceMonitor.interval }} interval: {{ . }} @@ -25,7 +25,7 @@ spec: {{- with .Values.config.rollup.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ . }} {{- end }} - - port: composer-metrics + - port: composer-metr path: / {{- with .Values.config.rollup.serviceMonitor.interval }} interval: {{ . }} @@ -33,7 +33,7 @@ spec: {{- with .Values.config.rollup.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ . }} {{- end }} - - port: conductor-metrics + - port: conductor-metr path: / {{- with .Values.config.rollup.serviceMonitor.interval }} interval: {{ . }} diff --git a/charts/evm-rollup/templates/statefulsets.yaml b/charts/evm-rollup/templates/statefulsets.yaml index 609354f..95e1916 100644 --- a/charts/evm-rollup/templates/statefulsets.yaml +++ b/charts/evm-rollup/templates/statefulsets.yaml @@ -81,7 +81,7 @@ spec: name: execution-grpc {{- if .Values.config.rollup.metrics.enabled }} - containerPort: {{ .Values.ports.metrics }} - name: geth-metrics + name: geth-metr {{- end }} resources: {{- toYaml .Values.resources.geth | trim | nindent 12 }} @@ -109,7 +109,7 @@ spec: {{- if .Values.config.rollup.metrics.enabled }} ports: - containerPort: {{ .Values.ports.composerMetrics }} - name: composer-metrics + name: composer-metr {{- end }} resources: {{- toYaml .Values.resources.composer | trim | nindent 12 }} @@ -126,7 +126,7 @@ spec: {{- if .Values.config.rollup.metrics.enabled }} ports: - containerPort: {{ .Values.ports.conductorMetrics }} - name: conductor-metrics + name: conductor-metr {{- end }} volumes: - name: {{ .Values.config.rollup.name }}-executor-scripts-volume diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index f8ff436..9ad52fb 100644 --- a/charts/sequencer/Chart.yaml +++ b/charts/sequencer/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.13.3 +version: 0.13.4 # 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/templates/service.yaml b/charts/sequencer/templates/service.yaml index c4e5e7f..1844285 100644 --- a/charts/sequencer/templates/service.yaml +++ b/charts/sequencer/templates/service.yaml @@ -61,8 +61,8 @@ spec: port: {{ .Values.ports.cometBFTMETRICS }} targetPort: cometbft-metric {{- if .Values.config.sequencer.metrics.enabled }} - - name: sequencer-metric + - name: seq-metric port: {{ .Values.ports.sequencerMetrics }} - targetPort: sequencer-metric + targetPort: seq-metric {{- end }} {{- end }} diff --git a/charts/sequencer/templates/servicemonitor.yaml b/charts/sequencer/templates/servicemonitor.yaml index 797c962..50426c7 100644 --- a/charts/sequencer/templates/servicemonitor.yaml +++ b/charts/sequencer/templates/servicemonitor.yaml @@ -45,7 +45,7 @@ spec: matchLabels: {{- include "sequencer.selectorLabels" . | nindent 6 }} endpoints: - - port: sequencer-metric + - port: seq-metric path: / {{- with .Values.serviceMonitor.interval }} interval: {{ . }} diff --git a/charts/sequencer/templates/statefulsets.yaml b/charts/sequencer/templates/statefulsets.yaml index ac14ec7..74f1b0f 100644 --- a/charts/sequencer/templates/statefulsets.yaml +++ b/charts/sequencer/templates/statefulsets.yaml @@ -50,7 +50,7 @@ spec: name: sequencer-grpc {{- if .Values.config.sequencer.metrics.enabled }} - containerPort: {{ .Values.ports.sequencerMetrics }} - name: sequencer-metric + name: seq-metric {{- end }} - name: cometbft imagePullPolicy: IfNotPresent