diff --git a/stable/feeds/tests/__snapshot__/configmap_test.yaml.snap b/stable/feeds/tests/__snapshot__/configmap_test.yaml.snap index 3a3ff1ce..2361fcbf 100644 --- a/stable/feeds/tests/__snapshot__/configmap_test.yaml.snap +++ b/stable/feeds/tests/__snapshot__/configmap_test.yaml.snap @@ -74,21 +74,45 @@ should render the configmaps: 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} + 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} + 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: @@ -96,13 +120,28 @@ should render the configmaps: 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} 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} @@ -113,12 +152,24 @@ should render the configmaps: 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}" kind: ConfigMap metadata: annotations: diff --git a/stable/feeds/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap b/stable/feeds/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap index b68b53ca..0e4b8336 100644 --- a/stable/feeds/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap +++ b/stable/feeds/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap @@ -143,6 +143,6 @@ should render proper initContainers: value: test-release-feeds - name: ANCHORE_PORT value: "8448" - image: docker.io/anchore/enterprise:v5.4.0 + image: docker.io/anchore/enterprise-dev:v5.4.1-rc0 imagePullPolicy: IfNotPresent name: wait-for-db diff --git a/stable/feeds/values.yaml b/stable/feeds/values.yaml index d8e126a4..131dbbf8 100644 --- a/stable/feeds/values.yaml +++ b/stable/feeds/values.yaml @@ -21,7 +21,7 @@ nameOverride: "" ## @param image Image used for feeds deployment ## -image: docker.io/anchore/enterprise:v5.4.0 +image: docker.io/anchore/enterprise-dev:v5.4.1-rc0 ## @param imagePullPolicy Image pull policy used by all deployments ## ref: https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy