Improvements & update of Helm chart to follow recent developments

k8s/commit-boost/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: commit-boost
 description: A Helm chart for Kubernetes
 type: application
-version: 0.0.2
-appVersion: "v0.1.0"
+version: 0.0.4
+appVersion: "v0.2.0"
 maintainers:
   - name: mxs
     email: mxs@kiln.fi

k8s/commit-boost/README.md

@@ -1,14 +1,14 @@
 # commit-boost
 
-![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
+![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.2.0](https://img.shields.io/badge/AppVersion-v0.2.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
 ## Maintainers
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| mxs | <mxs@kiln.fi> |  |
+| mxs | mxs@kiln.fi |  |
 
 ## Values
 
@@ -19,12 +19,12 @@ A Helm chart for Kubernetes
 | autoscaling.maxReplicas | int | `100` |  |
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
-| commitBoost.pbs.config | string | `"chain = \"Holesky\"\n\n[pbs]\nport = 18550\n\n[[relays]]\nurl = \"https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net\"\n\n[metrics]\nprometheus_config = \"/config/prometheus.yaml\""` |  |
+| commitBoost.pbs.config | string | `"chain = \"Holesky\"\n\n[pbs]\nport = 18550\n\n[[relays]]\nurl = \"https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net\""` |  |
 | commitBoost.pbs.enable | bool | `true` |  |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"ghcr.io/commit-boost/pbs"` |  |
-| image.tag | string | `"v0.1.0"` |  |
+| image.tag | string | `"v0.2.0"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{}` |  |
 | ingress.className | string | `""` |  |
@@ -48,9 +48,13 @@ A Helm chart for Kubernetes
 | serviceAccount.automount | bool | `true` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
+| serviceMonitor.enabled | bool | `true` |  |
+| serviceMonitor.honorLabels | bool | `true` |  |
+| serviceMonitor.path | string | `"/metrics"` |  |
+| serviceMonitor.scrapeInterval | string | `"30s"` |  |
 | tolerations | list | `[]` |  |
 | volumeMounts | list | `[]` |  |
 | volumes | list | `[]` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
+Autogenerated from chart metadata using [helm-docs v1.7.0](https://github.com/norwoodj/helm-docs/releases/v1.7.0)

k8s/commit-boost/templates/configmap.yaml

@@ -9,5 +9,3 @@ data:
   config.pbs.toml: |-
     {{ .Values.commitBoost.pbs.config | nindent 4 }}
   {{- end }}
-
-  prometheus.yaml: ""

k8s/commit-boost/templates/deployment.yaml

@@ -57,9 +57,7 @@ spec:
           env:
             - name: CB_CONFIG
               value: /config/config.pbs.toml
-            - name: ROLLING_DURATION
-              value: never
-            - name: METRICS_SERVER
+            - name: CB_METRICS_PORT
               value: '{{ .Values.service.metrics_port }}'
             - name: RUST_LOG
               value: info
@@ -76,8 +74,6 @@ spec:
           defaultMode: 0755
           name: {{ include "commit-boost.fullname" . }}
           items:
-            - key: prometheus.yaml
-              path: prometheus.yaml
             {{- if .Values.commitBoost.pbs.enable }}
             - key: config.pbs.toml
               path: config.pbs.toml

k8s/commit-boost/values.yaml

@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/commit-boost/pbs
   pullPolicy: IfNotPresent
-  tag: "v0.1.0"
+  tag: "v0.2.0"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -102,19 +102,11 @@ tolerations: []
 affinity: {}
 
 serviceMonitor:
-  enabled: false
-  additionalLabels: {}
-  namespace: ""
-  namespaceSelector: {}
-  # Default: scrape .Release.Namespace only
-  # To scrape all, use the following:
-  # namespaceSelector:
-  #   any: true
+  enabled: true
   scrapeInterval: 30s
-  # honorLabels: true
-  targetLabels: []
-  metricRelabelings: []
-  # path: /metrics
+  path: /metrics
+  honorLabels: true
+
 
 commitBoost:
   pbs:
@@ -127,6 +119,3 @@ commitBoost:
 
       [[relays]]
       url = "https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net"
-
-      [metrics]
-      prometheus_config = "/config/prometheus.yaml"