diff --git a/scripts/enterprise-value-converter/mappings.py b/scripts/enterprise-value-converter/mappings.py index 8355811e..2939b5af 100644 --- a/scripts/enterprise-value-converter/mappings.py +++ b/scripts/enterprise-value-converter/mappings.py @@ -150,7 +150,6 @@ "anchore-feeds-gem-db.postgresUser": "feeds.gem-db.auth.username", - "anchoreAnalyzer.concurrentTasksPerWorker": "anchoreConfig.analyzer.max_threads", "anchoreAnalyzer.containerPort": "analyzer.service.port", "anchoreAnalyzer.enableHints": "anchoreConfig.analyzer.enable_hints", @@ -292,6 +291,7 @@ "postgresql.persistence.resourcePolicy": "deprecated", "anchoreGlobal.saml.useExistingSecret": "deprecated", "anchoreEnterpriseReports.service.workerPort": "deprecated", + "anchoreAnalyzer.concurrentTasksPerWorker": "deprecated", } POST_PROCESSING = { diff --git a/scripts/enterprise-value-converter/tests/test_anchoreAnalyzer_value_mapping.py b/scripts/enterprise-value-converter/tests/test_anchoreAnalyzer_value_mapping.py index 2f00ae51..52337394 100644 --- a/scripts/enterprise-value-converter/tests/test_anchoreAnalyzer_value_mapping.py +++ b/scripts/enterprise-value-converter/tests/test_anchoreAnalyzer_value_mapping.py @@ -227,23 +227,6 @@ def test_anchoreAnalyzer_cycleTimers_image_analyzer_value(self): result = replace_keys_with_mappings(dot_string_dict, self.results_dir) self.assertEqual(result[0], expected_result) - def test_anchoreAnalyzer_concurrentTasksPerWorker_value(self): - dot_string_dict = { - "anchoreAnalyzer.concurrentTasksPerWorker": 1, - } - expected_result = { - 'postgresql': {'auth': {'username': 'anchoreengine'}}, - 'anchoreConfig': { - 'user_authentication': {'hashed_passwords': False}, - 'analyzer': { - 'max_threads': 1 - } - } - - } - result = replace_keys_with_mappings(dot_string_dict, self.results_dir) - self.assertEqual(result[0], expected_result) - def test_anchoreAnalyzer_layerCacheMaxGigabytes_value(self): dot_string_dict = { "anchoreAnalyzer.layerCacheMaxGigabytes": 1, diff --git a/stable/enterprise/Chart.yaml b/stable/enterprise/Chart.yaml index 6e4aa212..543b6c4a 100644 --- a/stable/enterprise/Chart.yaml +++ b/stable/enterprise/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: enterprise -version: "2.1.1" +version: "2.1.2" appVersion: "5.1.0" kubeVersion: 1.23.x - 1.28.x || 1.23.x-x - 1.28.x-x description: | diff --git a/stable/enterprise/README.md b/stable/enterprise/README.md index a6bd80e7..57270882 100644 --- a/stable/enterprise/README.md +++ b/stable/enterprise/README.md @@ -1019,7 +1019,6 @@ This rollback procedure is designed to revert your environment to its pre-migrat | `anchoreConfig.apiext.external.hostname` | Hostname for the external Anchore API | `""` | | `anchoreConfig.apiext.external.port` | Port configured for external Anchore API | `8443` | | `anchoreConfig.analyzer.cycle_timers.image_analyzer` | The interval between checks of the work queue for new analysis jobs | `1` | -| `anchoreConfig.analyzer.max_threads` | The concurrency of the Anchore Analyzer worker process | `1` | | `anchoreConfig.analyzer.layer_cache_max_gigabytes` | Specify a cache size > 0GB to enable image layer caching | `0` | | `anchoreConfig.analyzer.enable_hints` | Enable a user-supplied 'hints' file to override and/or augment the software artifacts found during analysis | `false` | | `anchoreConfig.analyzer.configFile` | Custom Anchore Analyzer configuration file contents in YAML | `{}` | diff --git a/stable/enterprise/files/default_config.yaml b/stable/enterprise/files/default_config.yaml index 25dab56c..3058bab5 100644 --- a/stable/enterprise/files/default_config.yaml +++ b/stable/enterprise/files/default_config.yaml @@ -93,7 +93,6 @@ services: max_request_threads: ${ANCHORE_MAX_REQUEST_THREADS} cycle_timer_seconds: 1 cycle_timers: {{- toYaml .Values.anchoreConfig.analyzer.cycle_timers | nindent 6 }} - max_threads: ${ANCHORE_ANALYZER_MAX_THREADS} analyzer_driver: 'nodocker' layer_cache_enable: ${ANCHORE_LAYER_CACHE_ENABLED} layer_cache_max_gigabytes: ${ANCHORE_LAYER_CACHE_SIZE_GB} diff --git a/stable/enterprise/templates/envvars_configmap.yaml b/stable/enterprise/templates/envvars_configmap.yaml index e7bca972..05867815 100644 --- a/stable/enterprise/templates/envvars_configmap.yaml +++ b/stable/enterprise/templates/envvars_configmap.yaml @@ -10,7 +10,6 @@ data: ANCHORE_ADMIN_EMAIL: "{{ .Values.anchoreConfig.default_admin_email }}" ANCHORE_ALLOW_ECR_IAM_AUTO: "{{ .Values.anchoreConfig.allow_awsecr_iam_auto }}" ANCHORE_ANALYZER_TASK_REQUEUE: "true" - ANCHORE_ANALYZER_MAX_THREADS: "{{ .Values.anchoreConfig.analyzer.max_threads }}" ANCHORE_AUTH_ENABLE_HASHED_PASSWORDS: "{{ .Values.anchoreConfig.user_authentication.hashed_passwords }}" {{- with .Values.anchoreConfig.keys.publicKeyFileName }} ANCHORE_AUTH_PRIVKEY: "/home/anchore/certs/{{- . }}" diff --git a/stable/enterprise/tests/__snapshot__/configmap_test.yaml.snap b/stable/enterprise/tests/__snapshot__/configmap_test.yaml.snap index 21d95bfb..9128d237 100644 --- a/stable/enterprise/tests/__snapshot__/configmap_test.yaml.snap +++ b/stable/enterprise/tests/__snapshot__/configmap_test.yaml.snap @@ -129,7 +129,6 @@ should render the configmaps: cycle_timer_seconds: 1 cycle_timers: image_analyzer: 1 - max_threads: ${ANCHORE_ANALYZER_MAX_THREADS} analyzer_driver: 'nodocker' layer_cache_enable: ${ANCHORE_LAYER_CACHE_ENABLED} layer_cache_max_gigabytes: ${ANCHORE_LAYER_CACHE_SIZE_GB} @@ -375,7 +374,6 @@ should render the configmaps: data: ANCHORE_ADMIN_EMAIL: admin@myanchore ANCHORE_ALLOW_ECR_IAM_AUTO: "true" - ANCHORE_ANALYZER_MAX_THREADS: "1" ANCHORE_ANALYZER_TASK_REQUEUE: "true" ANCHORE_AUTH_ENABLE_HASHED_PASSWORDS: "true" ANCHORE_AUTH_PRIVKEY: "null" diff --git a/stable/enterprise/values.yaml b/stable/enterprise/values.yaml index e99cc0f8..8a75ce32 100644 --- a/stable/enterprise/values.yaml +++ b/stable/enterprise/values.yaml @@ -361,12 +361,6 @@ anchoreConfig: cycle_timers: image_analyzer: 1 - ## @param anchoreConfig.analyzer.max_threads The concurrency of the Anchore Analyzer worker process - ## Can be configured to process more than one task at a time. This is IO bound so may not necessarily be faster depending on hardware. - ## Operators should test and balance this value vs. number of Anchore Analyzer replicas deployed. - ## - max_threads: 1 - ## @param anchoreConfig.analyzer.layer_cache_max_gigabytes Specify a cache size > 0GB to enable image layer caching ## This chart sets up a scratch directory for all Anchore Analyzer pods using the values found at .Values.scratchVolume ## When setting .Values.anchoreConfig.analyzer.layer_cache_max_gigabytes, ensure the scratch volume has sufficient storage space