From 473243a655a6cb27a33ba9db513a70fb6fee99d0 Mon Sep 17 00:00:00 2001 From: "Esteban J. G. Gabancho" Date: Tue, 3 Dec 2024 10:29:16 +0100 Subject: [PATCH] values: rename invenio.extraConfig * Renames invenio.extra_config to invenio.extraConfig to follow helm's naming conventions. Both variables are loaded for the moment to avoid issues. It also add a deprecation notice inside Notes.txt --- charts/invenio/templates/NOTES.txt | 12 +++++++++++- charts/invenio/templates/invenio-configmap.yaml | 5 ++++- charts/invenio/values.yaml | 6 ++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/charts/invenio/templates/NOTES.txt b/charts/invenio/templates/NOTES.txt index ff73dbb..8b5d149 100644 --- a/charts/invenio/templates/NOTES.txt +++ b/charts/invenio/templates/NOTES.txt @@ -1 +1,11 @@ -Invenio is ready to rock 🚀 \ No newline at end of file +Invenio is ready to rock 🚀 + +Your release is named {{ .Release.Name }}. + +{{- if .Values.invenio.extra_config}} + +DEPRECATION WARNING: + `invenio.extra_config` has been renamed to `invenio.extraConfig` and will be + removed in a future release. + +{{- end }} diff --git a/charts/invenio/templates/invenio-configmap.yaml b/charts/invenio/templates/invenio-configmap.yaml index 330572d..0882f85 100644 --- a/charts/invenio/templates/invenio-configmap.yaml +++ b/charts/invenio/templates/invenio-configmap.yaml @@ -20,5 +20,8 @@ data: INVENIO_DATACITE_ENABLED: "False" INVENIO_LOGGING_CONSOLE_LEVEL: "WARNING" {{- range $key, $value := .Values.invenio.extra_config }} - {{ $key }}: {{ tpl $value $ | toYaml | indent 5 | trim }} + {{ $key }}: {{ $value | toYaml | indent 4 | trim }} + {{- end }} + {{- range $key, $value := .Values.invenio.extraConfig }} + {{ $key }}: {{ tpl $value $ | toYaml | indent 4 | trim }} {{- end }} diff --git a/charts/invenio/values.yaml b/charts/invenio/values.yaml index b6e45bf..a5aaf75 100644 --- a/charts/invenio/values.yaml +++ b/charts/invenio/values.yaml @@ -37,9 +37,11 @@ invenio: - name: "" consumer_key: "" consumer_secret: "" - ## @param invenio.extra_config Extra environment variables (templated) to be added to all the pods. - ## + ## @param invenio.extra_config DEPRECATED: invenio.extraConfig instead extra_config: {} + ## @param invenio.extraConfig Extra environment variables (templated) to be added to all the pods. + ## + extraConfig: {} extra_env_from_secret: [] # - name: NAME_OF_MY_ENV_VAR # valueFrom: