Skip to content

Commit ecac7a1

Browse files
authored
Merge pull request #20 from bitops-plugins/installed_plugins
Updating `BITOPS_PLUGIN_DIR` to `BITOPS_INSTALLED_PLUGIN_DIR`
2 parents 7c19ffe + 0310823 commit ecac7a1

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
export PLUGINS_ROOT_DIR="${BITOPS_PLUGINS_DIR%/*}"
5-
export HELM_ROOT_SCRIPTS="$BITOPS_PLUGIN_DIR"
5+
export HELM_ROOT_SCRIPTS="$BITOPS_INSTALLED_PLUGIN_DIR"
66
export HELM_ROOT_OPERATIONS="$BITOPS_OPSREPO_ENVIRONMENT_DIR"
77
export ENVIRONMENT="$BITOPS_ENVIRONMENT"
88
export ENV_DIR="$BITOPS_ENVROOT"

scripts/helm_handle_chart.sh

100755100644
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

44
export KUBECONFIG_BASE64="${BITOPS_KUBECONFIG_BASE64}"
55
export HELM_CHART="$1"
6-
export SCRIPTS_DIR="$BITOPS_PLUGIN_DIR/scripts"
7-
export BITOPS_CONFIG_SCHEMA="$BITOPS_PLUGIN_DIR/bitops.schema.yaml"
6+
export SCRIPTS_DIR="$BITOPS_INSTALLED_PLUGIN_DIR/scripts"
7+
export BITOPS_CONFIG_SCHEMA="$BITOPS_INSTALLED_PLUGIN_DIR/bitops.schema.yaml"
88
export BITOPS_SCHEMA_ENV_FILE="$BITOPS_OPSREPO_ENVIRONMENT_DIR/$HELM_CHART/ENV_FILE"
99
export HELM_BITOPS_CONFIG="$BITOPS_OPSREPO_ENVIRONMENT_DIR/$HELM_CHART/bitops.config.yaml"
1010
export HELM_CHART_DIRECTORY="$BITOPS_OPSREPO_ENVIRONMENT_DIR/$HELM_CHART"
@@ -104,7 +104,6 @@ if [ -z $BITOPS_PLUGIN_NAME ]; then
104104
BITOPS_PLUGIN_NAME=$(basename ${BITOPS_PLUGIN_DIR})
105105
fi
106106

107-
# # Identify the default folder for helm
108107
echo "Identify the default root folder for $HELM_CHART helm chart"
109108
if [[ "${DEFAULT_DIR_FLAG}" == "True" ]]; then
110109
echo "Use 'opsrepo_root_default_dir' of bitops.config.yaml build config value for default root directory..."

0 commit comments

Comments
 (0)