Merge branch '2022.4' into migratingToTrivyOperator

Author: mjshastha

cyber_center/ecs/cloudformation/aqua-ecs-fargate/README.adoc

@@ -35,8 +35,6 @@ A CloudFormation template is used to deploy Cyber Center.
 
 [source,options="nowrap",subs="attributes"]
 ----
-docker pull registry.aquasec.com/cc-standard:latest
-or
 docker pull registry.aquasec.com/cc-premium:latest
 ----
 

cyber_center/kubernetes_and_openshift/manifests/002_cybercenter_deploy.yaml

@@ -41,7 +41,7 @@ spec:
         fsGroup: 11433
       containers:
       - name: aqua-cc
-        image: "registry.aquasec.com/cc-standard:latest"
+        image: "registry.aquasec.com/cc-premium:latest"
         imagePullPolicy: Always
         args:
         - --address=:5000

cyber_center/kubernetes_and_openshift/manifests/README.md

@@ -22,10 +22,9 @@ It is recommended that you complete the sizing and capacity assessment for the d
 
 ### CyberCenter image for deployment
 
-The CyberCenter image is added in the [CyberCenter deploy yaml file](./002_cybercenter_deploy.yaml#L40) at the line 40. You can use one of the two following CyberCenter images:
+The required CyberCenter image is added in the [CyberCenter deploy yaml file](./002_cybercenter_deploy.yaml#L44) at the line 44. The deployment uses the following image:
 
-* **cc-standard:latest**: is used for support on vulnerabilities related to all the operating systems. This image is used in the deployment yaml file.
-* **cc-premium:latest**: is used to get support on vulnerabilities related to all the programming languages including the operating systems.
+* **cc-premium:latest**: Provides support for identifying vulnerabilities related to all supported programming languages and operating systems.
 
 ### mTLS
 

enforcers/kube_enforcer/kubernetes_and_openshift/manifests/kube_enforcer_ocp3x/001_kube_enforcer_config.yaml

@@ -231,7 +231,7 @@ metadata:
   name: configauditreports.aquasecurity.github.io
   labels:
     app.kubernetes.io/managed-by: starboard
-    app.kubernetes.io/version: "0.15.24"
+    app.kubernetes.io/version: "0.15.25"
 spec:
   group: aquasecurity.github.io
   versions:
@@ -362,7 +362,7 @@ metadata:
   labels:
     app.kubernetes.io/name: starboard-operator
     app.kubernetes.io/instance: starboard-operator
-    app.kubernetes.io/version: "0.15.24"
+    app.kubernetes.io/version: "0.15.25"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

enforcers/kube_enforcer/kubernetes_and_openshift/manifests/kube_enforcer_ocp3x/003_kube_enforcer_deploy.yaml

@@ -114,7 +114,7 @@ spec:
       securityContext: {}
       containers:
         - name: operator
-          image: docker.io/aquasec/starboard-operator:0.15.24
+          image: docker.io/aquasec/starboard-operator:0.15.25
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: false