address ido's review

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" -}}

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

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 }}

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 }}

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: ""

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 \

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 }}

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"