From 95418a6abe21073d8ac82a8bc88777d6e402b9f7 Mon Sep 17 00:00:00 2001
From: Niels Alexander Buegel <niels.alexander.bugel@cern.ch>
Date: Sun, 23 Mar 2025 11:57:23 +0100
Subject: [PATCH] Fix for old image pipeline and easier helm install of
catalogue-updater
---
.../helm/catalogue-updater/templates/pod.yaml | 4 ++++
.../orchestration/helm/catalogue-updater/values.yaml | 7 +++++--
.../orchestration/tests/test_liquibase_update.sh | 1 +
continuousintegration/validation/ci_input_validate.py | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/continuousintegration/orchestration/helm/catalogue-updater/templates/pod.yaml b/continuousintegration/orchestration/helm/catalogue-updater/templates/pod.yaml
index 9d900d6023..ffb7008f2e 100755
--- a/continuousintegration/orchestration/helm/catalogue-updater/templates/pod.yaml
+++ b/continuousintegration/orchestration/helm/catalogue-updater/templates/pod.yaml
@@ -56,15 +56,19 @@ spec:
{{- include "common.extraEnv" . | nindent 4 }}
{{- end }}
volumeMounts:
+ {{- if .Values.customRepoFiles }}
- name: yum-repos
mountPath: /shared/etc_yum.repos.d
+ {{- end }}
- name: catalogue-config
mountPath: /shared/etc_cta/cta-catalogue.conf
subPath: cta-catalogue.conf
volumes:
+ {{- if .Values.customRepoFiles }}
- name: yum-repos
configMap:
name: yum.repos.d-config
+ {{- end }}
- name: catalogue-config
configMap:
name: cta-catalogue-conf
diff --git a/continuousintegration/orchestration/helm/catalogue-updater/values.yaml b/continuousintegration/orchestration/helm/catalogue-updater/values.yaml
index 503e935b2b..ed385b2868 100644
--- a/continuousintegration/orchestration/helm/catalogue-updater/values.yaml
+++ b/continuousintegration/orchestration/helm/catalogue-updater/values.yaml
@@ -1,6 +1,6 @@
image:
- repository: gitlab-registry.cern.ch/cta/eoscta-operations/registry/container_registry/cta-catalogue-updater
- tag: "alma9-base.1"
+ repository: gitlab-registry.cern.ch/cta/public_registry/container_registry/cta-catalogue-updater
+ tag: "stable"
pullPolicy: IfNotPresent
pullSecrets:
- ctaregsecret
@@ -12,3 +12,6 @@ catalogueDestinationVersion: ""
# Additional Extra environment variables
extraEnv:
+
+# Set to true if you want to mount the configmap "yum.repos.d-config"
+customRepoFiles: false
diff --git a/continuousintegration/orchestration/tests/test_liquibase_update.sh b/continuousintegration/orchestration/tests/test_liquibase_update.sh
index f5b800db00..6dec7cee7e 100755
--- a/continuousintegration/orchestration/tests/test_liquibase_update.sh
+++ b/continuousintegration/orchestration/tests/test_liquibase_update.sh
@@ -82,6 +82,7 @@ kubectl -n ${NAMESPACE} create configmap yum.repos.d-config --from-file=${yum_re
helm install catalogue-updater ../helm/catalogue-updater --namespace ${NAMESPACE} \
--set catalogueSourceVersion=$prev_catalogue_schema_version \
--set catalogueDestinationVersion=$catalogue_schema_version \
+ --set customRepoFiles=true \
--wait --timeout 2m
kubectl -n ${NAMESPACE} exec -it liquibase-update -- /bin/bash -c "/launch_liquibase.sh \"tag --tag=test_update\""
diff --git a/continuousintegration/validation/ci_input_validate.py b/continuousintegration/validation/ci_input_validate.py
index e6aa253f88..2b2d970a0a 100644
--- a/continuousintegration/validation/ci_input_validate.py
+++ b/continuousintegration/validation/ci_input_validate.py
@@ -48,7 +48,7 @@ DEFINED_INPUT_VARS = [
"CUSTOM_EOS_TAG", "CUSTOM_CTA_TAG", "CTA_BUILD_ID",
"CTA_PIPELINE_NAME", "GIT_STRATEGY", "GIT_SUBMODULE_STRATEGY",
"GIT_DEPTH", "GIT_SUBMODULE_DEPTH",
- "IMAGE_DOCKER_IMAGE_BUILDER", "IMAGE_CPPCHECK",
+ "IMAGE_DOCKER_IMAGE_BUILDER",
"IMAGE_GITLAB_RELEASE_CLI", "IMAGE_BUILD", "IMAGE_TEST",
"IMAGE_RELEASE", "IMAGE_ANALYSIS"
]
--
GitLab