Various Trivy whitelist fixes

Substitute underscore in imagename for consistent formatting in
whitelists file and remove unnecessary return code checking

etc/kayobe/trivy/allowed-vulnerabilities.yml

@@ -7,7 +7,7 @@
 # keystone_allowed_vulnerabilities:
 #   - CVE-2022-2447
 #
-# barbican-api_allowed_vulnerabilities:
+# barbican_api_allowed_vulnerabilities:
 #   - CVE-2023-31047
 
 global_allowed_vulnerabilities:

tools/scan-images.sh

@@ -34,18 +34,15 @@ touch image-scan-output/clean-images.txt image-scan-output/dirty-images.txt
 # generate a csv summary
 for image in $images; do
   filename=$(basename $image | sed 's/:/\./g')
-  imagename=$(echo $filename | cut -d "." -f 1)
+  imagename=$(echo $filename | cut -d "." -f 1 | sed 's/-/_/g')
   global_vulnerabilities=$(yq .global_allowed_vulnerabilities[] src/kayobe-config/etc/kayobe/trivy/allowed-vulnerabilities.yml)
   image_vulnerabilities=$(yq .$imagename'_allowed_vulnerabilities[]' src/kayobe-config/etc/kayobe/trivy/allowed-vulnerabilities.yml)
-  rc=$?
   touch .trivyignore
   for vulnerability in $global_vulnerabilities; do
     echo $vulnerability >> .trivyignore
   done
   for vulnerability in $image_vulnerabilities; do
-    if [ $rc -eq 0 ]; then
-        echo $vulnerability >> .trivyignore
-    fi
+    echo $vulnerability >> .trivyignore
   done
   if $(trivy image \
           --quiet \