remove setup tenant deployments and jobs

Signed-off-by: YuChen <[email protected]>
IBM · Nov 21, 2024 · 89420d7 · 89420d7
1 parent 2bec2fb
commit 89420d7
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 248 deletions.
diff --git a/velero/spectrum-fusion/recipes/4.0-4.5-example-recipe-multi-ns.yaml b/velero/spectrum-fusion/recipes/4.0-4.5-example-recipe-multi-ns.yaml
@@ -95,28 +95,6 @@ spec:
       labelSelector: foundationservices.cloudpak.ibm.com=crd
       name: commonservice-crd
       type: resource
-    - includeClusterResources: true
-      includedResourceTypes:
-        - deployments
-        - roles
-        - serviceaccounts
-        - rolebindings
-        - configmaps
-      labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-resources
-      type: resource
-    - includeClusterResources: true
-      includedResourceTypes:
-        - jobs
-      labelSelector: foundationservices.cloudpak.ibm.com=setup-tenant-job
-      name: setup-tenant-job-yaml
-      restoreStatus:
-        excludedResources:
-          - jobs
-      type: resource
-    - labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: cpfs-util-volume
-      type: volume
     - includeClusterResources: true
       includedResourceTypes:
         - customresourcedefinitions.apiextensions.k8s.io
@@ -226,18 +204,6 @@ spec:
       selectResource: pod
       timeout: 1200
       type: check
-    - chks:
-        - condition: '{$.status.phase} == {"Running"}'
-          name: podReady
-          onError: fail
-          timeout: 600
-      labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-check
-      namespace: <operator namespace>
-      onError: fail
-      selectResource: pod
-      timeout: 600
-      type: check
     - chks:
         - condition: '{$.status.phase} == {"Running"}'
           name: podReady
@@ -286,42 +252,6 @@ spec:
       selectResource: zen.cpd.ibm.com/v1/zenservice
       timeout: 1800
       type: check
-    - labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant
-      namespace: <operator namespace>
-      onError: fail
-      ops:
-        - command: |
-            ["/bin/bash", "-c", "/cs-br/setup_tenant.sh --operator-namespace <operator namespace> --services-namespace <service namespace> --tethered-namespaces <comma delimited (no spaces) list of Cloud Pak workload namespaces that use this foundational services instance> --license-accept -c v<foundational services version number in use i.e. 4.0, 4.1, 4.2, etc> -p <.spec.size value from commonservice cr> -i <install mode, either Manual or Automatic> -s <catalog source name> -n <catalog source namespace> -v"]
-          container: cpfs-util
-          name: setup-tenant-command
-          timeout: 600
-      selectResource: pod
-      type: exec
-    - labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-job
-      namespace: <operator namespace>
-      onError: fail
-      ops:
-        - command: |
-            ["/bin/bash", "-c", "oc patch job setup-tenant-job -n <operator namespace> --type=\"json\" -p '[{\"op\": \"remove\", \"path\":\"/spec/suspend\"}]'"]
-          container: cpfs-util
-          name: trigger-setup-tenant-job
-          timeout: 600
-      selectResource: pod
-      type: exec
-    - chks:
-        - condition: '{$.status.phase} == {"Succeeded"}'
-          name: jobComplete
-          onError: fail
-          timeout: 600
-      labelSelector: foundationservices.cloudpak.ibm.com=setup-tenant-job
-      name: setup-tenant-job-check
-      namespace: <operator namespace>
-      onError: fail
-      selectResource: pod
-      timeout: 600
-      type: check
     - chks:
         - condition: '{$.spec.replicas} == {$.status.readyReplicas}'
           name: podReady
@@ -424,7 +354,6 @@ spec:
         - group: mongo-volume
         - group: mongo-deployment
         - hook: zen5-data/backup
-        - group: cpfs-util-volume
         - group: zen
         - group: zen-br-resources
         - group: common-services-namespace
@@ -435,8 +364,6 @@ spec:
         - group: commonservice-crd
         - group: commonservice-cr
         - group: cs-operator-permissions
-        - group: setup-tenant-resources
-        - group: setup-tenant-job-yaml
         - group: singleton-subscriptions
         - group: cert-manager-resources
         - group: common-services-subscriptions
@@ -463,12 +390,6 @@ spec:
         - group: cert-manager-workload-resources
         - group: licensing-resources
         - group: common-services-subscriptions
-        - group: cpfs-util-volume
-        - group: setup-tenant-resources
-        - group: setup-tenant-job-yaml
-        - hook: setup-tenant-check/podReady
-        - hook: setup-tenant-job/trigger-setup-tenant-job
-        - hook: setup-tenant-job-check/jobComplete
         - hook: odlm-check/podReady
         - group: odlm-resources
         - group: operand-resources

diff --git a/velero/spectrum-fusion/recipes/4.7-example-recipe-multi-ns-multi-zen.yaml b/velero/spectrum-fusion/recipes/4.7-example-recipe-multi-ns-multi-zen.yaml
@@ -136,28 +136,6 @@ spec:
       labelSelector: foundationservices.cloudpak.ibm.com=crd
       name: commonservice-crd
       type: resource
-    - includeClusterResources: true
-      includedResourceTypes:
-        - deployments
-        - roles
-        - serviceaccounts
-        - rolebindings
-        - configmaps
-      labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-resources
-      type: resource
-    - includeClusterResources: true
-      includedResourceTypes:
-        - jobs
-      labelSelector: foundationservices.cloudpak.ibm.com=setup-tenant-job
-      name: setup-tenant-job-yaml
-      restoreStatus:
-        excludedResources:
-          - jobs
-      type: resource
-    - labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: cpfs-util-volume
-      type: volume
     - includeClusterResources: true
       includedResourceTypes:
         - customresourcedefinitions.apiextensions.k8s.io
@@ -280,18 +258,6 @@ spec:
       selectResource: pod
       timeout: 1200
       type: check
-    - chks:
-        - condition: '{$.status.phase} == {"Running"}'
-          name: podReady
-          onError: fail
-          timeout: 600
-      labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-check
-      namespace: <operator namespace>
-      onError: fail
-      selectResource: pod
-      timeout: 600
-      type: check
     - chks:
         - condition: '{$.status.phase} == {"Running"}'
           name: podReady
@@ -369,42 +335,6 @@ spec:
       selectResource: pod
       timeout: 1200
       type: check
-    - labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant
-      namespace: <operator namespace>
-      onError: fail
-      ops:
-        - command: |
-            ["/bin/bash", "-c", "/cs-br/setup_tenant.sh --operator-namespace <operator namespace> --services-namespace <service namespace> --tethered-namespaces <comma delimited (no spaces) list of Cloud Pak workload namespaces that use this foundational services instance> --license-accept -c v<foundational services version number in use i.e. 4.0, 4.1, 4.2, etc> -p <.spec.size value from commonservice cr> -i <install mode, either Manual or Automatic> -s <catalog source name> -n <catalog source namespace> -v"]
-          container: cpfs-util
-          name: setup-tenant-command
-          timeout: 600
-      selectResource: pod
-      type: exec
-    - labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-job
-      namespace: <operator namespace>
-      onError: fail
-      ops:
-        - command: |
-            ["/bin/bash", "-c", "oc patch job setup-tenant-job -n <operator namespace> --type=\"json\" -p '[{\"op\": \"remove\", \"path\":\"/spec/suspend\"}]'"]
-          container: cpfs-util
-          name: trigger-setup-tenant-job
-          timeout: 600
-      selectResource: pod
-      type: exec
-    - chks:
-        - condition: '{$.status.phase} == {"Succeeded"}'
-          name: jobComplete
-          onError: fail
-          timeout: 600
-      labelSelector: foundationservices.cloudpak.ibm.com=setup-tenant-job
-      name: setup-tenant-job-check
-      namespace: cs-op
-      onError: fail
-      selectResource: pod
-      timeout: 600
-      type: check
     - chks:
         - condition: '{$.status.phase} == {"Running"}'
           name: podReady
@@ -575,7 +505,6 @@ spec:
         - hook: zen5-data-1/backup
         - hook: zen5-data-2/backup
         # - hook: zen5-data-3/backup
-        - group: cpfs-util-volume
         - group: zenservice
         - group: zen-br-resources
         - group: common-services-namespace
@@ -586,8 +515,6 @@ spec:
         - group: license-service-reporter-crd
         - group: commonservice-crd
         - group: commonservice-cr
-        - group: setup-tenant-resources
-        - group: setup-tenant-job-yaml
         - group: singleton-subscriptions
         - group: cert-manager-resources
         - group: license-service-reporter-subscriptions
@@ -625,12 +552,6 @@ spec:
         - hook: lsr-deployment/podReady
         - hook: lsr-data/restore
         - group: common-services-subscriptions
-        - group: cpfs-util-volume
-        - group: setup-tenant-resources
-        - group: setup-tenant-job-yaml
-        - hook: setup-tenant-check/podReady
-        - hook: setup-tenant-job/trigger-setup-tenant-job
-        - hook: setup-tenant-job-check/jobComplete
         - hook: odlm-check/podReady
         - group: odlm-resources
         - group: operand-resources

diff --git a/velero/spectrum-fusion/recipes/4.7-example-recipe-multi-ns.yaml b/velero/spectrum-fusion/recipes/4.7-example-recipe-multi-ns.yaml
@@ -138,28 +138,6 @@ spec:
       labelSelector: foundationservices.cloudpak.ibm.com=crd
       name: commonservice-crd
       type: resource
-    - includeClusterResources: true
-      includedResourceTypes:
-        - deployments
-        - roles
-        - serviceaccounts
-        - rolebindings
-        - configmaps
-      labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-resources
-      type: resource
-    - includeClusterResources: true
-      includedResourceTypes:
-        - jobs
-      labelSelector: foundationservices.cloudpak.ibm.com=setup-tenant-job
-      name: setup-tenant-job-yaml
-      restoreStatus:
-        excludedResources:
-          - jobs
-      type: resource
-    - labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: cpfs-util-volume
-      type: volume
     - includeClusterResources: true
       includedResourceTypes:
         - customresourcedefinitions.apiextensions.k8s.io
@@ -280,18 +258,6 @@ spec:
       selectResource: pod
       timeout: 1200
       type: check
-    - chks:
-        - condition: '{$.status.phase} == {"Running"}'
-          name: podReady
-          onError: fail
-          timeout: 600
-      labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-check
-      namespace: <operator namespace>
-      onError: fail
-      selectResource: pod
-      timeout: 600
-      type: check
     - chks:
         - condition: '{$.status.phase} == {"Running"}'
           name: podReady
@@ -369,42 +335,6 @@ spec:
       selectResource: pod
       timeout: 1200
       type: check
-    - labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant
-      namespace: <operator namespace>
-      onError: fail
-      ops:
-        - command: |
-            ["/bin/bash", "-c", "/cs-br/setup_tenant.sh --operator-namespace <operator namespace> --services-namespace <service namespace> --tethered-namespaces <comma delimited (no spaces) list of Cloud Pak workload namespaces that use this foundational services instance> --license-accept -c v<foundational services version number in use i.e. 4.0, 4.1, 4.2, etc> -p <.spec.size value from commonservice cr> -i <install mode, either Manual or Automatic> -s <catalog source name> -n <catalog source namespace> -v"]
-          container: cpfs-util
-          name: setup-tenant-command
-          timeout: 600
-      selectResource: pod
-      type: exec
-    - labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-job
-      namespace: <operator namespace>
-      onError: fail
-      ops:
-        - command: |
-            ["/bin/bash", "-c", "oc patch job setup-tenant-job -n <operator namespace> --type=\"json\" -p '[{\"op\": \"remove\", \"path\":\"/spec/suspend\"}]'"]
-          container: cpfs-util
-          name: trigger-setup-tenant-job
-          timeout: 600
-      selectResource: pod
-      type: exec
-    - chks:
-        - condition: '{$.status.phase} == {"Succeeded"}'
-          name: jobComplete
-          onError: fail
-          timeout: 600
-      labelSelector: foundationservices.cloudpak.ibm.com=setup-tenant-job
-      name: setup-tenant-job-check
-      namespace: <operator namespace>
-      onError: fail
-      selectResource: pod
-      timeout: 600
-      type: check
     - chks:
         - condition: '{$.status.phase} == {"Running"}'
           name: podReady
@@ -515,7 +445,6 @@ spec:
         - group: license-service-reporter-parent
         - group: license-service-reporter-resources
         - hook: zen5-data/backup
-        - group: cpfs-util-volume
         - group: zenservice
         - group: zen-br-resources
         - group: common-services-namespace
@@ -526,8 +455,6 @@ spec:
         - group: license-service-reporter-crd
         - group: commonservice-crd
         - group: commonservice-cr
-        - group: setup-tenant-resources
-        - group: setup-tenant-job-yaml
         - group: singleton-subscriptions
         - group: cert-manager-resources
         - group: license-service-reporter-subscriptions
@@ -565,12 +492,6 @@ spec:
         - hook: lsr-deployment/podReady
         - hook: lsr-data/restore
         - group: common-services-subscriptions
-        - group: cpfs-util-volume
-        - group: setup-tenant-resources
-        - group: setup-tenant-job-yaml
-        - hook: setup-tenant-check/podReady
-        - hook: setup-tenant-job/trigger-setup-tenant-job
-        - hook: setup-tenant-job-check/jobComplete
         - hook: odlm-check/podReady
         - group: odlm-resources
         - group: operand-resources

diff --git a/velero/spectrum-fusion/recipes/4.7-example-recipe-single-ns.yaml b/velero/spectrum-fusion/recipes/4.7-example-recipe-single-ns.yaml
@@ -138,16 +138,6 @@ spec:
       labelSelector: foundationservices.cloudpak.ibm.com=crd
       name: commonservice-crd
       type: resource
-    - includeClusterResources: true
-      includedResourceTypes:
-        - deployments
-        - roles
-        - serviceaccounts
-        - rolebindings
-        - configmaps
-      labelSelector: foundationservices.cloudpak.ibm.com=cpfs-util-backup
-      name: setup-tenant-resources
-      type: resource
     - includeClusterResources: true
       includedResourceTypes:
         - customresourcedefinitions.apiextensions.k8s.io
@@ -428,7 +418,6 @@ spec:
         - group: license-service-reporter-crd
         - group: commonservice-crd
         - group: commonservice-cr
-        - group: setup-tenant-resources
         - group: singleton-subscriptions
         - group: cert-manager-resources
         - group: licensing-resources