Changes from astriaorg/astria@d5f7a19

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

Hide file tree

Showing 8 changed files with 32 additions and 12 deletions.
diff --git a/charts/composer/Chart.yaml b/charts/composer/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: 1.0.0-rc.1
+version: 1.0.0-rc.2
 
 # 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/composer/templates/_helpers.tpl b/charts/composer/templates/_helpers.tpl
@@ -16,14 +16,14 @@ composer
 Common labels
 */}}
 {{- define "composer.labels" -}}
-{{ include "rollup.selectorLabels" . }}
+{{ include "composer.selectorLabels" . }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
 {{- define "composer.selectorLabels" -}}
-app: {{ include "rollup.appName" . }}
+app: {{ include "composer.appName" . }}
 {{- end }}
 
 {{/*

diff --git a/charts/composer/templates/deployment.yaml b/charts/composer/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
           ports:
             {{- if .Values.metrics.enabled }}
             - containerPort: {{ .Values.ports.metrics }}
-              name: composer-metrics
+              name: composer-metric
             {{- end }}
             - containerPort: {{ .Values.ports.healthApi }}
               name: health-api

diff --git a/charts/composer/templates/prometheusrule.yaml b/charts/composer/templates/prometheusrule.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.alerting.enabled -}}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ template "composer.appName" . }}
+{{- if .Values.alerting.prometheusRule.namespace }}
+  namespace: {{ .Values.alerting.prometheusRule.namespace | quote }}
+{{- end }}
+  labels:
+    {{- include "composer.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 "composer.appName" . }}
+    rules: {{- toYaml .Values.alerting.prometheusRule.rules | nindent 4 }}
+{{- end }}
+{{- end }}
diff --git a/charts/composer/templates/service.yaml b/charts/composer/templates/service.yaml
@@ -23,7 +23,7 @@ spec:
   selector:
     app: composer
   ports:
-    - name: composer-metrics
+    - name: composer-metric
       port: {{ .Values.ports.metrics }}
-      targetPort: composer-metrics
+      targetPort: composer-metric
 {{- end }}
diff --git a/charts/composer/templates/servicemonitor.yaml b/charts/composer/templates/servicemonitor.yaml
@@ -16,7 +16,7 @@ spec:
     matchLabels:
       app: composer
   endpoints:
-    - port: composer-metrics
+    - port: composer-metric
       path: /
       {{- with .Values.serviceMonitor.interval }}
       interval: {{ . }}

diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock
@@ -7,7 +7,7 @@ dependencies:
   version: 0.28.1
 - name: composer
   repository: file://../composer
-  version: 1.0.0-rc.1
+  version: 1.0.0-rc.2
 - name: evm-faucet
   repository: file://../evm-faucet
   version: 0.1.2
@@ -20,5 +20,5 @@ dependencies:
 - name: blockscout-stack
   repository: https://blockscout.github.io/helm-charts
   version: 1.6.2
-digest: sha256:bbb5436bef71e57402482f74e2d2deabec5e4d957845bcb743b710ca49e2dc78
-generated: "2024-10-22T10:51:25.483623794-04:00"
+digest: sha256:cbef2e78861e88ca4396d44dc1d96a7b27c32c691896ed16097a1081d63c6d91
+generated: "2024-10-24T14:29:08.887894+03:00"
diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/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.7.2
+version: 0.7.3
 
 dependencies:
   - name: celestia-node
@@ -26,7 +26,7 @@ dependencies:
     version: 0.28.1
     repository: "file://../evm-rollup"
   - name: composer
-    version: 1.0.0-rc.1
+    version: 1.0.0-rc.2
     repository: "file://../composer"
     condition: composer.enabled
   - name: evm-faucet