diff --git a/charts/op-proxyd/Chart.yaml b/charts/op-proxyd/Chart.yaml index d1ffce58..51de2754 100644 --- a/charts/op-proxyd/Chart.yaml +++ b/charts/op-proxyd/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: op-proxyd description: Celo implementation for OP proxyd type: application -version: 0.1.0 -appVersion: "v4.5.4" +version: 0.1.1 +appVersion: "v0.0.1" home: https://clabs.co sources: - https://celo.org diff --git a/charts/op-proxyd/README.md b/charts/op-proxyd/README.md index 1939cd85..5ee3278f 100644 --- a/charts/op-proxyd/README.md +++ b/charts/op-proxyd/README.md @@ -1,6 +1,6 @@ # op-proxyd -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.5.4](https://img.shields.io/badge/AppVersion-v4.5.4-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square) Celo implementation for OP proxyd @@ -28,8 +28,8 @@ Celo implementation for OP proxyd | config | string | `""` | Config as string. Minimal example at https://github.com/ethereum-optimism/optimism/blob/develop/proxyd/example.config.toml | | fullnameOverride | string | `""` | Chart full name override | | image.pullPolicy | string | `"IfNotPresent"` | Image pullpolicy | -| image.repository | string | `"us-docker.pkg.dev/oplabs-tools-artifacts/images/proxyd"` | Image repository | -| image.tag | string | `"v4.5.4"` | Image tag Overrides the image tag whose default is the chart appVersion. | +| image.repository | string | `"us-west1-docker.pkg.dev/devopsre/dev-images/proxyd"` | Image repository | +| image.tag | string | `"test"` | Image tag Overrides the image tag whose default is the chart appVersion. | | imagePullSecrets | list | `[]` | Image pull secrets | | ingress.annotations | object | `{}` | | | ingress.className | string | `"nginx"` | | @@ -47,6 +47,7 @@ Celo implementation for OP proxyd | readinessProbe | object | `{"httpGet":{"path":"/healthz","port":"rpc"}}` | Readiness probe configuration | | replicaCount | int | `1` | Number of deployment replicas | | resources | object | `{}` | Container resources | +| secretEnv | object | `{}` | Env Vars. mounted from a secret | | securityContext | object | `{}` | Custom container security context | | service.rpcPort | int | `8080` | RPC port | | service.type | string | `"ClusterIP"` | K8S service type | diff --git a/charts/op-proxyd/templates/deployment.yaml b/charts/op-proxyd/templates/deployment.yaml index 41db623c..9e0a5800 100644 --- a/charts/op-proxyd/templates/deployment.yaml +++ b/charts/op-proxyd/templates/deployment.yaml @@ -33,6 +33,13 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - name: {{ .Chart.Name }} + command: + - /bin/bash + - -c + args: + - | + envsubst < /etc/proxyd/proxyd-tmp.toml > /etc/proxyd/proxyd.toml + /bin/entrypoint.sh /bin/proxyd /etc/proxyd/proxyd.toml securityContext: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" @@ -53,6 +60,18 @@ spec: containerPort: {{ .Values.metrics.port }} protocol: TCP {{- end }} + {{- if .Values.secretEnv }} + env: + {{- with .Values.secretEnv }} + {{- range $key, $value := . }} + - name: {{ $key }} + valueFrom: + secretKeyRef: + name: {{ $value.secretName }} + key: {{ $value.secretKey }} + {{- end }} + {{- end }} + {{- end }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: @@ -61,7 +80,7 @@ spec: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - name: config - mountPath: /etc/proxyd/proxyd.toml + mountPath: /etc/proxyd/proxyd-tmp.toml subPath: config volumes: - name: config diff --git a/charts/op-proxyd/values.yaml b/charts/op-proxyd/values.yaml index 2bab56a6..4d876472 100644 --- a/charts/op-proxyd/values.yaml +++ b/charts/op-proxyd/values.yaml @@ -12,16 +12,22 @@ replicaCount: 1 image: # -- Image repository - repository: us-docker.pkg.dev/oplabs-tools-artifacts/images/proxyd + repository: us-west1-docker.pkg.dev/devopsre/dev-images/proxyd # -- Image pullpolicy pullPolicy: IfNotPresent # -- Image tag # Overrides the image tag whose default is the chart appVersion. - tag: "v4.5.4" + tag: "test" # -- Image pull secrets imagePullSecrets: [] +# -- Env Vars. mounted from a secret +secretEnv: {} + # INFURA_URL: + # secretName: "test" + # secretKey: "test" + # -- Config as string. Minimal example at https://github.com/ethereum-optimism/optimism/blob/develop/proxyd/example.config.toml config: "" # |