From ac4a79c5119624571e3a1f73b6163f5d75017feb Mon Sep 17 00:00:00 2001 From: YuChen Date: Fri, 22 Nov 2024 10:28:27 -0800 Subject: [PATCH] update nss resources br label Signed-off-by: YuChen --- velero/backup/common-service/label-common-service.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/velero/backup/common-service/label-common-service.sh b/velero/backup/common-service/label-common-service.sh index 4cc4307a8..a28758c9f 100755 --- a/velero/backup/common-service/label-common-service.sh +++ b/velero/backup/common-service/label-common-service.sh @@ -376,15 +376,16 @@ function label_cs(){ function label_nss(){ title "Label Namespacescope resources" local nss_pm="ibm-namespace-scope-operator" - ${OC} label subscriptions.operators.coreos.com $nss_pm foundationservices.cloudpak.ibm.com=nss -n $OPERATOR_NS --overwrite=true 2>/dev/null + # Using the same label as common service operator has for both sub and crd + ${OC} label subscriptions.operators.coreos.com $nss_pm foundationservices.cloudpak.ibm.com=subscription -n $OPERATOR_NS --overwrite=true 2>/dev/null + ${OC} label customresourcedefinition namespacescopes.operator.ibm.com foundationservices.cloudpak.ibm.com=crd --overwrite=true 2>/dev/null + # The following resources are labeled with 'nss' are bundled together for backup ${OC} label namespacescopes.operator.ibm.com common-service foundationservices.cloudpak.ibm.com=nss -n $OPERATOR_NS --overwrite=true 2>/dev/null - ${OC} label customresourcedefinition namespacescopes.operator.ibm.com foundationservices.cloudpak.ibm.com=nss --overwrite=true 2>/dev/null ${OC} label serviceaccount ibm-namespace-scope-operator foundationservices.cloudpak.ibm.com=nss -n $OPERATOR_NS --overwrite=true 2>/dev/null ${OC} label role nss-managed-role-from-$OPERATOR_NS foundationservices.cloudpak.ibm.com=nss -n $OPERATOR_NS --overwrite=true 2>/dev/null ${OC} label role nss-managed-role-from-$OPERATOR_NS foundationservices.cloudpak.ibm.com=nss -n $SERVICES_NS --overwrite=true 2>/dev/null ${OC} label rolebinding nss-managed-role-from-$OPERATOR_NS foundationservices.cloudpak.ibm.com=nss -n $OPERATOR_NS --overwrite=true 2>/dev/null ${OC} label rolebinding nss-managed-role-from-$OPERATOR_NS foundationservices.cloudpak.ibm.com=nss -n $SERVICES_NS --overwrite=true 2>/dev/null - ${OC} label configmap namespace-scope foundationservices.cloudpak.ibm.com=nss -n $OPERATOR_NS --overwrite=true 2>/dev/null if [[ $TETHERED_NS != "" ]]; then for namespace in ${TETHERED_NS//,/ } do