Merge "Fix deploy when subcharts contain same name"

3 files changed, 13 insertions, 12 deletions

diff --git a/kubernetes/common/common/templates/_repository.tpl b/kubernetes/common/common/templates/_repository.tpl
index 364ba7dc4c..272db42125 100644
--- a/kubernetes/common/common/templates/_repository.tpl
+++ b/kubernetes/common/common/templates/_repository.tpl
@@ -41,6 +41,7 @@
 */}}
 {{- define "common.repository.secret" -}}
   {{- $repo := include "common.repository" . }}
+  {{- $repo := default "nexus3.onap.org:10001" $repo }}
   {{- $cred := .Values.global.repositoryCred }}
   {{- $mail := default "@" $cred.mail }}
   {{- $auth := printf "%s:%s" $cred.user $cred.password | b64enc }}
diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index 41873b97e2..9d9d1d208c 100755
--- a/kubernetes/helm/plugins/deploy/deploy.sh
+++ b/kubernetes/helm/plugins/deploy/deploy.sh
@@ -67,11 +67,11 @@ generate_overrides() {
     if [[ $START == "global:" ]]; then
       echo "global:" > $GLOBAL_OVERRIDES
       cat $COMPUTED_OVERRIDES | sed '/common:/,/consul:/d' \
-        | sed -n '/'"$START"'/,/'log:'/p' | sed '1d;$d' >> $GLOBAL_OVERRIDES  
+        | sed -n '/'"$START"'/,/'log:'/p' | sed '1d;$d' >> $GLOBAL_OVERRIDES
     else
       SUBCHART_DIR="$CACHE_SUBCHART_DIR/$(cut -d':' -f1 <<<"$START")"
       if [[ -d "$SUBCHART_DIR" ]]; then
-        cat $COMPUTED_OVERRIDES | sed -n '/'"$START"'/,/'"$END"'/p' \
+        cat $COMPUTED_OVERRIDES | sed -n '/^'"$START"'/,/^'"$END"'/p' \
           | sed '1d;$d' | cut -c3- > $SUBCHART_DIR/subchart-overrides.yaml
       fi
     fi
@@ -122,6 +122,10 @@ deploy() {
     FLAGS="$(echo $FLAGS| sed -n 's/--verbose//p')"
     VERBOSE="true"
   fi
+  if [[ $FLAGS = *"--dry-run"* ]]; then
+    VERBOSE="true"
+    FLAGS="$FLAGS --debug"
+  fi
 
   # should pass all flags instead
   NAMESPACE="$(echo $FLAGS | sed -n 's/.*\(namespace\).\s*/\1/p' | cut -c10- | cut -d' ' -f1)"
@@ -188,10 +192,10 @@ deploy() {
     helm upgrade -i $RELEASE $CHART_DIR $DEPLOY_FLAGS -f $COMPUTED_OVERRIDES \
      > $LOG_FILE.log 2>&1
 
-    echo "release $RELEASE deployed"
-
     if [[ $VERBOSE == "true" ]]; then
       cat $LOG_FILE
+    else
+      echo "release $RELEASE deployed"
     fi
   fi
 
@@ -214,10 +218,10 @@ deploy() {
          $DEPLOY_FLAGS -f $GLOBAL_OVERRIDES -f $SUBCHART_OVERRIDES \
          > $LOG_FILE 2>&1
 
-        echo "release ${RELEASE}-${subchart} deployed"
-
         if [[ $VERBOSE == "true" ]]; then
           cat $LOG_FILE
+        else
+          echo "release ${RELEASE}-${subchart} deployed"
         fi
       fi
     else
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 545a7bd73e..190a9ec67d 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -47,15 +47,11 @@ global:
   persistence:
     mountPath: /dockerdata-nfs
 
-  # flag to enable debugging - application support required
-  debugEnabled: false
-
   # override default resource limit flavor for all charts
   flavor: unlimited
 
-# Repository for creation of nexus3.onap.org secret
-repository: nexus3.onap.org:10001
-
+  # flag to enable debugging - application support required
+  debugEnabled: false
 
 #################################################################
 # Enable/disable and configure helm charts (ie. applications)