adding updates for feeds from 5.4.1

Signed-off-by: Hung Nguyen <[email protected]>
anchore · Apr 15, 2024 · 1560e1b · 1560e1b
1 parent 2c1fe43
commit 1560e1b
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 2 deletions.
diff --git a/stable/feeds/Chart.yaml b/stable/feeds/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: feeds
 type: application
-version: "2.4.1"
-appVersion: "5.4.0"
+version: "2.4.2"
+appVersion: "5.4.1"
 kubeVersion: 1.23.x - 1.27.x || 1.23.x-x - 1.29.x-x
 description: Anchore feeds service
 keywords:

diff --git a/stable/feeds/files/default_config.yaml b/stable/feeds/files/default_config.yaml
@@ -73,27 +73,51 @@ services:
     drivers:
       amzn:
         enabled: ${ANCHORE_FEEDS_DRIVER_AMAZON_ENABLED}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_AMAZON_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_AMAZON_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_AMAZON_PROVIDER_IMPORT_RESULTS_PATH}"
       alpine:
         enabled: ${ANCHORE_FEEDS_DRIVER_ALPINE_ENABLED}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_ALPINE_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_ALPINE_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_ALPINE_PROVIDER_IMPORT_RESULTS_PATH}"
       centos:
         enabled: false
       debian:
         enabled: ${ANCHORE_FEEDS_DRIVER_DEBIAN_ENABLED}
       {{- with .Values.anchoreConfig.feeds.drivers.debian.releases }}
         releases: {{- toYaml . | nindent 10 }}
       {{- end }}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_DEBIAN_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_DEBIAN_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_DEBIAN_PROVIDER_IMPORT_RESULTS_PATH}"
       ol:
         enabled: ${ANCHORE_FEEDS_DRIVER_OL_ENABLED}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_ORACLE_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_ORACLE_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_ORACLE_PROVIDER_IMPORT_RESULTS_PATH}"
       ubuntu:
         enabled: ${ANCHORE_FEEDS_DRIVER_UBUNTU_ENABLED}
         git_url: ${ANCHORE_FEEDS_DRIVER_UBUNTU_URL}
         git_branch: ${ANCHORE_FEEDS_DRIVER_UBUNTU_BRANCH}
       {{- with .Values.anchoreConfig.feeds.drivers.ubuntu.releases }}
         releases: {{- toYaml . | nindent 10 }}
       {{- end }}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_UBUNTU_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_UBUNTU_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_UBUNTU_PROVIDER_IMPORT_RESULTS_PATH}"
       rhel:
         enabled: ${ANCHORE_FEEDS_DRIVER_RHEL_ENABLED}
         concurrency: ${ANCHORE_FEEDS_DRIVER_RHEL_CONCURRENCY}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_RHEL_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_RHEL_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_RHEL_PROVIDER_IMPORT_RESULTS_PATH}"
       npm:
         enabled: ${ANCHORE_FEEDS_DRIVER_NPM_ENABLED}
       gem:
@@ -104,8 +128,19 @@ services:
       nvdv2:
         enabled: ${ANCHORE_FEEDS_DRIVER_NVDV2_ENABLED}
         api_key: ${ANCHORE_NVD_API_KEY}
+        overrides:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_NVD_PROVIDER_OVERRIDES_ENABLED}"
+          url: "${ANCHORE_ENTERPRISE_FEEDS_NVD_PROVIDER_OVERRIDES_URL}"
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_NVD_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_NVD_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_NVD_PROVIDER_IMPORT_RESULTS_PATH}"
       mariner:
         enabled: ${ANCHORE_FEEDS_DRIVER_MARINER_ENABLED}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_MARINER_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_MARINER_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_MARINER_PROVIDER_IMPORT_RESULTS_PATH}"
       msrc:
         enabled: ${ANCHORE_FEEDS_DRIVER_MSRC_ENABLED}
       {{- with .Values.anchoreConfig.feeds.drivers.msrc.whitelist }}
@@ -115,6 +150,10 @@ services:
       github:
         enabled: ${ANCHORE_FEEDS_DRIVER_GITHUB_ENABLED}
         token: ${ANCHORE_GITHUB_TOKEN}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_GITHUB_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_GITHUB_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_GITHUB_PROVIDER_IMPORT_RESULTS_PATH}"
       grypedb:
         enabled: ${ANCHORE_FEEDS_DRIVER_GRYPEDB_ENABLED}
         external_feeds_url: ${ANCHORE_FEEDS_EXTERNAL_URL}
@@ -125,9 +164,21 @@ services:
         restore_provider_workspaces: ${ANCHORE_FEEDS_GRYPEDB_RESTORE_WORKSPACE}
       sles:
         enabled: ${ANCHORE_FEEDS_DRIVER_SLES_ENABLED}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_SLES_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_SLES_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_SLES_PROVIDER_IMPORT_RESULTS_PATH}"
       anchore_match_exclusions:
         enabled: ${ANCHORE_FEEDS_DRIVER_MATCH_EXCLUSIONS}
       wolfi:
         enabled: ${ANCHORE_FEEDS_DRIVER_WOLFI_ENABLED}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_WOLFI_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_WOLFI_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_WOLFI_PROVIDER_IMPORT_RESULTS_PATH}"
       chainguard:
         enabled: ${ANCHORE_FEEDS_DRIVER_CHAINGUARD_ENABLED}
+        import_results:
+          enabled: "${ANCHORE_ENTERPRISE_FEEDS_CHAINGUARD_PROVIDER_IMPORT_RESULTS_ENABLED}"
+          host: "${ANCHORE_ENTERPRISE_FEEDS_CHAINGUARD_PROVIDER_IMPORT_RESULTS_HOST}"
+          path: "${ANCHORE_ENTERPRISE_FEEDS_CHAINGUARD_PROVIDER_IMPORT_RESULTS_PATH}"