sync the lsr recipe changes into common recipe

Signed-off-by: YuChen <[email protected]>

Author: YCShen1010

velero/spectrum-fusion/recipes/4.7-example-recipe-multi-ns-multi-zen.yaml

@@ -291,7 +291,7 @@ spec:
       selectResource: deployment
       timeout: 600
       type: check
-    - chks:
+   - chks:
         - condition: '{$.status.phase} == {"Running"}'
           name: podReady
           onError: fail
@@ -303,6 +303,18 @@ spec:
       selectResource: pod
       timeout: 600
       type: check
+    - chks:
+        - condition: '{$.status.phase} == {"Running"}'
+          name: podReady
+          onError: fail
+          timeout: 600
+      name: license-service-reporter-instance-check
+      labelSelector: app.kubernetes.io/instance=ibm-license-service-reporter
+      namespace: <lsr namespace>
+      onError: fail
+      selectResource: pod
+      timeout: 600
+      type: check
     - chks:
         - condition: '{$.spec.replicas} == {$.status.readyReplicas}'
           name: podReady
@@ -522,7 +534,7 @@ spec:
         - group: common-services-operatorgroups
         - group: common-services-configmaps
         - group: license-service-reporter-crd
-        - group: commonservices-crd
+        - group: commonservice-crd
         - group: commonservice-cr
         - group: nss-resources
         - group: singleton-subscriptions
@@ -553,6 +565,7 @@ spec:
         - group: license-service-reporter-subscriptions
         - hook: license-service-reporter-check/podReady
         - group: license-service-reporter-instances
+        - hook: license-service-reporter-instance-check/podReady
         - group: lsr-pre-deploy
         - group: lsr-volume
         - group: lsr-deployment

velero/spectrum-fusion/recipes/4.7-example-recipe-multi-ns.yaml

@@ -303,6 +303,18 @@ spec:
       selectResource: pod
       timeout: 600
       type: check
+    - chks:
+        - condition: '{$.status.phase} == {"Running"}'
+          name: podReady
+          onError: fail
+          timeout: 600
+      name: license-service-reporter-instance-check
+      labelSelector: app.kubernetes.io/instance=ibm-license-service-reporter
+      namespace: <lsr namespace>
+      onError: fail
+      selectResource: pod
+      timeout: 600
+      type: check
     - chks:
         - condition: '{$.spec.replicas} == {$.status.readyReplicas}'
           name: podReady
@@ -462,6 +474,8 @@ spec:
         - group: common-services-operatorgroups
         - group: common-services-configmaps
         - group: license-service-reporter-crd
+        - group: commonservice-crd
+        - group: commonservice-cr
         - group: singleton-subscriptions
         - group: cert-manager-resources
         - group: license-service-reporter-subscriptions
@@ -493,6 +507,7 @@ spec:
         - group: license-service-reporter-subscriptions
         - hook: license-service-reporter-check/podReady
         - group: license-service-reporter-instances
+        - hook: license-service-reporter-instance-check/podReady
         - group: lsr-pre-deploy
         - group: lsr-volume
         - group: lsr-deployment

velero/spectrum-fusion/recipes/4.7-example-recipe-single-ns.yaml

@@ -268,7 +268,7 @@ spec:
       selectResource: deployment
       timeout: 600
       type: check
-    - chks:
+- chks:
         - condition: '{$.status.phase} == {"Running"}'
           name: podReady
           onError: fail
@@ -280,6 +280,18 @@ spec:
       selectResource: pod
       timeout: 600
       type: check
+    - chks:
+        - condition: '{$.status.phase} == {"Running"}'
+          name: podReady
+          onError: fail
+          timeout: 600
+      name: license-service-reporter-instance-check
+      labelSelector: app.kubernetes.io/instance=ibm-license-service-reporter
+      namespace: <lsr namespace>
+      onError: fail
+      selectResource: pod
+      timeout: 600
+      type: check
     - chks:
         - condition: '{$.spec.replicas} == {$.status.readyReplicas}'
           name: podReady
@@ -405,7 +417,6 @@ spec:
         - group: common-services-catalogs
         - group: common-services-operatorgroups
         - group: common-services-configmaps
-        - group: license-service-reporter-crd
         - group: commonservice-crd
         - group: commonservice-cr
         - group: singleton-subscriptions
@@ -436,6 +447,7 @@ spec:
         - group: license-service-reporter-subscriptions
         - hook: license-service-reporter-check/podReady
         - group: license-service-reporter-instances
+        - hook: license-service-reporter-instance-check/podReady
         - group: lsr-pre-deploy
         - group: lsr-volume
         - group: lsr-deployment