Skip to content

No olm core recipe #2619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bluzarraga merged 15 commits into from
Sep 17, 2025
Merged

No olm core recipe #2619

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ba8db14
core recipe init
qpdpQ Sep 2, 2025
92d4ab0
recipe update
qpdpQ Sep 4, 2025
02c897a
cpfs core recipe
qpdpQ Sep 8, 2025
0b2f37f
add resterOverwriteResource
qpdpQ Sep 8, 2025
25e5efc
remove clusterrole and clusterrolebinding from cpfs recipe
qpdpQ Sep 9, 2025
5a9ea97
update cluster rbac
qpdpQ Sep 9, 2025
c80ae84
namespace update
qpdpQ Sep 10, 2025
3d013cc
remove cert-manager webhook check
qpdpQ Sep 10, 2025
b9f5fbc
update cluster role
qpdpQ Sep 10, 2025
91df6cd
add service to edb chart list
qpdpQ Sep 10, 2025
32f1c94
update namespace name
qpdpQ Sep 10, 2025
c01af55
update zen recipe
qpdpQ Sep 16, 2025
31b9f64
label namespaces from common-service-maps
qpdpQ Sep 16, 2025
0da900b
add operator_ns service_ns and tethered ns to ns list
qpdpQ Sep 17, 2025
698f77d
update label in recipe
qpdpQ Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion velero/backup/common-service/label-common-service.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,9 @@ function label_ibm_catalogsources() {
function label_ns_and_related() {

title "Start to label the namespaces, operatorgroups and secrets... "
namespaces=$(${OC} get configmap namespace-scope -n $OPERATOR_NS -oyaml | awk '/^data:/ {flag=1; next} /^ namespaces:/ {print $2; next} flag && /^ [^ ]+: / {flag=0}')
# namespaces=$(${OC} get configmap namespace-scope -n $OPERATOR_NS -oyaml | awk '/^data:/ {flag=1; next} /^ namespaces:/ {print $2; next} flag && /^ [^ ]+: / {flag=0}')
namespaces=$(${OC} get configmap common-service-maps -n kube-public -o jsonpath='{.data.common-service-maps\.yaml}' | awk -v ns="$OPERATOR_NS" 'BEGIN {found=0}/requested-from-namespace:/ {found=0} $0 ~ ns {found=1} found && /^ *-/ {print $2}' | tr '\n' ',' | sed 's/,$/\n/')
echo "Namespaces from common-service-maps configmap: $namespaces"
# add cert-manager namespace and licensing namespace and lsr namespace into the list with comma separated
if [[ $CONTROL_NS != "" ]]; then
namespaces+=",$CONTROL_NS"
Expand Down
1 change: 0 additions & 1 deletion velero/spectrum-fusion/recipes/no-olm/core/child-cs-odlm-chart-recipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ spec:
- rolebinding
- serviceaccount
- deployments
- secrets
labelSelector: foundationservices.cloudpak.ibm.com=odlm-chart
name: odlm-resources
type: resource
Expand Down
2 changes: 0 additions & 2 deletions velero/spectrum-fusion/recipes/no-olm/core/child-im-ui-chart-recipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ spec:
- serviceaccount
- deployments
- secrets
- commonservices.operator.ibm.com
labelSelector: foundationservices.cloudpak.ibm.com=iam-chart
name: im-resources
type: resource
Expand All @@ -42,7 +41,6 @@ spec:
- rolebinding
- serviceaccount
- deployments
- secrets
labelSelector: foundationservices.cloudpak.ibm.com=ui-chart
name: ui-resources
type: resource
Expand Down
7 changes: 7 additions & 0 deletions velero/spectrum-fusion/recipes/no-olm/core/child-zen-chart-recipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
- serviceaccount
- deployments
- secrets
- zenservices.zen.cpd.ibm.com
labelSelector: foundationservices.cloudpak.ibm.com=zen-chart
name: zen-resources
type: resource
Expand All @@ -35,6 +36,11 @@ spec:
- secrets
name: zen-rbac-resources
type: resource
- backupRef: zen-resources
includedResourceTypes:
- zenservices.zen.cpd.ibm.com
name: zenservice
type: resource
- backupRef: zen-resources
includedResourceTypes:
- deployments
Expand Down Expand Up @@ -65,4 +71,5 @@ spec:
- group: zen-cluster-resources
- group: zen-rbac-resources
- group: zen-deployment
- group: zenservice
- hook: zen-check/podReady
11 changes: 0 additions & 11 deletions velero/spectrum-fusion/recipes/no-olm/core/child-zen-recipe-2.10.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ spec:
includedNamespaces:
- <child recipe namespace>
type: volume
- includeClusterResources: true
includedResourceTypes:
- zenservices.zen.cpd.ibm.com
- customresourcedefinitions.apiextensions.k8s.io
labelSelector: foundationservices.cloudpak.ibm.com=zen
name: zenservice
includedNamespaces:
- <child recipe namespace>
type: resource
- labelSelector: foundationservices.cloudpak.ibm.com=zen5-data
includeClusterResources: true
includedResourceTypes:
Expand Down Expand Up @@ -93,7 +84,6 @@ spec:
- name: post-backup
priority: 0
sequence:
- group: zenservice
- group: zen-pre-deploy
- group: zen-deployment
#volumes (should happen at the end)
Expand All @@ -102,7 +92,6 @@ spec:
priority: 1
sequence:
#zen
- group: zenservice
- hook: zen-metastore-edb-check/podReady
- group: zen-pre-deploy
- group: zen-volume
Expand Down