updates for 2.0

Author: stencell

apps/etherpad/dev-placement-rule.yaml

@@ -5,8 +5,8 @@ metadata:
   namespace: etherpad
 spec:
   clusterConditions:
-    - type: OK
+    - type: ManagedClusterConditionAvailable
+      status: "True"
   clusterSelector:
-    matchExpressions: []
     matchLabels:
       environment: dev

resources/policies/cert_expiration.yaml

@@ -1,31 +1,28 @@
-apiVersion: policy.mcm.ibm.com/v1alpha1
+---
+apiVersion: policy.open-cluster-management.io/v1
 kind: Policy
 metadata:
   name: policy-certificate
   namespace: rhacm-policies
 spec:
-  complianceType: musthave
+  remediationAction: inform
   disabled: false
-  namespaces: {}
   policy-templates:
-  - objectDefinition:
-      apiVersion: policies.ibm.com/v1alpha1
-      kind: CertificatePolicy
-      metadata:
-        name: policy-certificatepolicy-example
-      spec:
-        minimumDuration: 2200h
-        namespaceSelector:
-          exclude: []
-          include:
-          - openshift-ingress
-        remediationAction: inform
-        severity: low
-    status:
-      Validity: {}
-  remediationAction: inform
+    - objectDefinition:
+        apiVersion: policy.open-cluster-management.io/v1
+        kind: CertificatePolicy
+        metadata:
+          name: policy-certificate-example
+        spec:
+          namespaceSelector:
+            include:
+            - openshift-ingress
+            exclude: []
+          remediationAction: inform
+          severity: low
+          minimumDuration: 2200h
 ---
-apiVersion: mcm.ibm.com/v1alpha1
+apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
 metadata:
   name: certificate-placement-binding
@@ -37,4 +34,4 @@ placementRef:
 subjects:
 - name: policy-certificate
   kind: Policy
-  apiGroup: policy.mcm.ibm.com
+  apiGroup: policy.open-cluster-management.io

resources/policies/config_limitrange.yaml

@@ -1,42 +1,49 @@
-apiVersion: policy.mcm.ibm.com/v1alpha1
+apiVersion: policy.open-cluster-management.io/v1
 kind: Policy
 metadata:
-  name: policy-configuration
-  namespace: rhacm-policies 
+  name: policy-limitmemory
+  namespace: rhacm-policies
 spec:
-  complianceType: musthave
   remediationAction: enforce
-  namespaces:
-    exclude:
-    - kube-*
-    - openshift-*
-    - openshift
-    - default
-    - multicluster-endpoint
-    include:
-    - '*'
-  object-templates:
-    - complianceType: musthave
-      namespaces:
-        exclude:
-      objectDefinition:
-        apiVersion: v1
-        kind: LimitRange
+  disabled: false
+  policy-templates:
+    - objectDefinition:
+        apiVersion: policy.open-cluster-management.io/v1
+        kind: ConfigurationPolicy
         metadata:
-          name: default-limit-range
+          name: policy-limitrange
         spec:
-          limits:
-          - type: Container
-            default:
-              cpu: 500m
-              memory: 512Mi
-            defaultRequest:
-              cpu: 50m
-              memory: 256Mi
-            max:
-              cpu: 2
-              memory: 4Gi
-          - type: Pod
-            max:
-              cpu: 4
-              memory: 8Gi
+          severity: medium
+          namespaceSelector:
+            exclude:
+            - kube-*
+            - openshift-*
+            - openshift
+            - open-cluster*
+            - default
+            - multicluster-endpoint
+            include:
+            - '*'
+          object-templates:
+            - complianceType: musthave
+              objectDefinition:
+                apiVersion: v1
+                kind: LimitRange
+                metadata:
+                  name: default-limit-range
+                spec:
+                  limits:
+                  - type: Container
+                    default:
+                      cpu: 500m
+                      memory: 512Mi
+                    defaultRequest:
+                      cpu: 50m
+                      memory: 256Mi
+                    max:
+                      cpu: 2
+                      memory: 4Gi
+                  - type: Pod
+                    max:
+                      cpu: 4
+                      memory: 8Gi

resources/policies/config_placement_binding.yaml

@@ -1,13 +1,13 @@
-apiVersion: mcm.ibm.com/v1alpha1
+apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
 metadata:
-  name: config-placement-binding
+  name: binding-policy-limitmemory
   namespace: rhacm-policies
 placementRef:
   name: dev-clusters
   kind: PlacementRule
   apiGroup: apps.open-cluster-management.io
 subjects:
-- name: policy-configuration
+- name: policy-limitmemory
   kind: Policy
-  apiGroup: policy.mcm.ibm.com
+  apiGroup: policy.open-cluster-management.io

resources/policies/config_placement_rule.yaml

@@ -5,7 +5,8 @@ metadata:
   namespace: rhacm-policies
 spec:
   clusterConditions:
-  - type: OK
+  - type: ManagedClusterConditionAvailable
+    status: "True"
   clusterSelector:
     matchExpressions:
       - key: environment

resources/policies/iam.yaml

@@ -1,26 +1,25 @@
-apiVersion: policy.mcm.ibm.com/v1alpha1
+apiVersion: policy.open-cluster-management.io/v1
 kind: Policy
 metadata:
-  name: policy-iam
+  name: policy-limitclusteradmin
   namespace: rhacm-policies
 spec:
   complianceType: musthave
   remediationAction: inform
   disabled: false
-  namespaces: {}
   policy-templates:
     - objectDefinition:
-        apiVersion: iam.policies.ibm.com/v1alpha1
+        apiVersion: policy.open-cluster-management.io/v1
         kind: IamPolicy
         metadata:
-          name: policy-clusteradmin
+          name: policy-limitclusteradmin-example
         spec:
           severity: medium
           namespaceSelector: {}
           remediationAction: inform
-          maxClusterRoleBindingUsers: 3
+          maxClusterRoleBindingUsers: 5
 ---
-apiVersion: mcm.ibm.com/v1alpha1
+apiVersion: policy.open-cluster-management.io/v1
 kind: PlacementBinding
 metadata:
   name: binding-policy-iam
@@ -32,4 +31,4 @@ placementRef:
 subjects:
 - name: policy-iam
   kind: Policy
-  apiGroup: policy.mcm.ibm.com
+  apiGroup: policy.open-cluster-management.io