From ccecaa514c1bbd75b084a85046289bb71860b473 Mon Sep 17 00:00:00 2001 From: a-thomas-22 <112640918+a-thomas-22@users.noreply.github.com> Date: Sat, 27 Jan 2024 13:15:50 -0600 Subject: [PATCH 1/3] Allow override of validator image nitro --- charts/nitro/Chart.yaml | 2 +- charts/nitro/templates/validator/statefulset.yaml | 4 ++-- charts/nitro/values.yaml | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charts/nitro/Chart.yaml b/charts/nitro/Chart.yaml index 7f954fd..b37fc24 100644 --- a/charts/nitro/Chart.yaml +++ b/charts/nitro/Chart.yaml @@ -7,6 +7,6 @@ maintainers: type: application -version: 0.1.12 +version: 0.1.13 appVersion: "v2.2.2-8f33fea" diff --git a/charts/nitro/templates/validator/statefulset.yaml b/charts/nitro/templates/validator/statefulset.yaml index 1472b5a..444ac70 100644 --- a/charts/nitro/templates/validator/statefulset.yaml +++ b/charts/nitro/templates/validator/statefulset.yaml @@ -68,7 +68,7 @@ spec: {{- end }} containers: - name: validator - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.validator.image.repository | default .Values.image.repository }}:{{ .Values.validator.image.tag | default .Values.image.tag | default .Chart.AppVersion }}" command: ["/usr/local/bin/nitro-val"] args: - --conf.env-prefix=NITRO @@ -154,4 +154,4 @@ spec: {{- if .Values.validator.statefulset.extraVolumes}} {{- toYaml .Values.validator.statefulset.extraVolumes | nindent 6 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/nitro/values.yaml b/charts/nitro/values.yaml index b4979b9..903d9f7 100644 --- a/charts/nitro/values.yaml +++ b/charts/nitro/values.yaml @@ -179,6 +179,11 @@ configmap: ## @section Stateless Validator validator: + image: + ## @param validator.image.repository Docker image repository + repository: "" + ## @param validator.image.pullPolicy Docker image pull policy + tag: "" ## @param validator.enabled Enable the stateless validator enabled: false configmap: From 0dcd787fc65ea5280f7941d7f8d003fff40ad5ee Mon Sep 17 00:00:00 2001 From: a-thomas-22 <112640918+a-thomas-22@users.noreply.github.com> Date: Sat, 27 Jan 2024 13:17:30 -0600 Subject: [PATCH 2/3] tag metadata --- charts/nitro/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nitro/values.yaml b/charts/nitro/values.yaml index 903d9f7..0d3d993 100644 --- a/charts/nitro/values.yaml +++ b/charts/nitro/values.yaml @@ -182,7 +182,7 @@ validator: image: ## @param validator.image.repository Docker image repository repository: "" - ## @param validator.image.pullPolicy Docker image pull policy + ## @param validator.image.tag Docker image tag tag: "" ## @param validator.enabled Enable the stateless validator enabled: false From f74f68ee201956979aa0f749bcaf48688e0dd4a0 Mon Sep 17 00:00:00 2001 From: a-thomas-22 Date: Sat, 27 Jan 2024 19:17:45 +0000 Subject: [PATCH 3/3] Update README and values.schema.json for modified charts --- charts/nitro/README.md | 2 ++ charts/nitro/values.schema.json | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/charts/nitro/README.md b/charts/nitro/README.md index 66ac68c..6c6403f 100644 --- a/charts/nitro/README.md +++ b/charts/nitro/README.md @@ -72,6 +72,8 @@ | Name | Description | Value | | ---------------------------------------------------------- | -------------------------------------------------------- | -------------------- | +| `validator.image.repository` | Docker image repository | `""` | +| `validator.image.tag` | Docker image tag | `""` | | `validator.enabled` | Enable the stateless validator | `false` | | `validator.configmap.data.auth.addr` | Address to bind auth service to | `0.0.0.0` | | `validator.configmap.data.auth.port` | Port to bind auth service to | `8549` | diff --git a/charts/nitro/values.schema.json b/charts/nitro/values.schema.json index 7b00388..9d8c5f9 100644 --- a/charts/nitro/values.schema.json +++ b/charts/nitro/values.schema.json @@ -441,6 +441,21 @@ "validator": { "type": "object", "properties": { + "image": { + "type": "object", + "properties": { + "repository": { + "type": "string", + "description": "Docker image repository", + "default": "" + }, + "tag": { + "type": "string", + "description": "Docker image tag", + "default": "" + } + } + }, "enabled": { "type": "boolean", "description": "Enable the stateless validator",