fix kuttl test

openshift-kni · Feb 15, 2024 · 7b223ce · 7b223ce
1 parent ea796d6
commit 7b223ce
Show file tree

Hide file tree

Showing 62 changed files with 4,114 additions and 4,103 deletions.
diff --git a/tests/kuttl/tests/adjust-max-concurrency/00-assert.yaml b/tests/kuttl/tests/adjust-max-concurrency/00-assert.yaml
@@ -5,55 +5,55 @@ metadata:
   namespace: default
 spec:
   clusters:
-  - spoke1
+    - spoke1
   enable: false
   managedPolicies:
-  - policy1-common-cluster-version-policy
-  - policy2-common-pao-sub-policy
+    - policy1-common-cluster-version-policy
+    - policy2-common-pao-sub-policy
   remediationStrategy:
     maxConcurrency: 3
     timeout: 240
 status:
   computedMaxConcurrency: 1
   conditions:
-  - message: All selected clusters are valid
-    reason: ClusterSelectionCompleted
-    status: "True"
-    type: ClustersSelected
-  - message: Completed validation
-    reason: ValidationCompleted
-    status: "True"
-    type: Validated
-  - message: Not enabled
-    reason: NotEnabled
-    status: "False"
-    type: Progressing
+    - message: All selected clusters are valid
+      reason: ClusterSelectionCompleted
+      status: "True"
+      type: ClustersSelected
+    - message: Completed validation
+      reason: ValidationCompleted
+      status: "True"
+      type: Validated
+    - message: Not enabled
+      reason: NotEnabled
+      status: "False"
+      type: Progressing
   copiedPolicies:
-  - cgu-adjust-max-conc-policy1-common-cluster-versio-kuttl
-  - cgu-adjust-max-conc-policy2-common-pao-sub-policy-kuttl
+    - cgu-adjust-max-conc-policy1-common-cluster-versio-kuttl
+    - cgu-adjust-max-conc-policy2-common-pao-sub-policy-kuttl
   managedPoliciesContent:
     policy2-common-pao-sub-policy: '[{"kind":"Subscription","name":"performance-addon-operator","apiVersion":"operators.coreos.com/v1alpha1","namespace":"openshift-performance-addon-operator"}]'
   managedPoliciesForUpgrade:
-  - name: policy1-common-cluster-version-policy
-    namespace: default
-  - name: policy2-common-pao-sub-policy
-    namespace: default
+    - name: policy1-common-cluster-version-policy
+      namespace: default
+    - name: policy2-common-pao-sub-policy
+      namespace: default
   managedPoliciesNs:
     policy1-common-cluster-version-policy: default
     policy2-common-pao-sub-policy: default
   placementBindings:
-  - cgu-adjust-max-conc-policy1-common-cluster-version-policy-placement-kuttl
-  - cgu-adjust-max-conc-policy2-common-pao-sub-policy-placement-kuttl
+    - cgu-adjust-max-conc-policy1-common-cluster-version-policy-placement-kuttl
+    - cgu-adjust-max-conc-policy2-common-pao-sub-policy-placement-kuttl
   placementRules:
-  - cgu-adjust-max-conc-policy1-common-cluster-version-policy-placement-kuttl
-  - cgu-adjust-max-conc-policy2-common-pao-sub-policy-placement-kuttl
+    - cgu-adjust-max-conc-policy1-common-cluster-version-policy-placement-kuttl
+    - cgu-adjust-max-conc-policy2-common-pao-sub-policy-placement-kuttl
   remediationPlan:
-  - - spoke1
+    - - spoke1
   safeResourceNames:
