Merge branch 'anchore-testin' into 'master'

SKIP CHECK CHANGES Anchore Enterprise by default

Closes big-bang/product/packages/anchore-enterprise#121, big-bang/product/packages/anchore-enterprise#130, and big-bang/product/packages/anchore-enterprise#131

See merge request !3915

chart/templates/anchore/values.yaml

@@ -38,12 +38,11 @@ networkPolicies:
     {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
     {{- toYaml (dig "values" "gateways" $gateway "selector" $default .Values.istio) | nindent 4 }}
 
-{{- if and .Values.addons.anchore.enterprise.enabled .Values.addons.anchore.enterprise.licenseYaml }}
+{{- if .Values.addons.anchore.enterprise.licenseYaml }}
 enterpriseLicenseYaml: |
   {{ .Values.addons.anchore.enterprise.licenseYaml | nindent 2 }}
 {{- end }}
 
-  {{- if .Values.addons.anchore.enterprise.enabled }}
 sso:
   enabled: {{ .Values.addons.anchore.sso.enabled }}
   spEntityId: {{ .Values.addons.anchore.sso.client_id }}
@@ -51,13 +50,12 @@ sso:
   acsUrl: https://{{ tpl ($anchoreUrl | default (printf "%s.%s" "anchore" $domainName)) . }}/service/sso/auth/keycloak
   idpMetadataUrl: "{{ include "sso.saml.descriptor" . }}"
   roleAttribute: {{ .Values.addons.anchore.sso.role_attribute }}
-  {{- end }}
 
-anchoreEnterpriseGlobal:
-  imagePullPolicy: {{ .Values.imagePullPolicy }}
-  enabled: {{ .Values.addons.anchore.enterprise.enabled }}
+global:
   imagePullSecretName: private-registry
 
+imagePullPolicy: {{ .Values.imagePullPolicy }}
+
 postgresql:
   {{- if .Values.istio.enabled }}
   podAnnotations:
@@ -73,35 +71,24 @@ postgresql:
   postgresPort: {{ .Values.addons.anchore.database.port }}
   {{- end }}
 
-anchoreGlobal:
-  {{- if .Values.istio.enabled }}
-  annotations:
-    {{ include "istioAnnotation" . }}
-  {{- end }}
-  imagePullPolicy: {{ .Values.imagePullPolicy }}
-  openShiftDeployment: {{ .Values.openshift }}
-  {{- if .Values.addons.anchore.adminPassword }}
-  defaultAdminPassword: {{ .Values.addons.anchore.adminPassword }}
-  {{- end }}
-  imagePullSecretName: private-registry
-
-{{- if .Values.addons.anchore.enterprise.enabled }}
-anchore-feeds-db:
-  {{- if .Values.istio.enabled }}
-  podAnnotations:
-    {{ include "istioAnnotation" . }}
-  {{- end }}
-  imagePullSecrets: private-registry
-  {{- if and .Values.addons.anchore.database.host .Values.addons.anchore.database.port .Values.addons.anchore.database.username .Values.addons.anchore.database.password .Values.addons.anchore.database.feeds_database }}
-  enabled: false
-  postgresUser: {{ .Values.addons.anchore.database.username }}
-  postgresPassword: {{ .Values.addons.anchore.database.password }}
-  postgresDatabase: {{ .Values.addons.anchore.database.feeds_database }}
-  externalEndpoint: "{{ .Values.addons.anchore.database.host }}"
-  postgresPort: {{ .Values.addons.anchore.database.port }}
-  {{- end }}
+feeds:
+  feeds-db:
+    {{- if .Values.istio.enabled }}
+    podAnnotations:
+      {{ include "istioAnnotation" . }}
+    {{- end }}
+    imagePullSecrets: private-registry
+    {{- if and .Values.addons.anchore.database.host .Values.addons.anchore.database.port .Values.addons.anchore.database.username .Values.addons.anchore.database.password .Values.addons.anchore.database.feeds_database }}
+    enabled: false
+    auth:
+      username: {{ .Values.addons.anchore.database.username }}
+      password: {{ .Values.addons.anchore.database.password }}
+      database: {{ .Values.addons.anchore.database.feeds_database }}
+    externalEndpoint: "{{ .Values.addons.anchore.database.host }}"
+    postgresPort: {{ .Values.addons.anchore.database.port }}
+    {{- end }}
 
-anchoreEnterpriseUi:
+ui:
   imagePullPolicy: {{ .Values.imagePullPolicy }}
   imagePullSecretName: private-registry
 
@@ -149,6 +136,5 @@ ui-redis:
       enabled: true
       namespace: monitoring
   {{- end }}
-{{- end }}
 
 {{- end }}

chart/values.yaml

@@ -1520,11 +1520,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/anchore-enterprise.git
       path: "./chart"
-      tag: "1.27.4-bb.7"
+      tag: "2.0.2-bb.0"
     helmRepo:
       repoName: "registry1"
       chartName: "anchore"
-      tag: "1.27.4-bb.7"
+      tag: "2.0.2-bb.0"
 
     # -- Flux reconciliation overrides specifically for the Anchore Package
     flux:
@@ -1536,10 +1536,7 @@ addons:
 
     # -- Anchore Enterprise functionality.
     enterprise:
-      # -- Toggle the installation of Anchore Enterprise.  This must be accompanied by a valid license.
-      enabled: false
-
-      # -- License for Anchore Enterprise.
+      # -- License for Anchore Enterprise. Enterprise is the only option available for the chart starting with chart major version 2.X.
       # For formatting examples see https://repo1.dso.mil/big-bang/product/packages/CHART.md#enabling-enterprise-services
       licenseYaml: |
         FULL LICENSE

tests/test-values.yaml

@@ -1571,9 +1571,8 @@ addons:
       enabled: false
       client_id: dev_00eb8904-5b88-4c68-ad67-cec0d2e07aa6_anchore
     enterprise:
-      enabled: false
       licenseYaml: |
-       "TBD"
+        "TBD"
     values:
       ensureDbJobs:
         resources:
@@ -1601,97 +1600,87 @@ addons:
               cpu: 100m
               memory: 200Mi
             limits: {}
-      anchoreAnalyzer:
+      analyzer:
         replicaCount: 1
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-      anchoreApi:
+      api:
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-      anchoreCatalog:
+      catalog:
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-      anchorePolicyEngine:
+      policyEngine:
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-      anchoreSimpleQueue:
+      simpleQueue:
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-      anchoreEngineUpgradeJob:
+      upgradeJob:
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-      anchore-feeds-db:
+      feeds:
+        enabled: true
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-        metrics:
+        feeds-db:
           resources:
             requests:
               cpu: 100m
               memory: 200Mi
             limits: {}
-      anchoreEnterpriseFeeds:
-        resources:
-          requests:
-            cpu: 100m
-            memory: 200Mi
-          limits: {}
-      anchoreEnterpriseFeedsUpgradeJob:
-        resources:
-          requests:
-            cpu: 100m
-            memory: 200Mi
-          limits: {}
-      anchoreEnterpriseRbac:
-        authResources:
-          requests:
-            cpu: 100m
-            memory: 200Mi
-          limits: {}
-        managerResources:
-          requests:
-            cpu: 100m
-            memory: 200Mi
-          limits: {}
-      anchoreEnterpriseReports:
+          metrics:
+            resources:
+              requests:
+                cpu: 100m
+                memory: 200Mi
+              limits: {}
+        feedsUpgradeJob:
+          resources:
+            requests:
+              cpu: 100m
+              memory: 200Mi
+            limits: {}
+      rbacManager:
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-      anchoreEnterpriseNotifications:
+      reports:
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-      anchoreEntperpiseUi:
+      notifications:
         resources:
           requests:
             cpu: 100m
             memory: 200Mi
           limits: {}
-      anchoreEnterpriseEngineUpgradeJob:
+      ui:
         resources:
           requests:
             cpu: 100m