Merge R3 into master

[it/dep.git] / bin / gen-image-list

diff --git a/bin/gen-image-list b/bin/gen-image-list
index 30386af..34df424 100755 (executable)
--- a/bin/gen-image-list
+++ b/bin/gen-image-list
@@ -43,6 +43,29 @@ fi
 
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+
+# Start Helm local repo if there isn't one
+HELM_REPO_PID=$(ps -x | grep  "helm serve" | grep -v "grep" | awk '{print $1}')
+if [ -z "$HELM_REPO_PID" ]; then
+    nohup helm serve >& /dev/null &
+fi
+
+# Package ric-common and serve it using Helm local repo
+HELM_HOME=$(helm home)
+COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/ric-common/Chart.yaml | grep version | awk '{print $2}')
+helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
+cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/
+helm repo index $HELM_HOME/repository/local/
+
+
+# Make sure that helm local repo is added
+helm repo remove local
+helm repo add local http://127.0.0.1:8879/charts
+
+
+
+
 TEMP_DIR=/tmp
 rm -rf $TEMP_DIR/imagelist
 touch $TEMP_DIR/imagelist
@@ -51,9 +74,7 @@ while IFS= read -r -d $'\0'; do
     CHART_ARRAY+=("$REPLY")
 done < <(find $ROOT_DIR/../ -name Chart.yaml -printf '%h\0')
 
-rm -fr $TEMP_DIR/ric-common*.tgz
 
-helm package -d $TEMP_DIR $ROOT_DIR/../ric-common/Common-Template/helm/ric-common
 echo "***************************************"
 
 
@@ -61,14 +82,11 @@ echo "***************************************"
 for dir in "${CHART_ARRAY[@]}"
 do
   
-    #rm -rf $dir/charts
-    rm -rf $dir/tmpcharts
     echo "Analyzing Chart $(echo $dir | awk '{n=split($0, a, "/"); print a[n]}')"    
     echo $dir 
-    mkdir -p $dir/charts
-    cp $TEMP_DIR/ric-common*.tgz $dir/charts/
 
-    helm dep up $dir > /dev/null 2>&1
+    #helm dep up $dir > /dev/null 2>&1
+    helm dep up $dir 
     
     IMAGE_ARRAY=$(helm template -f $OVERRIDEYAML $dir | grep "image:" | awk '{ gsub(/.*image: /, "", $0); gsub(/"/, "", $0); print $0}' )