-    cgu-adjust-max-conc-common-cluster-version-policy-config: cgu-adjust-max-conc-common-cluster-version-policy-config-kuttl
-    cgu-adjust-max-conc-common-pao-sub-policy-config: cgu-adjust-max-conc-common-pao-sub-policy-config-kuttl
-    cgu-adjust-max-conc-policy1-common-cluster-version-policy: cgu-adjust-max-conc-policy1-common-cluster-versio-kuttl
-    cgu-adjust-max-conc-policy1-common-cluster-version-policy-placement: cgu-adjust-max-conc-policy1-common-cluster-version-policy-placement-kuttl
-    cgu-adjust-max-conc-policy2-common-pao-sub-policy: cgu-adjust-max-conc-policy2-common-pao-sub-policy-kuttl
-    cgu-adjust-max-conc-policy2-common-pao-sub-policy-placement: cgu-adjust-max-conc-policy2-common-pao-sub-policy-placement-kuttl
+    /cgu-adjust-max-conc-common-cluster-version-policy-config: cgu-adjust-max-conc-common-cluster-version-policy-config-kuttl
+    /cgu-adjust-max-conc-common-pao-sub-policy-config: cgu-adjust-max-conc-common-pao-sub-policy-config-kuttl
+    default/cgu-adjust-max-conc-policy1-common-cluster-version-policy: cgu-adjust-max-conc-policy1-common-cluster-versio-kuttl
+    default/cgu-adjust-max-conc-policy1-common-cluster-version-policy-placement: cgu-adjust-max-conc-policy1-common-cluster-version-policy-placement-kuttl
+    default/cgu-adjust-max-conc-policy2-common-pao-sub-policy: cgu-adjust-max-conc-policy2-common-pao-sub-policy-kuttl
+    default/cgu-adjust-max-conc-policy2-common-pao-sub-policy-placement: cgu-adjust-max-conc-policy2-common-pao-sub-policy-placement-kuttl
   status: {}
diff --git a/tests/kuttl/tests/backup-complete/00-assert.yaml b/tests/kuttl/tests/backup-complete/00-assert.yaml
@@ -5,17 +5,17 @@ metadata:
   namespace: default
 spec:
   clusters:
-  - spoke6
-  - spoke2
-  - spoke1
-  - spoke5
+    - spoke6
+    - spoke2
+    - spoke1
+    - spoke5
   enable: true
   backup: true
   managedPolicies:
-  - policy0-common-config-policy
-  - policy2-common-pao-sub-policy
-  - policy3-common-ptp-sub-policy
-  - policy4-common-sriov-sub-policy
+    - policy0-common-config-policy
+    - policy2-common-pao-sub-policy
+    - policy3-common-ptp-sub-policy
+    - policy4-common-sriov-sub-policy
   remediationStrategy:
     maxConcurrency: 4
     timeout: 240
@@ -28,57 +28,57 @@ status:
       spoke6: Starting
   computedMaxConcurrency: 4
   conditions:
-  - message: All selected clusters are valid
-    reason: ClusterSelectionCompleted
-    status: "True"
-    type: ClustersSelected
-  - message: Completed validation
-    reason: ValidationCompleted
-    status: "True"
-    type: Validated
-  - message: Backup in progress for 4 clusters
-    reason: InProgress
-    status: "False"
-    type: BackupSuceeded
-  - message: Cluster backup is in progress
-    reason: NotStarted
-    status: "False"
-    type: Progressing
+    - message: All selected clusters are valid
+      reason: ClusterSelectionCompleted
+      status: "True"
+      type: ClustersSelected
+    - message: Completed validation
+      reason: ValidationCompleted
+      status: "True"
+      type: Validated
+    - message: Backup in progress for 4 clusters
+      reason: InProgress
+      status: "False"
+      type: BackupSuceeded
+    - message: Cluster backup is in progress
+      reason: NotStarted
+      status: "False"
+      type: Progressing
   copiedPolicies:
-  - cgu-policy3-common-ptp-sub-policy-kuttl
-  - cgu-policy4-common-sriov-sub-policy-kuttl
+    - cgu-policy3-common-ptp-sub-policy-kuttl
+    - cgu-policy4-common-sriov-sub-policy-kuttl
   managedPoliciesCompliantBeforeUpgrade:
