Merge pull request #10 from bitops-plugins/copy_defaults

Add functionality: Merges BitOps Defaults folder with targetted Helm Chart

Author: PhillypHenning

deploy.sh

@@ -23,9 +23,15 @@ echo "calling helm/deploy ..."
 # if subdirectory is not provided, iterate subdirectories
 if [ -z "$ENVIRONMENT_HELM_SUBDIRECTORY" ]; then
   echo "ENVIRONMENT_HELM_SUBDIRECTORY not provided, iterate all helm charts in $ENV_DIR/helm"
+
   for helm_chart_dir in $HELM_ROOT_OPERATIONS/*/; do
     helm_chart_dir=${helm_chart_dir%*/}     # remove the trailing "/"
     helm_chart_dir=${helm_chart_dir##*/}    # get everything after the final "/"
+    # The following if conditional checks whether the directory being passed over is the same as the _default folder
+    # If it is, it skips to the next loop item
+    if [ "$helm_chart_dir" == "$BITOPS_DEFAULT_ROOT_DIR" ] || [ "$helm_chart_dir" == "$DEFAULT_ROOT_DIR" ]; then
+      continue
+    fi
     echo "Deploy $helm_chart_dir for $ENVIRONMENT"
 
     $HELM_ROOT_SCRIPTS/scripts/helm_handle_chart.sh $helm_chart_dir

scripts/copy-defaults.sh

@@ -8,66 +8,40 @@ HELM_CHART="$1"
 # DEFAULT_HELM_CHART_DIRECTORY
 # HELM_BITOPS_CONFIG
 
-# TODO: handle if we should merge vs overwrite
-
-# Copy default CRDs.
-
-if [ "1" == "1" ]; then
-# if [ "$(shyaml get-value copy_defaults.crds < "$HELM_BITOPS_CONFIG")" == 'True' ]; then
-    echo "COPY_DEFAULT_CRDS set"
-    if [ -d "$DEFAULT_HELM_CHART_DIRECTORY/crds" ]; then
-        echo "default crds/ exist"
-        cp -rf "$DEFAULT_HELM_CHART_DIRECTORY/crds/." "$HELM_CHART_DIRECTORY/crds/"
-    else
-        printf "${ERROR} crds/ does not exist...${NC}"
-    fi
+echo "COPY_DEFAULT_CRDS set..."
+if [ -d "$DEFAULT_HELM_CHART_DIRECTORY/crds" ]; then
+    echo "default crds/ exists."
+    cp -rf "$DEFAULT_HELM_CHART_DIRECTORY/crds/." "$HELM_CHART_DIRECTORY/crds/"
+    ls $HELM_CHART_DIRECTORY/crds/
 else
     echo "COPY_DEFAULT_CRDS not set"
 fi
 
-# Copy default Charts.
-
-if [ "1" == "1" ]; then
-# if [ "$(shyaml get-value copy_defaults.charts < "$HELM_BITOPS_CONFIG")" == 'True' ]; then
-    echo "COPY_DEFAULT_CHARTS set"
-    if [ -d "$DEFAULT_HELM_CHART_DIRECTORY/charts" ]; then
-        echo "default charts/ exist"
-        cp -rf "$DEFAULT_HELM_CHART_DIRECTORY/charts/." "$HELM_CHART_DIRECTORY/charts/"
-    else
-        printf "${ERROR} charts/ does not exist...${NC}"
-    fi
+echo "COPY_DEFAULT_CHARTS set..."
+if [ -d "$DEFAULT_HELM_CHART_DIRECTORY/charts" ]; then
+    echo "default charts/ exists.\n"
+    cp -rf "$DEFAULT_HELM_CHART_DIRECTORY/charts/." "$HELM_CHART_DIRECTORY/charts/"
+    ls $HELM_CHART_DIRECTORY/charts/
 else
-    echo "COPY_DEFAULT_CHARTS not set"
-    printf "${SUCCESS} Helm deployment was successful...${NC}"
+    echo "${ERROR} charts/ does not exist.${NC}\n"
 fi
 
-# Copy default Templates.
 
-if [ "1" == "1" ]; then
-# if [ "$(shyaml get-value copy_defaults.templates < "$HELM_BITOPS_CONFIG")" == 'True' ]; then
-    echo "COPY_DEFAULT_TEMPLATES set"
-    if [ -d "$DEFAULT_HELM_CHART_DIRECTORY/templates" ]; then
-        echo "default templates/ exist"
-        cp -rf "$DEFAULT_HELM_CHART_DIRECTORY/templates/." "$HELM_CHART_DIRECTORY/templates/"
-    else
-        printf "${ERROR}  templates/ does not exist...${NC}"
-    fi
+echo "COPY_DEFAULT_TEMPLATES set..."
+if [ -d "$DEFAULT_HELM_CHART_DIRECTORY/templates" ]; then
+    echo "default templates/ exists.\n"
+    cp -rf "$DEFAULT_HELM_CHART_DIRECTORY/templates/." "$HELM_CHART_DIRECTORY/templates/"
+    ls $HELM_CHART_DIRECTORY/templates/
 else
-    echo "COPY_DEFAULT_TEMPLATES not set"
+    echo "${ERROR} templates/ does not exist.${NC}\n"
 fi
 
-# TODO: what's the schema?
-# Copy default Schema.
 
-if [ "1" == "1" ]; then
-# if [ "$(shyaml get-value copy_defaults.schema < "$HELM_BITOPS_CONFIG")" == 'True' ]; then
-    echo "COPY_DEFAULT_SCHEMA set"
-    if [ -d "$DEFAULT_HELM_CHART_DIRECTORY/schema" ]; then
-        echo "default schema/ exists"
-        cp -rf "$DEFAULT_HELM_CHART_DIRECTORY/templates/." "$HELM_CHART_DIRECTORY/templates/"
-    else
-        printf "${ERROR}  schema/ does not exist...${NC}"
-    fi
+echo "COPY_DEFAULT_SCHEMA set..."
+if [ -d "$DEFAULT_HELM_CHART_DIRECTORY/schema" ]; then
+    echo "default schema/ exists.\n"
+    cp -rf "$DEFAULT_HELM_CHART_DIRECTORY/schema/." "$HELM_CHART_DIRECTORY/schema/"
+    ls $HELM_CHART_DIRECTORY/schema/
 else
-    echo "COPY_DEFAULT_SCHEMA not set"
+    echo "${ERROR}  schema/ does not exist.${NC}\n"
 fi

scripts/helm_handle_chart.sh

@@ -11,6 +11,7 @@ export HELM_CHART_DIRECTORY="$BITOPS_OPSREPO_ENVIRONMENT_DIR/$HELM_CHART"
 
 echo "Parsing helm bitops.config.yaml..."
 export BITOPS_CONFIG_COMMAND="$(ENV_FILE="$BITOPS_SCHEMA_ENV_FILE" DEBUG="" bash $SCRIPTS_DIR/bitops-config/convert-schema.sh $BITOPS_CONFIG_SCHEMA $HELM_BITOPS_CONFIG)"
+
 echo "BITOPS_CONFIG_COMMAND: $BITOPS_CONFIG_COMMAND"
 source "$BITOPS_SCHEMA_ENV_FILE"
 
@@ -55,7 +56,7 @@ if [[ -z "$KUBECONFIG_BASE64" ]]; then
                 export KUBECONFIG=$KUBECONFIG:$BITOPS_KUBE_CONFIG_FILE
                 export k="kubectl --kubeconfig=$BITOPS_KUBE_CONFIG_FILE"
                 export h="helm --kubeconfig=$BITOPS_KUBE_CONFIG_FILE"
-            fi   
+            fi
         else
             if [[ "${FETCH_KUBECONFIG}" == "False" ]]; then
                 >&2 echo "{\"error\":\"'kubeconfig' cannot be false when 'cluster-name' variable is defined in bitops.config.yaml.Exiting...\"}"
@@ -104,15 +105,14 @@ fi
 echo "Identify the default root folder for $HELM_CHART helm chart"
 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_TEMPDIR/$BITOPS_DEFAULT_ROOT_DIR"
-    export DEFAULT_HELM_CHART_DIRECTORY="$DEFAULT_HELM_ROOT/$DEFAULT_SUB_DIR"
+    export DEFAULT_HELM_ROOT="$BITOPS_OPSREPO_ENVIRONMENT_DIR/$BITOPS_DEFAULT_ROOT_DIR"
 else
     echo "Use 'default-root-dir' of bitops.config.yaml helm chart config value for default root directory..."
-    export DEFAULT_HELM_ROOT="$BITOPS_TEMPDIR/$DEFAULT_ROOT_DIR"
-    export DEFAULT_HELM_CHART_DIRECTORY="$DEFAULT_HELM_ROOT/$DEFAULT_SUB_DIR"
+    export DEFAULT_HELM_ROOT="$BITOPS_OPSREPO_ENVIRONMENT_DIR/$DEFAULT_ROOT_DIR"
 fi
 echo "default root folder for $HELM_CHART helm chart found.."
 
+export DEFAULT_HELM_CHART_DIRECTORY="$DEFAULT_HELM_ROOT/$DEFAULT_SUB_DIR"
 
 ### COPY DEFAULTS
 echo "Copying defaults...."