From fca7a63c6f5a7b18d741d84ecb8624b56b78d3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Tue, 9 Jul 2024 12:39:51 +0200 Subject: [PATCH] Give the macro access to the context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- .../mirrormanager/templates/cmd-emergency-expire-repo.yml | 2 +- roles/openshift-apps/mirrormanager/templates/cron-crawler.yml | 2 +- roles/openshift-apps/mirrormanager/templates/cron-geoip.yml | 2 +- .../mirrormanager/templates/cron-mirrorlist-cache.yml | 2 +- .../mirrormanager/templates/cron-primary-mirror.yml | 2 +- .../openshift-apps/mirrormanager/templates/cron-propagation.yml | 2 +- .../openshift-apps/mirrormanager/templates/deploymentconfig.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/openshift-apps/mirrormanager/templates/cmd-emergency-expire-repo.yml b/roles/openshift-apps/mirrormanager/templates/cmd-emergency-expire-repo.yml index 12ed248cc2..de6ee02f1d 100644 --- a/roles/openshift-apps/mirrormanager/templates/cmd-emergency-expire-repo.yml +++ b/roles/openshift-apps/mirrormanager/templates/cmd-emergency-expire-repo.yml @@ -1,4 +1,4 @@ -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context %} +{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} # Manual command --- apiVersion: batch/v1 diff --git a/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml b/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml index ab01884b66..0b45027cf3 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-crawler.yml @@ -1,7 +1,7 @@ # ### Crawler cron jobs # -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context %} +{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} {% for cronjob in mirrormanager_cron_crawler %} --- # Category: {{ cronjob.category }} diff --git a/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml b/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml index 5625d7d387..bfb78a10cf 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-geoip.yml @@ -1,4 +1,4 @@ -{% from "_macros.yml" import security_context %} +{% from "_macros.yml" import security_context with context %} --- # Download GeoIP database apiVersion: batch/v1 diff --git a/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml b/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml index d752ddf7f8..f2fef16ee6 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-mirrorlist-cache.yml @@ -1,4 +1,4 @@ -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context %} +{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} --- apiVersion: batch/v1 kind: CronJob diff --git a/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml b/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml index d522c505dd..b6dbcdec4e 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-primary-mirror.yml @@ -1,7 +1,7 @@ # ### Primary mirror scanning cron jobs # -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context %} +{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} {% for cronjob in mirrormanager_cron_primary_mirror %} --- # Category: {{ cronjob.category }} diff --git a/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml b/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml index 6322e71114..3b0425f289 100644 --- a/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml +++ b/roles/openshift-apps/mirrormanager/templates/cron-propagation.yml @@ -1,7 +1,7 @@ # # Propagation checks # -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context %} +{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} --- apiVersion: batch/v1 kind: CronJob diff --git a/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml b/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml index 2457c21a36..e5a6c83bab 100644 --- a/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml +++ b/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml @@ -1,4 +1,4 @@ -{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context %} +{% from "_macros.yml" import common_volume_mounts, common_volumes, common_env, security_context with context %} --- apiVersion: apps.openshift.io/v1 kind: DeploymentConfig