Merge pull request #357 from anchore/dev-sync

stable/enterprise: Update to v5.4.0
anchore · Apr 4, 2024 · b97b2d9 · b97b2d9
2 parents 0f7283a + ed09d3d
commit b97b2d9
Show file tree

Hide file tree

Showing 39 changed files with 1,141 additions and 1,039 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -76,8 +76,8 @@ jobs:
         kubectl --namespace anchore create secret docker-registry anchore-enterprise-pullcreds --docker-server=docker.io --docker-username="${DOCKER_USER}" --docker-password="${DOCKER_PASS}"
       env:
         ANCHORE_LICENSE: ${{ secrets.B64_ANCHORE_LICENSE }}
-        DOCKER_USER: ${{ secrets.ANCHORECI_DOCKER_USER }}
-        DOCKER_PASS: ${{ secrets.ANCHORECI_DOCKER_PASS }}
+        DOCKER_USER: ${{ secrets.ANCHOREREADONLY_DH_USERNAME }}
+        DOCKER_PASS: ${{ secrets.ANCHOREREADONLY_DH_PAT }}
 
     - name: Check if anchore-engine endpoint is required for admission controller chart
       id: engine_required

diff --git a/.github/workflows/values-converter-docker.yaml b/.github/workflows/values-converter-docker.yaml
@@ -20,8 +20,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
-          username: ${{ secrets.ANCHORECI_DOCKER_USER }}
-          password: ${{ secrets.ANCHORECI_DOCKER_PASS }}
+          username: ${{ secrets.ANCHOREDEVWRITE_DH_USERNAME }}
+          password: ${{ secrets.ANCHOREDEVWRITE_DH_PAT }}
 
       - name: Build and push
         id: docker_build

diff --git a/scripts/enterprise-value-converter/mappings.py b/scripts/enterprise-value-converter/mappings.py
@@ -110,7 +110,6 @@
     "anchore-feeds-db.persistence": "feeds.feeds-db.primary.persistence",
 
     "anchoreEnterpriseRbac.managerResources": "rbacManager.resources",
-    "anchoreEnterpriseRbac.authResources": "rbacAuth.resources",
 }
 
 LEVEL_THREE_CHANGE_KEY_MAPPING = {
@@ -217,7 +216,6 @@
     "anchoreCatalog.imageGCMaxWorkerThreads": "catalog.ANCHORE_CATALOG_IMAGE_GC_WORKERS",
 
     "anchoreEnterpriseNotifications.maxRequestThreads": "notifications.ANCHORE_MAX_REQUEST_THREADS",
-    "anchoreEnterpriseRbac.maxRequestThreads": "rbacAuth.ANCHORE_MAX_REQUEST_THREADS",
     "anchoreEnterpriseReports.maxRequestThreads": "reports.ANCHORE_MAX_REQUEST_THREADS",
 
     "anchoreGlobal.clientConnectTimeout": "ANCHORE_GLOBAL_CLIENT_CONNECT_TIMEOUT",
@@ -322,7 +320,7 @@
     },
     "anchoreEnterpriseRbac.extraEnv": {
         "action": "duplicate",
-        "new_keys": ["rbacAuth.extraEnv", "rbacManager.extraEnv"]
+        "new_keys": ["rbacManager.extraEnv"]
     },
     "anchoreEnterpriseGlobal.imagePullSecretName": {
         "action": "duplicate",

diff --git a/scripts/enterprise-value-converter/tests/test_anchoreEnterpriseRbac_value_mapping.py b/scripts/enterprise-value-converter/tests/test_anchoreEnterpriseRbac_value_mapping.py
diff --git a/stable/enterprise/Chart.lock b/stable/enterprise/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 17.11.8
 - name: feeds
   repository: https://charts.anchore.io/stable
-  version: 2.3.0
-digest: sha256:ea9b8927f17a3ee6cae7972dd7ff5a7a51ccafbf7f90443d978a096398c0834b
-generated: "2024-02-29T11:39:05.180607-08:00"
+  version: 2.4.0
+digest: sha256:9179b9a84b9f974b98c1182a25f7d5976a256371cee3733b9ffb9d09d7339c0f
+generated: "2024-04-03T17:23:43.082782-07:00"
diff --git a/stable/enterprise/Chart.yaml b/stable/enterprise/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: enterprise
-version: "2.4.2"
-appVersion: "5.3.0"
+version: "2.5.0"
+appVersion: "5.4.0"
 kubeVersion: 1.23.x - 1.28.x || 1.23.x-x - 1.29.x-x
 description: |
   Anchore Enterprise is a complete container security workflow solution for professional teams. Easily integrating with CI/CD systems,