From 013ce70a374b889cfba095df981f424d40213d75 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 11 Nov 2022 13:28:05 -0300 Subject: [PATCH 1/2] Lowercased variables --- scripts/bitops-config/converters/boolean.sh | 2 +- scripts/helm_handle_chart.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bitops-config/converters/boolean.sh b/scripts/bitops-config/converters/boolean.sh index 71d5357..c3e9e73 100755 --- a/scripts/bitops-config/converters/boolean.sh +++ b/scripts/bitops-config/converters/boolean.sh @@ -14,7 +14,7 @@ if [ -n "$DEEP_DEBUG" ]; then fi OUTPUT="" -if [ -z "$value" ] || [ "$value" == "" ] || [ "$value" == "False" ]; then +if [ -z "$value" ] || [ "$value" == "" ] || [ "$value" == "False" ] || [ "$value" == "false" ]; then OUTPUT="" elif [ "$value" == "True" ]; then OUTPUT="${cli_flag}" diff --git a/scripts/helm_handle_chart.sh b/scripts/helm_handle_chart.sh index ebd80a9..64033aa 100755 --- a/scripts/helm_handle_chart.sh +++ b/scripts/helm_handle_chart.sh @@ -42,9 +42,9 @@ bash $SCRIPTS_DIR/before-deploy.sh "$HELM_CHART_DIRECTORY" # set kube config if [[ -z "$KUBECONFIG_BASE64" ]]; then - if [[ "${KUBE_CONFIG_PATH}" == "" ]] || [[ "${KUBE_CONFIG_PATH}" == "''" ]] || [[ "${KUBE_CONFIG_PATH}" == "None" ]]; then - if [[ "${FETCH_KUBECONFIG}" == "True" ]]; then - if [[ "${CLUSTER_NAME}" == "" ]] || [[ "${CLUSTER_NAME}" == "''" ]] || [[ "${CLUSTER_NAME}" == "None" ]]; then + if [[ "${KUBE_CONFIG_PATH}" == "" ]] || [[ "${KUBE_CONFIG_PATH}" == "''" ]] || [[ "${KUBE_CONFIG_PATH}" == "None" ]] || [[ "${KUBE_CONFIG_PATH}" == "none" ]]; then + if [[ "${FETCH_KUBECONFIG}" == "true" ]]; then + if [[ "${CLUSTER_NAME}" == "" ]] || [[ "${CLUSTER_NAME}" == "''" ]] || [[ "${CLUSTER_NAME}" == "None" ]] || [[ "${CLUSTER_NAME}" == "none" ]]; then >&2 echo "{\"error\":\"CLUSTER_NAME config is required.Exiting...\"}" exit 1 else @@ -58,7 +58,7 @@ if [[ -z "$KUBECONFIG_BASE64" ]]; then export h="helm --kubeconfig=$BITOPS_KUBE_CONFIG_FILE" fi else - if [[ "${FETCH_KUBECONFIG}" == "False" ]]; then + if [[ "${FETCH_KUBECONFIG}" == "false" ]]; then >&2 echo "{\"error\":\"'kubeconfig' cannot be false when 'cluster-name' variable is defined in bitops.config.yaml.Exiting...\"}" exit 1 fi @@ -103,7 +103,7 @@ fi # # Identify the default folder for helm echo "Identify the default root folder for $HELM_CHART helm chart" -if [[ "${DEFAULT_DIR_FLAG}" == "True" ]]; then +if [[ "${DEFAULT_DIR_FLAG}" == "true" ]]; then echo "Use 'opsrepo_root_default_dir' of bitops.config.yaml build config value for default root directory..." export DEFAULT_HELM_ROOT="$BITOPS_OPSREPO_ENVIRONMENT_DIR/$BITOPS_DEFAULT_ROOT_DIR" else From 097ad8a829ab11cb49de48c96982d27fe18ef094 Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Thu, 15 Dec 2022 16:53:21 -0300 Subject: [PATCH 2/2] Changing file permissions --- scripts/helm_handle_chart.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/helm_handle_chart.sh diff --git a/scripts/helm_handle_chart.sh b/scripts/helm_handle_chart.sh old mode 100644 new mode 100755