Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .ibm/pipelines/cluster/aks/aks-helm-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ initiate_aks_helm_deployment() {
deploy_redis_cache "${NAME_SPACE}"
patch_and_restart "$NAME_SPACE" "deployment" "redis" "${DIR}/cluster/aks/patch/aks-spot-patch.yaml" # Patch Redis deployment to run on spot cluster

uninstall_helmchart "${NAME_SPACE}" "${RELEASE_NAME}"
helm::uninstall "${NAME_SPACE}" "${RELEASE_NAME}"

cd "${DIR}" || exit
local rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
yq_merge_value_files "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}"
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}"
common::save_artifact "${NAME_SPACE}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"

namespace::setup_image_pull_secret "${NAME_SPACE}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
Expand All @@ -37,12 +37,12 @@ initiate_rbac_aks_helm_deployment() {
namespace::delete "${NAME_SPACE}"
namespace::configure "${NAME_SPACE_RBAC}"

uninstall_helmchart "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
helm::uninstall "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"

cd "${DIR}" || exit
local rbac_rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
yq_merge_value_files "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}"
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}"
common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"

namespace::setup_image_pull_secret "${NAME_SPACE_RBAC}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
Expand Down
4 changes: 2 additions & 2 deletions .ibm/pipelines/cluster/aks/aks-operator-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ initiate_aks_operator_deployment() {
apply_yaml_files "${DIR}" "${namespace}" "${rhdh_base_url}"

log::info "Creating and applying ConfigMap for dynamic plugins"
yq_merge_value_files "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}"
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}"
create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins.yaml"
kubectl apply -f /tmp/configmap-dynamic-plugins.yaml -n "${namespace}"
Expand All @@ -47,7 +47,7 @@ initiate_rbac_aks_operator_deployment() {
apply_yaml_files "${DIR}" "${namespace}" "${rhdh_base_url}"

log::info "Creating and applying ConfigMap for dynamic plugins"
yq_merge_value_files "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}"
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}"
create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
kubectl apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${namespace}"
Expand Down
8 changes: 4 additions & 4 deletions .ibm/pipelines/cluster/eks/eks-helm-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ initiate_eks_helm_deployment() {
namespace::configure "${NAME_SPACE}"
deploy_redis_cache "${NAME_SPACE}"

uninstall_helmchart "${NAME_SPACE}" "${RELEASE_NAME}"
helm::uninstall "${NAME_SPACE}" "${RELEASE_NAME}"

cd "${DIR}" || exit

Expand All @@ -21,7 +21,7 @@ initiate_eks_helm_deployment() {
local rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
envsubst < "${DIR}/value_files/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}" > "/tmp/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}"
yq_merge_value_files "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}"
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}"
common::save_artifact "${NAME_SPACE}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" # Save the final value-file into the artifacts directory.
log::info "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE}"
helm upgrade -i "${RELEASE_NAME}" -n "${NAME_SPACE}" \
Expand All @@ -38,7 +38,7 @@ initiate_rbac_eks_helm_deployment() {
namespace::delete "${NAME_SPACE}"
namespace::configure "${NAME_SPACE_RBAC}"

uninstall_helmchart "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
helm::uninstall "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"

cd "${DIR}" || exit

Expand All @@ -47,7 +47,7 @@ initiate_rbac_eks_helm_deployment() {
local rbac_rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
envsubst < "${DIR}/value_files/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}" > "/tmp/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}"
yq_merge_value_files "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}"
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}"
common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}" # Save the final value-file into the artifacts directory.
log::info "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE_RBAC}"
helm upgrade -i "${RELEASE_NAME_RBAC}" -n "${NAME_SPACE_RBAC}" \
Expand Down
4 changes: 2 additions & 2 deletions .ibm/pipelines/cluster/eks/eks-operator-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ initiate_eks_operator_deployment() {
apply_yaml_files "${DIR}" "${namespace}" "${rhdh_base_url}"

log::info "Creating and applying ConfigMap for dynamic plugins"
yq_merge_value_files "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}"
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}"
create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins.yaml"
kubectl apply -f /tmp/configmap-dynamic-plugins.yaml -n "${namespace}"
Expand All @@ -44,7 +44,7 @@ initiate_rbac_eks_operator_deployment() {
apply_yaml_files "${DIR}" "${namespace}" "${rhdh_base_url}"

log::info "Creating and applying ConfigMap for dynamic plugins"
yq_merge_value_files "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}"
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}"
create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
kubectl apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${namespace}"
Expand Down
8 changes: 4 additions & 4 deletions .ibm/pipelines/cluster/gke/gke-helm-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ initiate_gke_helm_deployment() {

deploy_redis_cache "${NAME_SPACE}"

uninstall_helmchart "${NAME_SPACE}" "${RELEASE_NAME}"
helm::uninstall "${NAME_SPACE}" "${RELEASE_NAME}"

cd "${DIR}" || exit
local rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
apply_gke_frontend_config "${NAME_SPACE}"
yq_merge_value_files "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}"
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}"
common::save_artifact "${NAME_SPACE}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"

namespace::setup_image_pull_secret "${NAME_SPACE}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
Expand All @@ -40,13 +40,13 @@ initiate_rbac_gke_helm_deployment() {
namespace::delete "${NAME_SPACE}"
namespace::configure "${NAME_SPACE_RBAC}"

uninstall_helmchart "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
helm::uninstall "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"

cd "${DIR}" || exit
local rbac_rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
apply_gke_frontend_config "${NAME_SPACE_RBAC}"
yq_merge_value_files "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}"
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}"
common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"

namespace::setup_image_pull_secret "${NAME_SPACE_RBAC}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
Expand Down
4 changes: 2 additions & 2 deletions .ibm/pipelines/cluster/gke/gke-operator-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ initiate_gke_operator_deployment() {
apply_gke_frontend_config "${namespace}"

log::info "Creating and applying ConfigMap for dynamic plugins"
yq_merge_value_files "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}"
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}"
create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins.yaml"
kubectl apply -f /tmp/configmap-dynamic-plugins.yaml -n "${namespace}"
Expand All @@ -50,7 +50,7 @@ initiate_rbac_gke_operator_deployment() {
apply_gke_frontend_config "${namespace}"

log::info "Creating and applying ConfigMap for dynamic plugins"
yq_merge_value_files "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}"
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}"
create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
kubectl apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${namespace}"
Expand Down
4 changes: 2 additions & 2 deletions .ibm/pipelines/jobs/ocp-operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ initiate_operator_deployments_osd_gcp() {
apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"

# Merge base values with OSD-GCP diff file before creating dynamic plugins config
yq_merge_value_files "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"
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"
create_dynamic_plugins_config "/tmp/merged-values_showcase_OSD-GCP.yaml" "/tmp/configmap-dynamic-plugins.yaml"
common::save_artifact "${NAME_SPACE}" "/tmp/configmap-dynamic-plugins.yaml"

Expand All @@ -67,7 +67,7 @@ initiate_operator_deployments_osd_gcp() {
apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"

# Merge RBAC values with OSD-GCP diff file before creating dynamic plugins config
yq_merge_value_files "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"
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"
create_dynamic_plugins_config "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml" "/tmp/configmap-dynamic-plugins-rbac.yaml"
common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/configmap-dynamic-plugins-rbac.yaml"

Expand Down
2 changes: 1 addition & 1 deletion .ibm/pipelines/jobs/upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ handle_ocp_helm_upgrade() {
save_overall_result 1
exit 1
fi
CHART_VERSION_BASE=$(get_chart_version "$previous_release_version")
CHART_VERSION_BASE=$(helm::get_chart_version "$previous_release_version")
if [[ -z "$CHART_VERSION_BASE" ]]; then
log::error "Failed to determine correct chart version for $previous_release_version. Exiting."
save_overall_result 1
Expand Down
31 changes: 0 additions & 31 deletions .ibm/pipelines/lib/helm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -204,34 +204,3 @@ helm::install() {
--set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
$(helm::get_image_params)
}

# ==============================================================================
# Backward Compatibility Aliases
# These functions delegate to the new namespaced functions for backward compatibility
# ==============================================================================

# Alias for backward compatibility
yq_merge_value_files() {
helm::merge_values "$@"
return $?
}
uninstall_helmchart() {
helm::uninstall "$@"
return $?
}
get_image_helm_set_params() {
helm::get_image_params "$@"
return $?
}
perform_helm_install() {
helm::install "$@"
return $?
}
get_chart_version() {
helm::get_chart_version "$@"
return $?
}
get_previous_release_value_file() {
helm::get_previous_release_values "$@"
return $?
}
2 changes: 1 addition & 1 deletion .ibm/pipelines/openshift-ci-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ main() {
log::info "Log file: ${LOGFILE}"
log::info "JOB_NAME : $JOB_NAME"

CHART_VERSION=$(get_chart_version "$CHART_MAJOR_VERSION")
CHART_VERSION=$(helm::get_chart_version "$CHART_MAJOR_VERSION")
export CHART_VERSION

case "$JOB_NAME" in
Expand Down
Loading
Loading