Merge branch 'clear-confluence-kyverno' into 'master'

Revert "Mitigate automountServiceAccountToken findings in Confluence"

See merge request !3562

chart/templates/kyverno-policies/values.yaml

@@ -688,7 +688,6 @@ policies:
       - velero
       - neuvector
       - kiali
-      - confluence
       - harbor
       - authservice
       - anchore
@@ -810,11 +809,6 @@ policies:
         # notifications bot pods interact with secrets, configmaps, and CRDs
         # More details in argocd/chart/templates/argocd-notifications/bots/slack/role.yaml
         - argocd-argocd-notifications-controller-*
-      - namespace: confluence
-        pods:
-        # confluence pods require get/list on endpoints, pods, and nodes
-        # More details in confluence/chart/templates/clusterrole.yaml
-        - confluence-?
       - namespace: harbor
         serviceAccounts: 
         - harbor-redis-bb

tests/test-values.yaml

@@ -120,11 +120,11 @@ kiali:
           #cypress_keycloak_password: "tnr_w!G33ZyAt@C8"
         resources:
           requests:
-            cpu: 2
-            memory: 2Gi
+            cpu: 3
+            memory: 4Gi
           limits:
-            cpu: 2
-            memory: 2Gi
+            cpu: 3
+            memory: 4Gi
 
 
 clusterAuditor: