Merge pull request #309 from anchore/dev-sync

Feeds v1.0.0
anchore · Oct 28, 2023 · f6c84fa · f6c84fa
2 parents 496d61e + dad6e69
commit f6c84fa
Show file tree

Hide file tree

Showing 7 changed files with 202 additions and 97 deletions.
diff --git a/scripts/enterprise-value-converter/mappings.py b/scripts/enterprise-value-converter/mappings.py
@@ -322,6 +322,10 @@
         "action": "duplicate",
         "new_keys": ["rbacAuth.extraEnv", "rbacManager.extraEnv"]
     },
+    "anchoreEnterpriseGlobal.imagePullSecretName": {
+        "action": "duplicate",
+        "new_keys": ["imagePullSecretName", "feeds.imagePullSecretName"]
+    },
     "anchoreEnterpriseFeeds.existingSecretName": {
         "action": "key_addition",
         "new_keys": [("feeds.existingSecretName", "default"), ("feeds.useExistingSecrets", True)]

diff --git a/scripts/enterprise-value-converter/tests/test_anchoreGlobal_value_mapping.py b/scripts/enterprise-value-converter/tests/test_anchoreGlobal_value_mapping.py
@@ -171,6 +171,7 @@ def test_anchoreGlobal_image_values(self):
             'image': 'my.repo/anchore-enterprise:v4.9.0',
             'imagePullPolicy': 'ifNotPresent',
             'imagePullSecretName': 'enterprise-pull-secret',
+            'feeds': { 'imagePullSecretName': 'enterprise-pull-secret' },
             'licenseSecretName': 'my-anchore-enterprise-license',
         }
         result = replace_keys_with_mappings(dot_string_dict, self.results_dir)

diff --git a/stable/feeds/Chart.yaml b/stable/feeds/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: feeds
 type: application
-version: "0.1.1"
+version: "1.0.0"
 appVersion: "4.9.3"
 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
diff --git a/stable/feeds/files/default_config.yaml b/stable/feeds/files/default_config.yaml
@@ -14,12 +14,11 @@ auto_restart_services: false
 
 max_source_import_size_mb: ${ANCHORE_MAX_IMPORT_SOURCE_SIZE_MB}
 max_import_content_size_mb: ${ANCHORE_MAX_IMPORT_CONTENT_SIZE_MB}
-
 max_compressed_image_size_mb: ${ANCHORE_MAX_COMPRESSED_IMAGE_SIZE_MB}
 
 metrics:
   enabled: ${ANCHORE_ENABLE_METRICS}
-  auth_disabled: ${ANCHORE_DISABLE_METRICS_AUTH}
+  auth_disabled: true
 
 keys:
   secret: ${ANCHORE_SAML_SECRET}

diff --git a/stable/feeds/tests/__snapshot__/configmap_test.yaml.snap b/stable/feeds/tests/__snapshot__/configmap_test.yaml.snap
@@ -21,12 +21,11 @@ should render the configmaps:
 
         max_source_import_size_mb: ${ANCHORE_MAX_IMPORT_SOURCE_SIZE_MB}
         max_import_content_size_mb: ${ANCHORE_MAX_IMPORT_CONTENT_SIZE_MB}
-
         max_compressed_image_size_mb: ${ANCHORE_MAX_COMPRESSED_IMAGE_SIZE_MB}
 
         metrics:
           enabled: ${ANCHORE_ENABLE_METRICS}
-          auth_disabled: ${ANCHORE_DISABLE_METRICS_AUTH}
+          auth_disabled: true
 
         keys:
           secret: ${ANCHORE_SAML_SECRET}

diff --git a/stable/feeds/values.yaml b/stable/feeds/values.yaml
@@ -417,11 +417,11 @@ feeds-db:
 #######################################
 
 gem-db:
-  ## @param gem-db.chartEnabled Use the dependent chart for Postgresql deployment
+  ## @extra gem-db.chartEnabled Use the dependent chart for Postgresql deployment
   ## Configures a separate postgres database deployment for the feeds service Ruby Gems DB
   ## requires feeds.gemDriverEnabled=true
   ##
-  chartEnabled: false
+  ## chartEnabled: false
 
   ## @param gem-db.externalEndpoint External Postgresql hostname when not using Helm managed chart (eg. mypostgres.myserver.io)
   ## gem-db.externalEndpoint, gem-db.postgresqlUsername, gem-db.postgresqlPassword,
@@ -542,7 +542,7 @@ ingress:
   ##
   hosts: []
 
-  ## @param ingress.path The path used for accessing the Anchore Feeds API
+  ## @param ingress.paths The path used for accessing the Anchore Feeds API
   ##
   paths:
     - /v1/feeds/