Changes from astriaorg/astria@6d50d1d

astriaorg · Oct 24, 2024 · b660a3d · b660a3d
1 parent 0f2d3da
commit b660a3d
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 17 deletions.
diff --git a/charts/deploy.just b/charts/deploy.just
@@ -145,7 +145,7 @@ delete-bridge-withdrawer:
   @just delete chart evm-bridge-withdrawer astria-dev-cluster
 
 wait-for-bridge-withdrawer:
-  kubectl wait -n astria-dev-cluster deployment evm-bridge-withdrawer --for=condition=Available=True --timeout=600s
+  kubectl wait -n astria-dev-cluster deployment evm-bridge-withdrawer-local --for=condition=Available=True --timeout=600s
 
 defaultHypAgentConfig         := ""
 defaultHypRelayerPrivateKey   := ""

diff --git a/charts/evm-bridge-withdrawer/templates/_helpers.tpl b/charts/evm-bridge-withdrawer/templates/_helpers.tpl
@@ -13,7 +13,7 @@ Namepsace to deploy elements into.
 application name to deploy elements into.
 */}}
 {{- define "evm-bridge-withdrawer.appName" -}}
-evm-bridge-withdrawer
+evm-bridge-withdrawer-{{ .Values.global.serviceName }}
 {{- end }}
 
 {{/*

diff --git a/charts/evm-bridge-withdrawer/templates/configmaps.yaml b/charts/evm-bridge-withdrawer/templates/configmaps.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: evm-bridge-withdrawer-env
+  name: {{ include "evm-bridge-withdrawer.appName" . }}-env
   namespace: {{ include "evm-bridge-withdrawer.namespace" . }}
 data:
   ASTRIA_BRIDGE_WITHDRAWER_LOG: "astria_bridge_withdrawer=debug"
@@ -40,7 +40,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: evm-bridge-withdrawer-private-key
+  name: {{ include "evm-bridge-withdrawer.appName" . }}-private-key
   namespace: {{ include "evm-bridge-withdrawer.namespace" . }}
 data:
   {{ .Values.config.sequencerPrivateKey.secret.filename }}: |

diff --git a/charts/evm-bridge-withdrawer/templates/deployment.yaml b/charts/evm-bridge-withdrawer/templates/deployment.yaml
@@ -1,21 +1,21 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: evm-bridge-withdrawer
+  name: {{ include "evm-bridge-withdrawer.appName" . }}
   labels:
-    app: evm-bridge-withdrawer
+    {{ include "evm-bridge-withdrawer.selectorLabels" . }}
   namespace: {{ include "evm-bridge-withdrawer.namespace" . }}
 spec:
   replicas: {{ .Values.global.replicaCount }}
   selector:
     matchLabels:
-      app: evm-bridge-withdrawer
+      {{ include "evm-bridge-withdrawer.selectorLabels" . }}
   template:
     metadata:
       annotations:
       name: astria-sequencer
       labels:
-        app: evm-bridge-withdrawer
+        {{ include "evm-bridge-withdrawer.selectorLabels" . }}
     spec:
       containers:
         - name: evm-bridge-withdrawer
@@ -26,7 +26,7 @@ spec:
           tty: {{ .Values.global.useTTY }}
           envFrom:
             - configMapRef:
-                name: evm-bridge-withdrawer-env
+                name: {{ include "evm-bridge-withdrawer.appName" . }}-env
           volumeMounts:
             - mountPath: /secret/sequencerPrivateKey/
               name: sequencer-private-key-volume
@@ -53,8 +53,8 @@ spec:
             driver: secrets-store.csi.k8s.io
             readOnly: true
             volumeAttributes:
-              secretProviderClass: evm-bridge-withdrawer-key
+              secretProviderClass: {{ include "evm-bridge-withdrawer.appName" . }}-key
           {{- else }}
           configMap:
-            name: evm-bridge-withdrawer-private-key
+            name: {{ include "evm-bridge-withdrawer.appName" . }}-private-key
           {{- end }}
diff --git a/charts/evm-bridge-withdrawer/templates/prometheusrule.yaml b/charts/evm-bridge-withdrawer/templates/prometheusrule.yaml
@@ -2,7 +2,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: evm-bridge-withdrawer-alerting
+  name: {{ include "evm-bridge-withdrawer.appName" . }}-alerting
 {{- if .Values.alerting.prometheusRule.namespace }}
   namespace: {{ .Values.alerting.prometheusRule.namespace | quote }}
 {{- end }}

diff --git a/charts/evm-bridge-withdrawer/templates/secretproviderclass.yaml b/charts/evm-bridge-withdrawer/templates/secretproviderclass.yaml
@@ -3,7 +3,7 @@
 apiVersion: secrets-store.csi.x-k8s.io/v1
 kind: SecretProviderClass
 metadata:
-  name: evm-bridge-withdrawer-key
+  name: {{ include "evm-bridge-withdrawer.appName" . }}-key
 spec:
   provider: gcp
   parameters:

diff --git a/charts/evm-bridge-withdrawer/templates/service.yaml b/charts/evm-bridge-withdrawer/templates/service.yaml
@@ -2,7 +2,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: evm-bridge-withdrawer-metrics
+  name: {{ include "evm-bridge-withdrawer.appName" . }}-metrics
   namespace: {{ include "evm-bridge-withdrawer.namespace" . }}
   labels:
     {{- include "evm-bridge-withdrawer.labels" . | nindent 4 }}

diff --git a/charts/evm-bridge-withdrawer/templates/servicemonitor.yaml b/charts/evm-bridge-withdrawer/templates/servicemonitor.yaml
@@ -2,20 +2,20 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: evm-bridge-withdrawer-metrics
+  name: {{ include "evm-bridge-withdrawer.appName" . }}-metrics
   labels:
     app: evm-bridge-withdrawer
     {{- with .Values.serviceMonitor.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  jobLabel: evm-bridge-withdrawer-metric
+  jobLabel: {{ include "evm-bridge-withdrawer.appName" . }}-metric
   namespaceSelector:
     matchNames:
       - {{ include "evm-bridge-withdrawer.namespace" . }}
   selector:
     matchLabels:
-      app: evm-bridge-withdrawer
+      {{ include "evm-bridge-withdrawer.selectorLabels" . }}
   endpoints:
     - port: metrics
       path: /

diff --git a/charts/evm-bridge-withdrawer/values.yaml b/charts/evm-bridge-withdrawer/values.yaml
@@ -3,6 +3,7 @@
 # Declare variables to be passed into your templates.
 global:
   namespaceOverride: ""
+  serviceName: "local"
   replicaCount: 1
   useTTY: true
   dev: false