Revert "Resolve conflicts"

This reverts commit 00b5f3c4, reversing
changes made to b7980fa5.

chart/templates/anchore/values.yaml

@@ -58,6 +58,10 @@ anchoreGlobal:
   defaultAdminPassword: {{ .Values.addons.anchore.adminPassword }}
   {{- end }}
   imagePullSecretName: private-registry
+  {{- if or (and (not (hasKey .Values.addons.anchore.values "anchoreGlobal.existingSecret")) (not (hasKey .Values.addons.anchore.values "anchoreGlobal.saml.useExistingSecret"))) (not (hasKey .Values.addons.anchore.values "anchoreGlobal.saml.secret")) }}
+  saml:
+    secret: "{{ b64enc (randAlphaNum 12) }}"
+  {{- end }}
 
 {{- if .Values.addons.anchore.enterprise.enabled }}
 anchore-feeds-db:

chart/values.yaml

@@ -94,7 +94,7 @@ flux:
 
 # -- Global NetworkPolicies settings
 networkPolicies:
-  # -- Toggle all package NetworkPolicies, can disable specific packages with `package.values.networkPolicies.enabled`
+  # -- Toggle all package NetworkPolicies, can disable specific packages with `package.networkPolicies.enabled`
   enabled: true
   # -- Control Plane CIDR, defaults to 0.0.0.0/0, use `kubectl get endpoints -n default kubernetes` to get the CIDR range needed for your cluster
   # Must be an IP CIDR range (x.x.x.x/x - ideally with /32 for the specific IP of a single endpoint, broader range for multiple masters/endpoints)
@@ -110,7 +110,7 @@ istio:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/istio-controlplane.git
     path: "./chart"
-    tag: "1.10.3-bb.0"
+    tag: "1.9.7-bb.0"
 
   # Ingress gateways are created based on the key name.  Adding more keys will add ingress gateways.
   # Ingress gateways are setup in a Horizontal Pod Autoscaler with 1 to 5 replicas
@@ -172,7 +172,7 @@ istiooperator:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/istio-operator.git
     path: "./chart"
-    tag: "1.10.3-bb.0"
+    tag: "1.9.7-bb.1"
 
   # -- Flux reconciliation overrides specifically for the Istio Operator Package
   flux: {}
@@ -224,7 +224,7 @@ kiali:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/kiali.git
     path: "./chart"
-    tag: "1.39.0-bb.0"
+    tag: "1.37.0-bb.3"
 
   # -- Flux reconciliation overrides specifically for the Kiali Package
   flux: {}
@@ -511,7 +511,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/authservice.git
       path: "./chart"
-      tag: "0.4.0-bb.14"
+      tag: "0.4.0-bb.13"
 
     # -- Flux reconciliation overrides specifically for the Authservice Package
     flux: {}
@@ -675,7 +675,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/nexus.git
       path: "./chart"
-      tag: "29.1.0-bb.8"
+      tag: "29.1.0-bb.7"
 
     # -- Base64 encoded license file.
     license_key: ""
@@ -816,7 +816,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git
       path: "./chart"
-      tag: "1.13.0-bb.7"
+      tag: "1.13.0-bb.6"
 
     # -- Flux reconciliation overrides specifically for the Anchore Package
     flux:

charter/NewPackageRequests.md

@@ -13,4 +13,4 @@ To get into an incubation stage, an package needs the following:
 
 ## Full Membership
 
-Once the package adheres to all [Package Requirements](PackageRequirements.md), a final review of implementation details will be presented to the Big Bang Admins.
+Once the package adheres to all [Package Requirements](Package Requirements.md), a final review of implementation details will be presented to the Big Bang Admins.

charter/PackageOwner.md

@@ -18,7 +18,7 @@ Package owners will be responsible for the following:
 
 Package Owners will be identified by the use of [CODEOWNERS](https://docs.gitlab.com/ee/user/project/code_owners.html) files in the repository.
 
-There must be at least 3 (three) Package owners for each application and they shall be from different companies. Inactive Package owners from different Value Streams or external vendors shall be removed.
+There must be at least 2 (two) Package owners for each application and they shall be from different companies.
 
 ## Package Shadows
 

tests/ci/k3d/values.yaml

@@ -20,9 +20,6 @@ logging:
           requests:
             cpu: .5
           limits: {}
-        heap:
-          min: 1g
-          max: 1g
       data:
         count: 2
         persistence:
@@ -31,9 +28,6 @@ logging:
           requests:
             cpu: .5
           limits: {}
-        heap:
-          min: 1g
-          max: 1g
     kibana:
       count: 1