diff --git a/charts/spectre/Chart.yaml b/charts/spectre/Chart.yaml index 556fd3d..2cb150f 100644 --- a/charts/spectre/Chart.yaml +++ b/charts/spectre/Chart.yaml @@ -22,7 +22,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.3.7 +version: 0.3.8 # 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/spectre/README.md b/charts/spectre/README.md index 5de5493..548f482 100644 --- a/charts/spectre/README.md +++ b/charts/spectre/README.md @@ -1,6 +1,6 @@ # spectre -![Version: 0.3.7](https://img.shields.io/badge/Version-0.3.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.68.3](https://img.shields.io/badge/AppVersion-0.68.3-informational?style=flat-square) +![Version: 0.3.8](https://img.shields.io/badge/Version-0.3.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.68.3](https://img.shields.io/badge/AppVersion-0.68.3-informational?style=flat-square) A Helm chart for deploying Chronicle Spectre Relay on Kubernetes @@ -25,6 +25,8 @@ A Helm chart for deploying Chronicle Spectre Relay on Kubernetes | chainType | string | `nil` | can be one of mainnet: `eth`, `arb`, `opt`, `gno`, `scr`, `zkevm`, `mantle`, or testnets: `gor`, `sep`, `ogor`, `mango`, `testnet-zkEVM-mango`, `mantle-testnet`, `scr-sepolia` | | configsUrl | string | `""` | config url for the app, if provided, will override the default config. can be an ipfs url or a http url | | entryPointOverride | list | `[]` | | +| env.normal | object | `{}` | | +| env.raw | list | `[]` | sensitive variables, passed through verbatim as core/v1 EnvVar entries, for values that must come from a Secret | | environment | string | `"stage"` | CFG_ENVIRONMENT can be one of `stage` or `prod` | | ethConfig | object | `{}` | | | extraObjects | list | `[]` | Extra K8s manifests to deploy | @@ -63,6 +65,8 @@ A Helm chart for deploying Chronicle Spectre Relay on Kubernetes | service.annotations | object | `{}` | | | service.ports.listen.port | int | `8080` | | | service.ports.listen.protocol | string | `"TCP"` | | +| service.ports.metrics.port | int | `9090` | | +| service.ports.metrics.protocol | string | `"TCP"` | | | service.type | string | `"ClusterIP"` | | | serviceAccount.annotations | object | `{}` | | | serviceAccount.create | bool | `true` | | @@ -71,6 +75,7 @@ A Helm chart for deploying Chronicle Spectre Relay on Kubernetes | serviceMonitor.enabled | bool | `false` | If true, a ServiceMonitor CRD is created for a prometheus operator https://github.com/coreos/prometheus-operator | | serviceMonitor.interval | string | `"60s"` | ServiceMonitor scrape interval | | serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels | +| serviceMonitor.metricRelabelings | list | `[]` | ServiceMonitor metricRelabelings | | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor | | serviceMonitor.path | string | `"/metrics"` | Path to scrape | | serviceMonitor.port | string | `"metrics"` | port to scrape | diff --git a/charts/spectre/templates/deployment.yaml b/charts/spectre/templates/deployment.yaml index 3f68bfc..8e9426d 100644 --- a/charts/spectre/templates/deployment.yaml +++ b/charts/spectre/templates/deployment.yaml @@ -104,6 +104,10 @@ spec: key: {{ .Values.ethConfig.ethPass.key }} {{- end }} {{- include "helpers.list-env-variables" . | indent 12 }} + ### -- ADDITIONAL ENV VARS FROM `.Values.env.raw` + {{- if .Values.env.raw }} + {{- toYaml .Values.env.raw | nindent 12 }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- if .Values.inlineConfig }} diff --git a/charts/spectre/values.yaml b/charts/spectre/values.yaml index 889b286..bdb57fb 100644 --- a/charts/spectre/values.yaml +++ b/charts/spectre/values.yaml @@ -50,6 +50,13 @@ inlineConfig: "" env: normal: {} + # -- sensitive variables, passed through verbatim as core/v1 EnvVar entries, for values that must come from a Secret + raw: [] + # - name: CFG_NATS_TOKEN + # valueFrom: + # secretKeyRef: + # name: my-secret + # key: CFG_NATS_TOKEN # CFG_MODELS: |- # "LIDO_LST/1DAY" # "ETH/BTC" diff --git a/charts/spire/Chart.yaml b/charts/spire/Chart.yaml index d64d65f..cabf466 100644 --- a/charts/spire/Chart.yaml +++ b/charts/spire/Chart.yaml @@ -21,7 +21,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.3.5 +version: 0.3.6 # 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/spire/README.md b/charts/spire/README.md index 9083291..9d3fcc2 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -1,6 +1,6 @@ # spire -![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.68.3](https://img.shields.io/badge/AppVersion-0.68.3-informational?style=flat-square) +![Version: 0.3.6](https://img.shields.io/badge/Version-0.3.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.68.3](https://img.shields.io/badge/AppVersion-0.68.3-informational?style=flat-square) A Helm chart for deploying Chronicle spire to Kubernetes @@ -27,6 +27,7 @@ A Helm chart for deploying Chronicle spire to Kubernetes | customArgs | list | `[]` | | | entryPointOverride | list | `[]` | | | env.normal | object | `{}` | | +| env.raw | list | `[]` | sensitive variables, passed through verbatim as core/v1 EnvVar entries, for values that must come from a Secret | | extraArgs | list | `[]` | | | extraObjects | list | `[]` | Extra K8s manifests to deploy | | fullnameOverride | string | `"spire"` | | @@ -82,4 +83,4 @@ A Helm chart for deploying Chronicle spire to Kubernetes | watch | bool | `false` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) \ No newline at end of file +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/spire/templates/deployment.yaml b/charts/spire/templates/deployment.yaml index 6d400df..9f67a91 100644 --- a/charts/spire/templates/deployment.yaml +++ b/charts/spire/templates/deployment.yaml @@ -94,6 +94,10 @@ spec: value: "{{ .Values.kafka.kafkaEnpoint }}" {{- end }} {{- include "helpers.list-env-variables" . | indent 12 }} + ### -- ADDITIONAL ENV VARS FROM `.Values.env.raw` + {{- if .Values.env.raw }} + {{- toYaml .Values.env.raw | nindent 12 }} + {{- end }} volumeMounts: {{- if .Values.configHcl }} - name: config diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml index b5b539f..06f7518 100644 --- a/charts/spire/values.yaml +++ b/charts/spire/values.yaml @@ -167,6 +167,13 @@ env: # non sensitive variables # refer to https://github.com/chronicleprotocol/oracle-suite/tree/main/cmd/spire#environment-variables normal: {} + # -- sensitive variables, passed through verbatim as core/v1 EnvVar entries, for values that must come from a Secret + raw: [] + # - name: CFG_NATS_TOKEN + # valueFrom: + # secretKeyRef: + # name: my-secret + # key: CFG_NATS_TOKEN # CFG_ITEM_SEPARATOR: "\n" # CFG_FEEDS: stage # CFG_LIBP2P_PK_SEED: "1234567981234567981234567981234567981234123456798123456798123456" # 64 bytes libp2p for bootstrap only