From 235bb6b17e17ea0f7051fbd745875897cb3b4a41 Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Tue, 17 Sep 2024 17:52:37 +0200 Subject: [PATCH 1/7] feat: enable service monitor by default --- k8s/commit-boost/values.yaml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/k8s/commit-boost/values.yaml b/k8s/commit-boost/values.yaml index 90a254b9..6cbeebea 100644 --- a/k8s/commit-boost/values.yaml +++ b/k8s/commit-boost/values.yaml @@ -102,19 +102,9 @@ 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 commitBoost: pbs: From 5c15e532766756c6ab35e7270021c3f5d78147ab Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Tue, 17 Sep 2024 17:53:17 +0200 Subject: [PATCH 2/7] feat: bump commit-boost version to v0.2.0 --- k8s/commit-boost/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/commit-boost/values.yaml b/k8s/commit-boost/values.yaml index 6cbeebea..081e65d4 100644 --- a/k8s/commit-boost/values.yaml +++ b/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: "" From 454a340acd71d3611b0fb9d6f0e14063c79d1bd8 Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Tue, 17 Sep 2024 17:53:58 +0200 Subject: [PATCH 3/7] nit: remove legacy notes --- k8s/commit-boost/notes.org | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 k8s/commit-boost/notes.org diff --git a/k8s/commit-boost/notes.org b/k8s/commit-boost/notes.org deleted file mode 100644 index f4d22226..00000000 --- a/k8s/commit-boost/notes.org +++ /dev/null @@ -1,3 +0,0 @@ -* commit-boost config requires prometheus stuff -* rolling duration for logs needs to be set to never -* metrics server? From 89e0ef343ff178f7c85ab3045a1fdee936cee65c Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Tue, 17 Sep 2024 19:31:35 +0200 Subject: [PATCH 4/7] feat: handle new env config for metrics port in v0.2.0 --- k8s/commit-boost/templates/deployment.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/k8s/commit-boost/templates/deployment.yaml b/k8s/commit-boost/templates/deployment.yaml index eb2b1e5b..ac256a78 100644 --- a/k8s/commit-boost/templates/deployment.yaml +++ b/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 From e2ca348cf279fb11ffc64b0418288b483955e20e Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Tue, 17 Sep 2024 19:44:59 +0200 Subject: [PATCH 5/7] feat: bump chart version --- k8s/commit-boost/Chart.yaml | 4 ++-- k8s/commit-boost/README.md | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/k8s/commit-boost/Chart.yaml b/k8s/commit-boost/Chart.yaml index 96d026cc..dbfd212e 100644 --- a/k8s/commit-boost/Chart.yaml +++ b/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.3 +appVersion: "v0.2.0" maintainers: - name: mxs email: mxs@kiln.fi diff --git a/k8s/commit-boost/README.md b/k8s/commit-boost/README.md index 9c382c16..c8659425 100644 --- a/k8s/commit-boost/README.md +++ b/k8s/commit-boost/README.md @@ -1,6 +1,6 @@ # 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.3](https://img.shields.io/badge/Version-0.0.3-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 @@ -8,7 +8,7 @@ A Helm chart for Kubernetes | Name | Email | Url | | ---- | ------ | --- | -| mxs | | | +| mxs | mxs@kiln.fi | | ## Values @@ -24,7 +24,7 @@ A Helm chart for Kubernetes | 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,12 @@ A Helm chart for Kubernetes | serviceAccount.automount | bool | `true` | | | serviceAccount.create | bool | `true` | | | serviceAccount.name | string | `""` | | +| serviceMonitor.enabled | 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) From 3882fc3575c469adf3a102f46503d567ef3cf28f Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Tue, 17 Sep 2024 19:53:31 +0200 Subject: [PATCH 6/7] feat: remove legacy prometheus config file --- k8s/commit-boost/README.md | 2 +- k8s/commit-boost/templates/configmap.yaml | 2 -- k8s/commit-boost/templates/deployment.yaml | 2 -- k8s/commit-boost/values.yaml | 3 --- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/k8s/commit-boost/README.md b/k8s/commit-boost/README.md index c8659425..acd0543f 100644 --- a/k8s/commit-boost/README.md +++ b/k8s/commit-boost/README.md @@ -19,7 +19,7 @@ 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"` | | diff --git a/k8s/commit-boost/templates/configmap.yaml b/k8s/commit-boost/templates/configmap.yaml index 42b1b1fe..6b5edb90 100644 --- a/k8s/commit-boost/templates/configmap.yaml +++ b/k8s/commit-boost/templates/configmap.yaml @@ -9,5 +9,3 @@ data: config.pbs.toml: |- {{ .Values.commitBoost.pbs.config | nindent 4 }} {{- end }} - - prometheus.yaml: "" diff --git a/k8s/commit-boost/templates/deployment.yaml b/k8s/commit-boost/templates/deployment.yaml index ac256a78..ed3eab9d 100644 --- a/k8s/commit-boost/templates/deployment.yaml +++ b/k8s/commit-boost/templates/deployment.yaml @@ -74,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 diff --git a/k8s/commit-boost/values.yaml b/k8s/commit-boost/values.yaml index 081e65d4..663d6bb4 100644 --- a/k8s/commit-boost/values.yaml +++ b/k8s/commit-boost/values.yaml @@ -117,6 +117,3 @@ commitBoost: [[relays]] url = "https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net" - - [metrics] - prometheus_config = "/config/prometheus.yaml" From 80f4e1eb5ca7f3cf4dcfaca1562ca9328a6c4cec Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Tue, 17 Sep 2024 21:38:35 +0200 Subject: [PATCH 7/7] fix: prevent the endpoint label to be overriden by the default prom monitor --- k8s/commit-boost/Chart.yaml | 2 +- k8s/commit-boost/README.md | 3 ++- k8s/commit-boost/values.yaml | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/k8s/commit-boost/Chart.yaml b/k8s/commit-boost/Chart.yaml index dbfd212e..d983f273 100644 --- a/k8s/commit-boost/Chart.yaml +++ b/k8s/commit-boost/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: commit-boost description: A Helm chart for Kubernetes type: application -version: 0.0.3 +version: 0.0.4 appVersion: "v0.2.0" maintainers: - name: mxs diff --git a/k8s/commit-boost/README.md b/k8s/commit-boost/README.md index acd0543f..b25ef318 100644 --- a/k8s/commit-boost/README.md +++ b/k8s/commit-boost/README.md @@ -1,6 +1,6 @@ # commit-boost -![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-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) +![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 @@ -49,6 +49,7 @@ A Helm chart for Kubernetes | 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 | `[]` | | diff --git a/k8s/commit-boost/values.yaml b/k8s/commit-boost/values.yaml index 663d6bb4..1fffd242 100644 --- a/k8s/commit-boost/values.yaml +++ b/k8s/commit-boost/values.yaml @@ -105,6 +105,8 @@ serviceMonitor: enabled: true scrapeInterval: 30s path: /metrics + honorLabels: true + commitBoost: pbs: