use feeds service for grypedb external_url (#124)

* use localhost for grypedb external_url instead of service * update unittest snapshots * Remove feeds_ prefix from all resource templates This prefix was causing unit tests to fail. I couldn't figure out how to get the tests passing while keeping the prefix. Since it was redundant in this chart I decided the easiest course of action was to rename all the template files. --------- Signed-off-by: Brady Todhunter <[email protected]>
anchore · Sep 15, 2023 · a5be71c · a5be71c
1 parent c590c2d
commit a5be71c
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 77 deletions.
diff --git a/stable/feeds/Chart.yaml b/stable/feeds/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: feeds
 type: application
-version: "0.0.3"
+version: "0.0.4"
 appVersion: "4.9.1"
 kubeVersion: 1.23.x - 1.27.x || 1.23.x-x - 1.27.x-x
 description: Anchore feeds service

diff --git a/stable/feeds/README.md b/stable/feeds/README.md
@@ -382,6 +382,6 @@ A major chart version change (v0.1.2 -> v1.0.0) indicates that there is an **inc
 
 A minor chart version change (v0.1.2 -> v0.2.0) indicates a change that **may require updates to your values file.**
 
-### v0.0.1
+### v0.0.x
 
 * This is a pre-release version of the Anchore Enterprise Helm chart. It is not intended for production use.
diff --git a/stable/feeds/templates/anchore_vars_configmap.yaml b/stable/feeds/templates/anchore_vars_configmap.yaml
@@ -53,7 +53,7 @@ data:
   ANCHORE_FEEDS_DRIVER_UBUNTU_URL: "https://git.launchpad.net/ubuntu-cve-tracker"
   ANCHORE_FEEDS_DRIVER_UBUNTU_BRANCH: "master"
   ANCHORE_FEEDS_DRIVER_WOLFI_ENABLED: "true"
-  ANCHORE_FEEDS_EXTERNAL_URL: "null"
+  ANCHORE_FEEDS_EXTERNAL_URL: "{{ printf "http://localhost:%s/v2/" (.Values.service.port | toString) }}"
   ANCHORE_FEEDS_LOCAL_WORKSPACE: "{{ .Values.persistence.mountPath }}"
   ANCHORE_FEEDS_GRYPEDB_PRELOAD_ENABLED: "true"
   ANCHORE_FEEDS_GRYPEDB_PRELOAD_PATH: "/preload/grype-db-workspace.tar.gz"

diff --git a/stable/feeds/templates/feeds_configmap.yaml → stable/feeds/templates/configmap.yaml b/stable/feeds/templates/feeds_configmap.yaml → stable/feeds/templates/configmap.yaml
diff --git a/stable/feeds/templates/feeds_deployment.yaml → stable/feeds/templates/deployment.yaml b/stable/feeds/templates/feeds_deployment.yaml → stable/feeds/templates/deployment.yaml
@@ -16,9 +16,9 @@ spec:
       labels: {{- include "feeds.common.labels" . | nindent 8 }}
       annotations: {{- include "feeds.common.annotations" (merge (dict "nil" true) .) | nindent 8 }}
       {{- if not .Values.injectSecretsViaEnv }}
-        checksum/secrets: {{ include (print $.Template.BasePath "/feeds_secret.yaml") . | sha256sum }}
+        checksum/secrets: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
       {{- end }}
-        checksum/feeds-config: {{ include (print $.Template.BasePath "/feeds_configmap.yaml") . | sha256sum }}
+        checksum/feeds-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
     spec:
     {{- with .Values.securityContext }}
       securityContext: {{- toYaml . | nindent 8 }}

diff --git a/stable/feeds/templates/feeds_pvc.yaml → stable/feeds/templates/pvc.yaml b/stable/feeds/templates/feeds_pvc.yaml → stable/feeds/templates/pvc.yaml
diff --git a/stable/feeds/templates/feeds_secret.yaml → stable/feeds/templates/secret.yaml b/stable/feeds/templates/feeds_secret.yaml → stable/feeds/templates/secret.yaml
diff --git a/stable/feeds/tests/__snapshot__/configmap_test.yaml.snap b/stable/feeds/tests/__snapshot__/configmap_test.yaml.snap
@@ -127,6 +127,6 @@ should render the configmaps:
         app.kubernetes.io/version: 4.9.1
         bar: baz-label
         foo: bar-label
-        helm.sh/chart: feeds-0.0.3
+        helm.sh/chart: feeds-0.0.4
       name: test-release-feeds
       namespace: test-namespace