From b52ceef0536262d545e3adb1fe50c6d294a0e182 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Wed, 29 Nov 2023 15:10:00 -0600
Subject: [PATCH] Use get-values-overrides.sh script from osh-infra

Depends-On: I5cfaad8ebfd08790ecabb3e8fa480a7bf2bb7e1e
Change-Id: I2a76a73974b874774d2ed5871d7280a2a0a9179c
---
 .../deployment/common/get-values-overrides.sh | 80 +------------------
 1 file changed, 2 insertions(+), 78 deletions(-)

diff --git a/tools/deployment/common/get-values-overrides.sh b/tools/deployment/common/get-values-overrides.sh
index 2e07423e60..bbaf35f9bc 100755
--- a/tools/deployment/common/get-values-overrides.sh
+++ b/tools/deployment/common/get-values-overrides.sh
@@ -12,83 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# This script will generate a matrix of values-override file args to apply to
-# charts, in the gate and development environments. It will 1st produce a
-# consistenly ordered list of all permuations of filenames to try, and then
-# if a file matching this name exists in the `values_overrides` directory within
-# each chart, apply it upon install/upgrade.
-
 set -e
-HELM_CHART="$1"
-SUBCHART="$2"
-: "${HELM_CHART_ROOT_PATH:="../openstack-helm"}"
-: "${OPENSTACK_RELEASE:="xena"}"
-: "${CONTAINER_DISTRO_NAME:="ubuntu"}"
-: "${CONTAINER_DISTRO_VERSION:="focal"}"
-: "${FEATURE_GATES:=""}"
-OSH_FEATURE_MIX="${FEATURE_GATES},${OPENSTACK_RELEASE},${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION},${CONTAINER_DISTRO_NAME}"
 
-function echoerr () {
-  echo "$@" 1>&2;
-}
-
-function generate_awk_exp_from_mask () {
-  local POSITION=1
-  for VALUE in $@; do
-    [ "${VALUE}" -eq 1 ] && echo -n "print \$${POSITION};"
-    POSITION=$((POSITION+1))
-  done
-  echo -e "\n"
-}
-
-function combination () {
-  POWER=$((2**$#))
-  BITS="$(awk "BEGIN { while (c++ < $#) printf \"0\" }")"
-  while [ "${POWER}" -gt 1 ];do
-    POWER=$((POWER-1))
-    BIN="$(bc <<< "obase=2; ${POWER}")"
-    MASK="$(echo "${BITS}" | sed -e "s/0\{${#BIN}\}$/$BIN/" | grep -o .)"
-    #NOTE: This line is odd, but written to support both BSD and GNU utils
-    awk -v ORS="-" "{$(generate_awk_exp_from_mask "$MASK")}" <<< "$@" | awk 1 | sed 's/-$//'
-  done
-}
-
-function replace_variables() {
-  for key in $(env); do
-    local arr=( $(echo $key | awk -F'=' '{ print $1, $2 }') )
-    sed -i "s#%%%REPLACE_${arr[0]}%%%#${arr[1]}#g" $@
-  done
-}
-
-function override_file_args () {
-    OVERRIDE_ARGS=""
-    if [ -z "$SUBCHART" ];then
-      echoerr "We will attempt to use values-override files with the following paths:"
-      for FILE in $(combination ${1//,/ } | uniq | tac); do
-        FILE_PATH="${HELM_CHART_ROOT_PATH}/${HELM_CHART}/values_overrides/${FILE}.yaml"
-        if [ -f "${FILE_PATH}" ]; then
-          replace_variables ${FILE_PATH}
-          OVERRIDE_ARGS+=" --values=${FILE_PATH} "
-        fi
-          echoerr "${FILE_PATH}"
-      done
-    else
-      echoerr "running as subchart"
-      echoerr "We will attempt to use values-override files with the following paths:"
-      for FILE in $(combination ${1//,/ } | uniq | tac); do
-        FILE_PATH="${HELM_CHART_ROOT_PATH}/values_overrides/${HELM_CHART}/${FILE}.yaml"
-        if [ -f "${FILE_PATH}" ]; then
-          replace_variables ${FILE_PATH}
-          OVERRIDE_ARGS+=" --values=${FILE_PATH} "
-        fi
-          echoerr "${FILE_PATH}"
-      done
-    fi
-
-    echo "${OVERRIDE_ARGS}"
-}
-
-
-echoerr "We are going to deploy the service ${HELM_CHART} for the OpenStack ${OPENSTACK_RELEASE} release, using ${CONTAINER_DISTRO_NAME} (${CONTAINER_DISTRO_VERSION}) distribution containers."
-source ../openstack-helm/tools/deployment/common/env-variables.sh
-override_file_args "${OSH_FEATURE_MIX}"
+export HELM_CHART_ROOT_PATH=${HELM_CHART_ROOT_PATH:-"../openstack-helm"}
+${OSH_INFRA_PATH:-"../openstack-helm-infra"}/tools/deployment/common/get-values-overrides.sh $1 $2