From 35b35127e44418ea0c05387e615da59ea345db93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Mon, 30 Jan 2023 16:56:19 +0100 Subject: [PATCH] FMN: adjust the config file to the recent code changes, again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- roles/openshift-apps/fmn/templates/deploymentconfig.yml | 5 +++++ roles/openshift-apps/fmn/templates/fmn.cfg | 5 +++-- roles/openshift-apps/fmn/templates/secrets.yml | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml index 32fe0fe82f..635b1ba4aa 100644 --- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml +++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml @@ -241,6 +241,11 @@ spec: secretKeyRef: name: fmn key: redis-password + - name: CACHE__ARGUMENTS__HASH_KEY + valueFrom: + secretKeyRef: + name: fmn + key: cache-hash-key volumes: - name: etc-fmn configMap: diff --git a/roles/openshift-apps/fmn/templates/fmn.cfg b/roles/openshift-apps/fmn/templates/fmn.cfg index ddf3c6f8cc..423b4e3038 100644 --- a/roles/openshift-apps/fmn/templates/fmn.cfg +++ b/roles/openshift-apps/fmn/templates/fmn.cfg @@ -7,5 +7,6 @@ OIDC_CLIENT_ID="fmn" # OIDC_CLIENT_SECRET is set in the environement by the deploymentconfig SERVICES__FASJSON_URL=https://fasjson{{ env_suffix }}.fedoraproject.org SERVICES__DISTGIT_URL=https://src{{ env_suffix }}.fedoraproject.org -CACHE__BACKEND="dogpile.cache.redis" -CACHE__ARGUMENTS__HOST="redis.fmn.svc.cluster.local" +CACHE__URL="rediss://redis.fmn.svc.cluster.local/" +CACHE__ARGUMENTS__DB="1" +CACHE__ARGUMENTS__DIGESTMOD="sha1" diff --git a/roles/openshift-apps/fmn/templates/secrets.yml b/roles/openshift-apps/fmn/templates/secrets.yml index 09492116d5..39a64083ff 100644 --- a/roles/openshift-apps/fmn/templates/secrets.yml +++ b/roles/openshift-apps/fmn/templates/secrets.yml @@ -7,7 +7,9 @@ stringData: {% if env == 'staging' %} oidc-client-secret: {{ fmn_stg_oidc_client_secret }} redis-password: {{ fmn_stg_redis_password }} + cache-hash-key: {{ fmn_stg_cache_hash_key }} {% else %} oidc-client-secret: {{ fmn_prod_oidc_client_secret }} redis-password: {{ fmn_prod_redis_password }} + cache-hash-key: {{ fmn_prod_cache_hash_key }} {% endif %}