invenio: merge base config and extraConfig

[egabancho]

---

Without any extra variable or overwrite

invenio:
  hostname: foo
  secret_key: foo
  security_login_salt: foo
  csrf_secret_salt: foo
postgresql:
  auth:
    password: foo
rabbitmq:
  enabled: true
  auth:
    password: foo

$ helm template -f values.yaml  ./charts/invenio  -s templates/invenio-configmap.yaml
---
# Source: invenio/templates/invenio-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
  name: invenio-config
  labels:
    helm.sh/chart: invenio-0.3.0
    app.kubernetes.io/name: invenio
    app.kubernetes.io/instance: release-name
    app.kubernetes.io/version: "v12.0.0-beta.1.3"
    app.kubernetes.io/managed-by: Helm
data:
  INVENIO_ACCOUNTS_SESSION_REDIS_URL: redis://release-name-redis-master:6379/1
  INVENIO_APP_ALLOWED_HOSTS: '["foo"]'
  INVENIO_CACHE_REDIS_HOST: release-name-redis-master
  INVENIO_CACHE_REDIS_URL: redis://release-name-redis-master:6379/0
  INVENIO_CELERY_RESULT_BACKEND: redis://release-name-redis-master:6379/2
  INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL: redis://release-name-redis-master:6379/4
  INVENIO_DATACITE_ENABLED: "False"
  INVENIO_IIIF_CACHE_REDIS_URL: redis://release-name-redis-master:6379/0
  INVENIO_LOGGING_CONSOLE_LEVEL: WARNING
  INVENIO_RATELIMIT_STORAGE_URI: redis://release-name-redis-master:6379/3
  INVENIO_SEARCH_HOSTS: '[{''host'': ''release-name-opensearch''}]'
  INVENIO_SITE_API_URL: https://foo/api
  INVENIO_SITE_HOSTNAME: foo
  INVENIO_SITE_UI_URL: https://foo

With extraConfig and overwrite

invenio:
  hostname: foo
  secret_key: foo
  security_login_salt: foo
  csrf_secret_salt: foo
  extraConfig:
    INVENIO_APP_ALLOWED_HOSTS: '["definitely not foo "]'
postgresql:
  auth:
    password: foo
rabbitmq:
  enabled: true
  auth:
    password: foo

helm template -f values.yaml  ./charts/invenio  -s templates/invenio-configmap.yaml
---
# Source: invenio/templates/invenio-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
  name: invenio-config
  labels:
    helm.sh/chart: invenio-0.3.0
    app.kubernetes.io/name: invenio
    app.kubernetes.io/instance: release-name
    app.kubernetes.io/version: "v12.0.0-beta.1.3"
    app.kubernetes.io/managed-by: Helm
data:
  INVENIO_ACCOUNTS_SESSION_REDIS_URL: redis://release-name-redis-master:6379/1
  INVENIO_APP_ALLOWED_HOSTS: '["definitely not foo "]'
  INVENIO_CACHE_REDIS_HOST: release-name-redis-master
  INVENIO_CACHE_REDIS_URL: redis://release-name-redis-master:6379/0
  INVENIO_CELERY_RESULT_BACKEND: redis://release-name-redis-master:6379/2
  INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL: redis://release-name-redis-master:6379/4
  INVENIO_DATACITE_ENABLED: "False"
  INVENIO_IIIF_CACHE_REDIS_URL: redis://release-name-redis-master:6379/0
  INVENIO_LOGGING_CONSOLE_LEVEL: WARNING
  INVENIO_RATELIMIT_STORAGE_URI: redis://release-name-redis-master:6379/3
  INVENIO_SEARCH_HOSTS: '[{''host'': ''release-name-opensearch''}]'
  INVENIO_SITE_API_URL: https://foo/api
  INVENIO_SITE_HOSTNAME: foo
  INVENIO_SITE_UI_URL: https://foo

[lindhe]

Sounds like two different changes in the same PR here? Can we have them in separate PRs, please?

[egabancho]

Do you mean the checksum thingy?

[lindhe]

Yes

[egabancho]

Would it be ok for you if I put it on a different commit here? I won't have the time now to go over all the ConfigMaps/Secrets.