Skip to content

Commit 8c438a0

Browse files
qpdpQqpdpQ
authored
Add zen_namespace for auto_br scirpt (#2665)
* add zen_ns for br-automation script Signed-off-by: Allen Li <liyuchen223@gmail.com> * update oadp deploy script Signed-off-by: Allen Li <liyuchen223@gmail.com> --------- Signed-off-by: Allen Li <liyuchen223@gmail.com>
1 parent 10c9a37 commit 8c438a0

File tree

2 files changed

+36
-27
lines changed

2 files changed

+36
-27
lines changed

‎br-testing-automation/auto-br-oadp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ function backup_setup() {
759759
deploy_arg_str="$deploy_arg_str --im"
760760
fi
761761
if [[ $ZEN_ENABLED == "true" ]]; then
762-
deploy_arg_str="$deploy_arg_str --zen"
762+
deploy_arg_str="$deploy_arg_str --zen --zen-ns $ZEN_NAMESPACE"
763763
fi
764764
if [[ $STORAGE_CLASS != "" ]]; then
765765
deploy_arg_str="$deploy_arg_str --storage-class $STORAGE_CLASS"

‎velero/schedule/deploy-br-resources.sh‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ function parse_arguments() {
6262
shift
6363
LSR_NAMESPACE=$1
6464
;;
65+
--zen-ns)
66+
shift
67+
ZEN_NAMESPACE=$1
68+
;;
6569
--zen)
6670
ZEN="true"
6771
SELECTED="true"
@@ -126,6 +130,10 @@ function parse_arguments() {
126130
warning "No services namespace specified, using operator namespace $OPERATOR_NAMESPACE instead. If using SOD topology, please re-run with both --operator-ns and --services-ns defined."
127131
TARGET_NAMESPACE=$OPERATOR_NAMESPACE
128132
fi
133+
if [[ $ZEN == "true" || $ZEN4 == "true" ]] && [[ $ZEN_NAMESPACE == "" ]]; then
134+
warning "No zen namespace specified, using service namespace $TARGET_NAMESPACE instead."
135+
ZEN_NAMESPACE=$TARGET_NAMESPACE
136+
fi
129137
}
130138

131139
function print_usage() {
@@ -138,6 +146,7 @@ function print_usage() {
138146
echo " --services-ns string Required. Namespace where IM EDB, IM Mongo, Zen, or Keycloak operands are installed. If installed in different namespaces, script will need to be run separately. Optional if it is the same as --operator-ns."
139147
echo " --tethered-ns string Optional. Comma-delimited list of namespaces attached to a given CPFS install. Should include any namespace from a given tenant in the common-service-maps cm that are not the --operator-ns or the --services-ns. Only required when --util specified."
140148
echo " --lsr-ns string Optional. Namespace for the License Service Reporter install. Required if --lsr specified."
149+
echo " --zen-ns string Optional. Namespace for the Zen install. Only required if multiple zenservice instances are found in the --services-ns."
141150
echo " --im, --mongo, --keycloak, --zen, --zen4, --lsr Required. Choose which component(s) to deploy backup/restore resources for to the target namespace. At least one is required. Multiple can be specified but only one of --zen or --zen4 can be chosen."
142151
echo " --util Optional. Deploy the CPFS Util job for use in SOD topologies. If this option is selected, --operator-ns and --services-ns are both required."
143152
echo " --storage-class string Optional. Storage class to use for backup/restore resources. Default value is cluster's default storage class."
@@ -221,14 +230,14 @@ function deploy_resources(){
221230
#Deploy zen 5 resources
222231
if [[ $ZEN == "true" ]]; then
223232
if [[ $ZENSERVICE == "" ]]; then
224-
ZENSERVICE=$(oc get zenservice -n $TARGET_NAMESPACE --no-headers | awk '{print $1}')
233+
ZENSERVICE=$(oc get zenservice -n $ZEN_NAMESPACE --no-headers | awk '{print $1}')
225234
fi
226235
if [[ $ZENSERVICE != "" ]]; then
227-
exists=$(oc get zenservice $ZENSERVICE -n $TARGET_NAMESPACE --no-headers --ignore-not-found)
236+
exists=$(oc get zenservice $ZENSERVICE -n $ZEN_NAMESPACE --no-headers --ignore-not-found)
228237
if [[ $exists == "" ]]; then
229-
warning "Zenservice $ZENSERVICE not found in namespace $TARGET_NAMESPACE. Make sure the zenservice is deployed to the target namespace $TARGET_NAMESPACE or change the namespace used."
238+
warning "Zenservice $ZENSERVICE not found in namespace $ZEN_NAMESPACE. Make sure the zenservice is deployed to the target namespace $ZEN_NAMESPACE or change the namespace used."
230239
else
231-
info "Creating Zen Backup/Restore resources in namespace $TARGET_NAMESPACE."
240+
info "Creating Zen Backup/Restore resources in namespace $ZEN_NAMESPACE."
232241

233242
rm -rf tmp/zen/
234243
mkdir tmp/zen
@@ -239,33 +248,33 @@ function deploy_resources(){
239248
cp ${BASE_DIR}/zen5-sa.yaml tmp/zen/zen5-sa.yaml
240249
cp ${BASE_DIR}/zen5-br-scripts-cm.yaml tmp/zen/zen5-br-scripts-cm.yaml
241250

242-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen/zen5-backup-deployment.yaml
251+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen/zen5-backup-deployment.yaml
243252
sed -i -E "s/<zenservice name>/$ZENSERVICE/" tmp/zen/zen5-backup-deployment.yaml
244-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen/zen5-backup-pvc.yaml
253+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen/zen5-backup-pvc.yaml
245254
sed -i -E "s/<storage class>/$STORAGE_CLASS/" tmp/zen/zen5-backup-pvc.yaml
246-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen/zen5-role.yaml
247-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen/zen5-rolebinding.yaml
248-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen/zen5-sa.yaml
249-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen/zen5-br-scripts-cm.yaml
250-
oc apply -f tmp/zen -n $TARGET_NAMESPACE || error "Unable to deploy resources for Zen 5."
251-
success "Resources to backup Zen deployed in namespace $TARGET_NAMESPACE."
255+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen/zen5-role.yaml
256+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen/zen5-rolebinding.yaml
257+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen/zen5-sa.yaml
258+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen/zen5-br-scripts-cm.yaml
259+
oc apply -f tmp/zen -n $ZEN_NAMESPACE || error "Unable to deploy resources for Zen 5."
260+
success "Resources to backup Zen deployed in namespace $ZEN_NAMESPACE."
252261
fi
253262
else
254-
warning "No zenservice found in namespace $TARGET_NAMESPACE. Skipping."
263+
warning "No zenservice found in namespace $ZEN_NAMESPACE. Skipping."
255264
fi
256265
fi
257266

258267
#deploy zen 4 resources
259268
if [[ $ZEN4 == "true" ]]; then
260269
if [[ $ZENSERVICE == "" ]]; then
261-
ZENSERVICE=$(oc get zenservice -n $TARGET_NAMESPACE --no-headers | awk '{print $1}')
270+
ZENSERVICE=$(oc get zenservice -n $ZEN_NAMESPACE --no-headers | awk '{print $1}')
262271
fi
263272
if [[ $ZENSERVICE != "" ]]; then
264-
exists=$(oc get zenservice $ZENSERVICE -n $TARGET_NAMESPACE --no-headers --ignore-not-found)
273+
exists=$(oc get zenservice $ZENSERVICE -n $ZEN_NAMESPACE --no-headers --ignore-not-found)
265274
if [[ $exists == "" ]]; then
266-
error "Zenservice $ZENSERVICE not found in namespace $TARGET_NAMESPACE. Make sure the zenservice is deployed to the target namespace $TARGET_NAMESPACE or change the namespace used."
275+
error "Zenservice $ZENSERVICE not found in namespace $ZEN_NAMESPACE. Make sure the zenservice is deployed to the target namespace $ZEN_NAMESPACE or change the namespace used."
267276
else
268-
info "Creating Zen Backup/Restore resources in namespace $TARGET_NAMESPACE."
277+
info "Creating Zen Backup/Restore resources in namespace $ZEN_NAMESPACE."
269278

270279
rm -rf tmp/zen4
271280
mkdir tmp/zen4
@@ -276,20 +285,20 @@ function deploy_resources(){
276285
cp ${BASE_DIR}/zen4-sa.yaml tmp/zen4/zen4-sa.yaml
277286
cp ${BASE_DIR}/zen4-br-scripts.yaml tmp/zen4/zen4-br-scripts.yaml
278287

279-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen4/zen-backup-deployment.yaml
280-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen4/zen-backup-pvc.yaml
288+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen4/zen-backup-deployment.yaml
289+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen4/zen-backup-pvc.yaml
281290
sed -i -E "s/<storage class>/$STORAGE_CLASS/" tmp/zen4/zen-backup-pvc.yaml
282-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen4/zen4-role.yaml
283-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen4/zen4-rolebinding.yaml
284-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen4/zen4-sa.yaml
285-
sed -i -E "s/<zenservice namespace>/$TARGET_NAMESPACE/" tmp/zen4/zen4-br-scripts.yaml
286-
oc apply -f tmp/zen4/ -n $TARGET_NAMESPACE || error "Unable to deploy resources for Zen 4."
291+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen4/zen4-role.yaml
292+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen4/zen4-rolebinding.yaml
293+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen4/zen4-sa.yaml
294+
sed -i -E "s/<zenservice namespace>/$ZEN_NAMESPACE/" tmp/zen4/zen4-br-scripts.yaml
295+
oc apply -f tmp/zen4/ -n $ZEN_NAMESPACE || error "Unable to deploy resources for Zen 4."
287296
fi
288297
fi
289-
success "Resources to backup Zen 4 deployed in namespace $TARGET_NAMESPACE."
298+
success "Resources to backup Zen 4 deployed in namespace $ZEN_NAMESPACE."
290299
fi
291300

292-
success "Backup/Restore resources created in namespace $TARGET_NAMESPACE."
301+
success "Backup/Restore resources created in namespace $ZEN_NAMESPACE."
293302

294303
#Deploy cpfs-util resources
295304
if [[ $UTIL == "true" ]]; then

0 commit comments

Comments
 (0)