Template fixes - 8081 & 8088

src-web/components/common/templates/index.js

@@ -9,34 +9,34 @@
 /* Copyright (c) 2020 Red Hat, Inc. */
 'use strict'
 
-import specPodRole from './spec-rolebinding.yaml'
-import specPodSecurity from './spec-psp.yaml'
-import specPodLimit from './spec-mem-limit.yaml'
-import specPodExists from './spec-pod.yaml'
-import specRoles from './spec-roles.yaml'
-import specNamespace from './spec-namespace.yaml'
-import specClustadminrole from './spec-clusteradminrole.yaml'
 import specCertmgmtexp from './spec-certmgmtexp.yaml'
-import specScc from './spec-scc.yaml'
-import specImv from './spec-imagemanifestvuln.yaml'
+import specClusteradminrole from './spec-clusteradminrole.yaml'
+import specCompOperator from './spec-comp-operator.yaml'
+import specContainerMemLimit from './spec-container-mem-limit.yaml'
 import specEtcdEncryption from './spec-etcd-encryption.yaml'
 import specGatekeeper from './spec-gatekeeper.yaml'
-import specCompOperator from './spec-comp-operator.yaml'
+import specImagemanifestvuln from './spec-imagemanifestvuln.yaml'
+import specNamespace from './spec-namespace.yaml'
+import specPodExists from './spec-pod-exists.yaml'
+import specPodSecurity from './spec-pod-security.yaml'
+import specRolebinding from './spec-rolebinding.yaml'
+import specRoles from './spec-roles.yaml'
+import specScc from './spec-scc.yaml'
 
 const Choices = {
-  specPodRole,
-  specPodSecurity,
-  specPodLimit,
-  specPodExists,
-  specRoles,
-  specNamespace,
-  specClustadminrole,
   specCertmgmtexp,
-  specScc,
-  specImv,
+  specClusteradminrole,
+  specCompOperator,
+  specContainerMemLimit,
   specEtcdEncryption,
   specGatekeeper,
-  specCompOperator,
+  specImagemanifestvuln,
+  specNamespace,
+  specPodExists,
+  specPodSecurity,
+  specRolebinding,
+  specRoles,
+  specScc,
 }
 
 export default Choices

src-web/components/common/templates/spec-certmgmtexp.yaml

@@ -2,7 +2,7 @@
 name:
   CertificatePolicy
 description:
-  cert management expiration
+  Certificate management expiration
 multiselect:
   specs
 replacements: # if user select this choice, the template variable names and values to use
@@ -17,7 +17,7 @@ replacements: # if user select this choice, the template variable names and valu
         apiVersion: policy.open-cluster-management.io/v1
         kind: CertificatePolicy # cert management expiration
         metadata:
-          name: {{name}}-example
+          name: {{name}}-cert-expiration
         spec:
           namespaceSelector:
             include: ["default"]

src-web/components/common/templates/spec-clusteradminrole.yaml

@@ -2,7 +2,7 @@
 name:
   IamPolicy
 description:
-  limit clusteradminrole and report violation
+  Limit clusteradmin roles
 multiselect:
   specs
 replacements: # if user select this choice, the template variable names and values to use
@@ -15,9 +15,9 @@ replacements: # if user select this choice, the template variable names and valu
   policyTemplates: |
     - objectDefinition:
         apiVersion: policy.open-cluster-management.io/v1
-        kind: IamPolicy # limit clusteradminrole and report violation
+        kind: IamPolicy # limit clusteradmin roles
         metadata:
-          name: {{name}}-example
+          name: {{name}}-limit-clusteradmin
         spec:
           severity: medium
           namespaceSelector:

src-web/components/common/templates/spec-comp-operator.yaml

@@ -2,7 +2,7 @@
 name:
   ComplianceOperator
 description:
-  install the Compliance operator
+  Install the Compliance operator
 multiselect:
   specs
 replacements: # if user select this choice, the template variable names and values to use

src-web/components/common/templates/spec-mem-limit.yaml → src-web/components/common/templates/spec-container-mem-limit.yaml

@@ -2,7 +2,7 @@
 name:
   LimitRange
 description:
-  limit memory usage
+  Limit container memory usage
 multiselect:
   specs
 replacements: # if user select this choice, the template variable names and values to use
@@ -17,7 +17,7 @@ replacements: # if user select this choice, the template variable names and valu
         apiVersion: policy.open-cluster-management.io/v1
         kind: ConfigurationPolicy
         metadata:
-          name: {{name}}-mem-limit-range
+          name: {{name}}-container-mem-limit-range
         spec:
           remediationAction: inform # will be overridden by remediationAction in parent policy
           severity: medium
@@ -30,7 +30,7 @@ replacements: # if user select this choice, the template variable names and valu
                 apiVersion: v1
                 kind: LimitRange # limit memory usage
                 metadata:
-                  name: mem-limit-range
+                  name: container-mem-limit-range
                 spec:
                   limits:
                   - default:

src-web/components/common/templates/spec-etcd-encryption.yaml

@@ -2,7 +2,7 @@
 name:
   EtcdEncryption
 description:
-  Enable Etcd Encryption
+  Enable etcd encryption
 multiselect:
   specs
 replacements: # if user select this choice, the template variable names and values to use
@@ -17,7 +17,7 @@ replacements: # if user select this choice, the template variable names and valu
         apiVersion: policy.open-cluster-management.io/v1
         kind: ConfigurationPolicy
         metadata:
-          name: {{name}}-example
+          name: {{name}}-etcd-encryption
         spec:
           remediationAction: inform # will be overridden by remediationAction in parent policy
           severity: med

src-web/components/common/templates/spec-gatekeeper.yaml

@@ -2,7 +2,7 @@
 name:
   GatekeeperOperator
 description:
-  install the Gatekeeper operator
+  Install the Gatekeeper operator
 multiselect:
   specs
 replacements: # if user select this choice, the template variable names and values to use