From e81543e421e886f3a82217c4eceb0995d61ffaea Mon Sep 17 00:00:00 2001 From: itamar Date: Wed, 6 Nov 2024 14:59:41 -0500 Subject: [PATCH] address ido's review --- charts/auctioneer/templates/_helpers.tpl | 4 ++-- charts/auctioneer/templates/deployment.yaml | 8 ++++---- .../auctioneer/templates/prometheusrule.yaml | 20 +++++++++++++++++++ charts/auctioneer/templates/service.yaml | 8 ++++---- charts/auctioneer/values.yaml | 6 +++--- charts/deploy.just | 3 --- charts/evm-rollup/templates/service.yaml | 6 +++--- dev/values/auctioneer/values.yaml | 2 +- 8 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 charts/auctioneer/templates/prometheusrule.yaml diff --git a/charts/auctioneer/templates/_helpers.tpl b/charts/auctioneer/templates/_helpers.tpl index d6ee3ef67..a0e1bbffc 100644 --- a/charts/auctioneer/templates/_helpers.tpl +++ b/charts/auctioneer/templates/_helpers.tpl @@ -16,14 +16,14 @@ auctioneer Common labels */}} {{- define "auctioneer.labels" -}} -{{ include "rollup.selectorLabels" . }} +{{ include "auctioneer.selectorLabels" . }} {{- end }} {{/* Selector labels */}} {{- define "auctioneer.selectorLabels" -}} -app: {{ include "rollup.appName" . }} +app: {{ include "auctioneer.appName" . }} {{- end }} {{- define "auctioneer.image" -}} diff --git a/charts/auctioneer/templates/deployment.yaml b/charts/auctioneer/templates/deployment.yaml index c099af898..782492554 100644 --- a/charts/auctioneer/templates/deployment.yaml +++ b/charts/auctioneer/templates/deployment.yaml @@ -1,19 +1,19 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: auctioneer + name: {{ include "auctioneer.appName " . }} namespace: {{ include "auctioneer.namespace" . }} labels: - app: auctioneer + {{ include "auctioneer.labels" . }} spec: replicas: {{ .Values.global.replicaCount }} selector: matchLabels: - app: auctioneer + {{ include "auctioneer.labels" . }} template: metadata: labels: - app: auctioneer + {{ include "auctioneer.labels" . }} spec: containers: - name: auctioneer diff --git a/charts/auctioneer/templates/prometheusrule.yaml b/charts/auctioneer/templates/prometheusrule.yaml new file mode 100644 index 000000000..5c662b2a3 --- /dev/null +++ b/charts/auctioneer/templates/prometheusrule.yaml @@ -0,0 +1,20 @@ +{{- if .Values.alerting.enabled -}} +apiVersion: monitoring.coreos.com/v1 +kind: PrometheusRule +metadata: + name: {{ include "auctioneer.appName" . }}-alerting +{{- if .Values.alerting.prometheusRule.namespace }} + namespace: {{ .Values.alerting.prometheusRule.namespace | quote }} +{{- end }} + labels: + {{- include "auctioneer.labels" . | nindent 4 }} + {{- if .Values.alerting.prometheusRule.additionalLabels }} + {{- toYaml .Values.alerting.prometheusRule.additionalLabels | nindent 4 }} + {{- end }} +spec: +{{- if .Values.alerting.prometheusRule.rules }} + groups: + - name: {{ template "auctioneer.appName" . }} + rules: {{- toYaml .Values.alerting.prometheusRule.rules | nindent 4 }} +{{- end }} +{{- end }} diff --git a/charts/auctioneer/templates/service.yaml b/charts/auctioneer/templates/service.yaml index a5cddeb89..8646ee410 100644 --- a/charts/auctioneer/templates/service.yaml +++ b/charts/auctioneer/templates/service.yaml @@ -2,15 +2,15 @@ kind: Service apiVersion: v1 metadata: - name: auctioneer-metrics + name: {{ include "auctioneer.appName" . }}-metrics namespace: {{ include "auctioneer.namespace" . }} labels: - app: auctioneer + {{ include "auctioneer.labels" . }} spec: selector: - app: auctioneer + {{ include "auctioneer.selectorLabels" . }} ports: - - name: auctioneer-metrics + - name: metrics port: {{ .Values.ports.metrics }} targetPort: auctioneer-metrics {{- end }} diff --git a/charts/auctioneer/values.yaml b/charts/auctioneer/values.yaml index c57520fd7..ad03c7c2f 100644 --- a/charts/auctioneer/values.yaml +++ b/charts/auctioneer/values.yaml @@ -3,14 +3,14 @@ global: replicaCount: 1 # Whether to use tty readable logging for astria services, when false use json. useTTY: false - dev: true + dev: false images: auctioneer: repo: ghcr.io/astriaorg/astria-auctioneer pullPolicy: IfNotPresent - tag: 1.0.0-rc.1 - devTag: local + tag: 0.0.1 + devTag: 0.0.1 config: sequencerGrpcEndpoint: "" diff --git a/charts/deploy.just b/charts/deploy.just index 1325dfb95..e93768fff 100644 --- a/charts/deploy.just +++ b/charts/deploy.just @@ -145,9 +145,6 @@ deploy-auctioneer: delete-auctioneer: @just delete chart auctioneer astria-dev-cluster -wait-for-auctioneer: - kubectl wait -n astria-dev-cluster deployment auctioneer --for=condition=Available=True --timeout=600s - deploy-bridge-withdrawer: helm install evm-bridge-withdrawer-chart ./charts/evm-bridge-withdrawer \ --namespace astria-dev-cluster \ diff --git a/charts/evm-rollup/templates/service.yaml b/charts/evm-rollup/templates/service.yaml index 0d5aaeec0..f4b65d70f 100644 --- a/charts/evm-rollup/templates/service.yaml +++ b/charts/evm-rollup/templates/service.yaml @@ -13,9 +13,9 @@ spec: - name: ws-rpc-svc port: {{ .Values.ports.wsRPC }} targetPort: ws-rpc - # TODO: fix this to match bharath's work in the geth repo - - name: bundle-grpc-svc - port: {{ .Values.ports.bundleGRPC }} + - name: execution-grpc-svc + # TODO: this service should be served over UDS + port: {{ .Values.ports.executionGRPC }} targetPort: bundle-grpc --- {{- if .Values.metrics.enabled }} diff --git a/dev/values/auctioneer/values.yaml b/dev/values/auctioneer/values.yaml index 6ab8ca8cc..b3f98c1ae 100644 --- a/dev/values/auctioneer/values.yaml +++ b/dev/values/auctioneer/values.yaml @@ -14,7 +14,7 @@ config: feeAssetDenomination: "nria" sequencerAddressPrefix: astria rollupGrpcEndpoint: "http://astria-evm-service.astria-dev-cluster.svc.cluster.local:50051" - rollupId: "astriachain" + rollupId: "astria" latencyMarginMs: 1000 logLevel: "debug"