-  - policy0-common-config-policy
-  - policy2-common-pao-sub-policy
+    - policy0-common-config-policy
+    - policy2-common-pao-sub-policy
   managedPoliciesContent:
     policy3-common-ptp-sub-policy: '[{"kind":"Subscription","name":"ptp-operator-subscription","apiVersion":"operators.coreos.com/v1alpha1","namespace":"openshift-ptp"}]'
     policy4-common-sriov-sub-policy: '[{"kind":"Subscription","name":"sriov-network-operator-subscription","apiVersion":"operators.coreos.com/v1alpha1","namespace":"openshift-sriov-network-operator"}]'
   managedPoliciesForUpgrade:
-  - name: policy3-common-ptp-sub-policy
-    namespace: default
-  - name: policy4-common-sriov-sub-policy
-    namespace: default
+    - name: policy3-common-ptp-sub-policy
+      namespace: default
+    - name: policy4-common-sriov-sub-policy
+      namespace: default
   managedPoliciesNs:
     policy3-common-ptp-sub-policy: default
     policy4-common-sriov-sub-policy: default
   placementBindings:
-  - cgu-policy3-common-ptp-sub-policy-placement-kuttl
-  - cgu-policy4-common-sriov-sub-policy-placement-kuttl
+    - cgu-policy3-common-ptp-sub-policy-placement-kuttl
+    - cgu-policy4-common-sriov-sub-policy-placement-kuttl
   placementRules:
-  - cgu-policy3-common-ptp-sub-policy-placement-kuttl
-  - cgu-policy4-common-sriov-sub-policy-placement-kuttl
+    - cgu-policy3-common-ptp-sub-policy-placement-kuttl
+    - cgu-policy4-common-sriov-sub-policy-placement-kuttl
   remediationPlan:
-  - - spoke6
-    - spoke2
-    - spoke1
-    - spoke5
+    - - spoke6
+      - spoke2
+      - spoke1
+      - spoke5
   safeResourceNames:
-    cgu-common-ptp-sub-policy-config: cgu-common-ptp-sub-policy-config-kuttl
-    cgu-common-sriov-sub-policy-config: cgu-common-sriov-sub-policy-config-kuttl
-    cgu-policy3-common-ptp-sub-policy: cgu-policy3-common-ptp-sub-policy-kuttl
-    cgu-policy3-common-ptp-sub-policy-placement: cgu-policy3-common-ptp-sub-policy-placement-kuttl
-    cgu-policy4-common-sriov-sub-policy: cgu-policy4-common-sriov-sub-policy-kuttl
-    cgu-policy4-common-sriov-sub-policy-placement: cgu-policy4-common-sriov-sub-policy-placement-kuttl
+    /cgu-common-ptp-sub-policy-config: cgu-common-ptp-sub-policy-config-kuttl
+    /cgu-common-sriov-sub-policy-config: cgu-common-sriov-sub-policy-config-kuttl
+    default/cgu-policy3-common-ptp-sub-policy: cgu-policy3-common-ptp-sub-policy-kuttl
+    default/cgu-policy3-common-ptp-sub-policy-placement: cgu-policy3-common-ptp-sub-policy-placement-kuttl
+    default/cgu-policy4-common-sriov-sub-policy: cgu-policy4-common-sriov-sub-policy-kuttl
+    default/cgu-policy4-common-sriov-sub-policy-placement: cgu-policy4-common-sriov-sub-policy-placement-kuttl
 ---
 #MCAs
 apiVersion: action.open-cluster-management.io/v1beta1
@@ -123,7 +123,7 @@ spec:
   actionType: Delete
   kube:
     name: backup-agent
-    resource: clusterrolebinding    
+    resource: clusterrolebinding
 ---
 apiVersion: action.open-cluster-management.io/v1beta1
 kind: ManagedClusterAction
@@ -145,7 +145,7 @@ spec:
   actionType: Delete
   kube:
     name: backup-agent
-    resource: clusterrolebinding    
+    resource: clusterrolebinding
 ---
 apiVersion: action.open-cluster-management.io/v1beta1
 kind: ManagedClusterAction
@@ -167,7 +167,7 @@ spec:
   actionType: Delete
   kube:
     name: backup-agent
-    resource: clusterrolebinding    
+    resource: clusterrolebinding
 ---
 #MCVs
 apiVersion: view.open-cluster-management.io/v1beta1