Skip to content

Commit f6bd1a8

Browse files
zdrapelazdrapela
committed
fix K8s pod log collection dir
fix save_artifact subdir
1 parent 6ae56a9 commit f6bd1a8

File tree

10 files changed

+22
-21
lines changed

10 files changed

+22
-21
lines changed

‎.ci/pipelines/cluster/aks/aks-helm-deployment.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ initiate_aks_helm_deployment() {
2626
local rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
2727
apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
2828
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
29-
common::save_artifact "${NAME_SPACE}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
29+
common::save_artifact "${PW_PROJECT_SHOWCASE_K8S}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
3030

3131
namespace::setup_image_pull_secret "${NAME_SPACE}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
3232

@@ -54,7 +54,7 @@ initiate_rbac_aks_helm_deployment() {
5454
local rbac_rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
5555
apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
5656
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
57-
common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
57+
common::save_artifact "${PW_PROJECT_SHOWCASE_RBAC_K8S}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
5858

5959
namespace::setup_image_pull_secret "${NAME_SPACE_RBAC}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
6060

‎.ci/pipelines/cluster/aks/aks-operator-deployment.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ initiate_aks_operator_deployment() {
2828
log::info "Creating and applying ConfigMap for dynamic plugins"
2929
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
3030
config::create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
31-
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins.yaml"
31+
common::save_artifact "${PW_PROJECT_SHOWCASE_K8S}" "/tmp/configmap-dynamic-plugins.yaml"
3232
kubectl apply -f /tmp/configmap-dynamic-plugins.yaml -n "${namespace}"
3333

3434
namespace::setup_image_pull_secret "${namespace}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
@@ -55,7 +55,7 @@ initiate_rbac_aks_operator_deployment() {
5555
log::info "Creating and applying ConfigMap for dynamic plugins"
5656
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
5757
config::create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
58-
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
58+
common::save_artifact "${PW_PROJECT_SHOWCASE_RBAC_K8S}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
5959
kubectl apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${namespace}"
6060

6161
namespace::setup_image_pull_secret "${namespace}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"

‎.ci/pipelines/cluster/eks/eks-helm-deployment.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ initiate_eks_helm_deployment() {
2828
apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
2929
envsubst < "${DIR}/value_files/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}" > "/tmp/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}"
3030
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
31-
common::save_artifact "${NAME_SPACE}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" # Save the final value-file into the artifacts directory.
31+
common::save_artifact "${PW_PROJECT_SHOWCASE_K8S}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" # Save the final value-file into the artifacts directory.
3232
log::info "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE}"
3333
if ! helm upgrade -i "${RELEASE_NAME}" -n "${NAME_SPACE}" \
3434
"${HELM_CHART_URL}" --version "${CHART_VERSION}" \
@@ -59,7 +59,7 @@ initiate_rbac_eks_helm_deployment() {
5959
apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
6060
envsubst < "${DIR}/value_files/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}" > "/tmp/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}"
6161
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
62-
common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}" # Save the final value-file into the artifacts directory.
62+
common::save_artifact "${PW_PROJECT_SHOWCASE_RBAC_K8S}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}" # Save the final value-file into the artifacts directory.
6363
log::info "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE_RBAC}"
6464
if ! helm upgrade -i "${RELEASE_NAME_RBAC}" -n "${NAME_SPACE_RBAC}" \
6565
"${HELM_CHART_URL}" --version "${CHART_VERSION}" \

‎.ci/pipelines/cluster/eks/eks-operator-deployment.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ initiate_eks_operator_deployment() {
2626
log::info "Creating and applying ConfigMap for dynamic plugins"
2727
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
2828
config::create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
29-
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins.yaml"
29+
common::save_artifact "${PW_PROJECT_SHOWCASE_K8S}" "/tmp/configmap-dynamic-plugins.yaml"
3030
kubectl apply -f /tmp/configmap-dynamic-plugins.yaml -n "${namespace}"
3131

3232
namespace::setup_image_pull_secret "${namespace}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
@@ -52,7 +52,7 @@ initiate_rbac_eks_operator_deployment() {
5252
log::info "Creating and applying ConfigMap for dynamic plugins"
5353
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
5454
config::create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
55-
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
55+
common::save_artifact "${PW_PROJECT_SHOWCASE_RBAC_K8S}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
5656
kubectl apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${namespace}"
5757

5858
namespace::setup_image_pull_secret "${namespace}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"

‎.ci/pipelines/cluster/gke/gke-helm-deployment.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ initiate_gke_helm_deployment() {
2828
apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
2929
apply_gke_frontend_config "${NAME_SPACE}"
3030
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
31-
common::save_artifact "${NAME_SPACE}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
31+
common::save_artifact "${PW_PROJECT_SHOWCASE_K8S}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
3232

3333
namespace::setup_image_pull_secret "${NAME_SPACE}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
3434

@@ -58,7 +58,7 @@ initiate_rbac_gke_helm_deployment() {
5858
apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
5959
apply_gke_frontend_config "${NAME_SPACE_RBAC}"
6060
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
61-
common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
61+
common::save_artifact "${PW_PROJECT_SHOWCASE_RBAC_K8S}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
6262

6363
namespace::setup_image_pull_secret "${NAME_SPACE_RBAC}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
6464

‎.ci/pipelines/cluster/gke/gke-operator-deployment.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ initiate_gke_operator_deployment() {
3131
log::info "Creating and applying ConfigMap for dynamic plugins"
3232
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
3333
config::create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
34-
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins.yaml"
34+
common::save_artifact "${PW_PROJECT_SHOWCASE_K8S}" "/tmp/configmap-dynamic-plugins.yaml"
3535
kubectl apply -f /tmp/configmap-dynamic-plugins.yaml -n "${namespace}"
3636

3737
namespace::setup_image_pull_secret "${namespace}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
@@ -58,7 +58,7 @@ initiate_rbac_gke_operator_deployment() {
5858
log::info "Creating and applying ConfigMap for dynamic plugins"
5959
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
6060
config::create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
61-
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
61+
common::save_artifact "${PW_PROJECT_SHOWCASE_RBAC_K8S}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
6262
kubectl apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${namespace}"
6363

6464
namespace::setup_image_pull_secret "${namespace}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"

‎.ci/pipelines/jobs/ocp-operator.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ initiate_operator_deployments_osd_gcp() {
5757
# Merge base values with OSD-GCP diff file before creating dynamic plugins config
5858
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase_OSD-GCP.yaml"
5959
config::create_dynamic_plugins_config "/tmp/merged-values_showcase_OSD-GCP.yaml" "/tmp/configmap-dynamic-plugins.yaml"
60-
common::save_artifact "${NAME_SPACE}" "/tmp/configmap-dynamic-plugins.yaml"
60+
common::save_artifact "${PW_PROJECT_SHOWCASE_OPERATOR}" "/tmp/configmap-dynamic-plugins.yaml"
6161

6262
oc apply -f /tmp/configmap-dynamic-plugins.yaml -n "${NAME_SPACE}"
6363
deploy_redis_cache "${NAME_SPACE}"
@@ -75,7 +75,7 @@ initiate_operator_deployments_osd_gcp() {
7575
# Merge RBAC values with OSD-GCP diff file before creating dynamic plugins config
7676
helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml"
7777
config::create_dynamic_plugins_config "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml" "/tmp/configmap-dynamic-plugins-rbac.yaml"
78-
common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
78+
common::save_artifact "${PW_PROJECT_SHOWCASE_OPERATOR_RBAC}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
7979

8080
oc apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${NAME_SPACE_RBAC}"
8181
deploy_rhdh_operator "${NAME_SPACE_RBAC}" "${DIR}/resources/rhdh-operator/rhdh-start-rbac.yaml"

‎.ci/pipelines/lib/common.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,17 +171,17 @@ common::retry() {
171171
}
172172

173173
# Save a file to the artifacts directory
174-
# Args: namespace, file_path
174+
# Args: artifacts_subdir, file_path
175175
common::save_artifact() {
176-
local namespace=$1
176+
local artifacts_subdir=$1
177177
local file=$2
178178

179179
if [[ -z "$ARTIFACT_DIR" ]]; then
180180
log::warn "ARTIFACT_DIR not set, skipping artifact save"
181181
return 0
182182
fi
183183

184-
mkdir -p "${ARTIFACT_DIR}/${namespace}"
184+
mkdir -p "${ARTIFACT_DIR}/${artifacts_subdir}"
185185
rsync -a "$file" "${ARTIFACT_DIR}/${namespace}/"
186186
}
187187

‎.ci/pipelines/lib/testing.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ testing::check_and_test() {
245245
if testing::run_tests "${release_name}" "${namespace}" "${playwright_project}" "${url}" "${artifacts_subdir}"; then
246246
log::info "Tests passed — skipping pod log collection for namespace: ${namespace}"
247247
else
248-
save_all_pod_logs "$namespace"
248+
save_all_pod_logs "$namespace" "$artifacts_subdir"
249249
fi
250250
fi
251251
else
252252
echo "Backstage is not running. Marking deployment as failed and continuing..."
253253
test_run_tracker::mark_deploy_failed "$artifacts_subdir"
254-
save_all_pod_logs "$namespace"
254+
save_all_pod_logs "$namespace" "$artifacts_subdir"
255255
fi
256256
return 0
257257
}

‎.ci/pipelines/utils.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ _retrieve_all_logs_for_pod() {
132132
save_all_pod_logs() {
133133
set +e
134134
local namespace=$1
135+
local artifacts_subdir="${2:-$namespace}"
135136
rm -rf pod_logs && mkdir -p pod_logs
136137

137138
local pod_names
@@ -153,8 +154,8 @@ save_all_pod_logs() {
153154
wait "$pid" 2> /dev/null || true
154155
done
155156

156-
mkdir -p "${ARTIFACT_DIR}/${namespace}/pod_logs"
157-
rsync -a pod_logs/ "${ARTIFACT_DIR}/${namespace}/pod_logs/" || true
157+
mkdir -p "${ARTIFACT_DIR}/${artifacts_subdir}/pod_logs"
158+
rsync -a pod_logs/ "${ARTIFACT_DIR}/${artifacts_subdir}/pod_logs/" || true
158159
set -e
159160
}
160161

0 commit comments

Comments
 (0)