Explorar el Código

Merge pull request #15032 from richardkchapman/helm-tag-2

HPCC-25996 Add version meta label to pods when tagging/publishing charts

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday hace 4 años
padre
commit
9a898c3e28
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. 1 1
      cmake_modules/go_gold.sh
  2. 1 1
      cmake_modules/parse_hpcc_chart.sh

+ 1 - 1
cmake_modules/go_gold.sh

@@ -88,7 +88,7 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
   if [[ "$HPCC_MAJOR" == "8" ]] && [[ "$HPCC_MINOR" == "0" ]] ; then
     doit "rm -rf ./helm"
     doit "cp -rf $HPCC_DIR/helm ./helm" 
-    doit "rm ./helm/hpcc/*.bak" 
+    doit "rm -f ./helm/hpcc/*.bak" 
     doit "git add -A ./helm"
   fi
   doit2 "cd docs"

+ 1 - 1
cmake_modules/parse_hpcc_chart.sh

@@ -80,5 +80,5 @@ function update_chart_file()
     fi
     CHART_CHANGED=0
     diff -y  --suppress-common-lines $_chart $_chart.bak || CHART_CHANGED=1
-    rm $_chart.bak
+    rm -f $_chart.bak
 }