Skip to content

Commit 93a19b5

Browse files
qpdpQqpdpQ
authored
Update oc login method for BR automation scripts (#2639)
* update cluster login credential Signed-off-by: Allen Li <liyuchen223@gmail.com> * update login method Signed-off-by: Allen Li <liyuchen223@gmail.com> * add default username Signed-off-by: Allen Li <liyuchen223@gmail.com> --------- Signed-off-by: Allen Li <liyuchen223@gmail.com>
1 parent 95cf31d commit 93a19b5

File tree

4 files changed

+31
-24
lines changed

4 files changed

+31
-24
lines changed

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ set -o errtrace
2121
OUTPUT_FILE="env-oadp.properties"
2222
WRITE="false"
2323
RESTORE_SINGLETONS="false"
24+
BACKUP_CLU_USERNAME="kubeadmin"
25+
RESTORE_CLU_USERNAME="kubeadmin"
2426
DEBUG=1
2527

2628
BASE_DIR=$(cd $(dirname "$0")/$(dirname "$(readlink $0)") && pwd -P)
@@ -35,9 +37,9 @@ function main() {
3537
check_for_oadp
3638
fi
3739
if [[ $SETUP_RESTORE == "true" ]] && [[ $TARGET_CLUSTER_TYPE == "diff" ]]; then
38-
login $RESTORE_CLU_SERVER $RESTORE_CLU_TOKEN
40+
login $RESTORE_CLU_SERVER $RESTORE_CLU_USERNAME $RESTORE_CLU_PASSWORD
3941
check_for_oadp
40-
login $BACKUP_CLU_SERVER $BACKUP_CLU_TOKEN
42+
login $BACKUP_CLU_SERVER $BACKUP_CLU_USERNAME $BACKUP_CLU_PASSWORD
4143
else
4244
check_for_oadp
4345
fi
@@ -48,7 +50,7 @@ function main() {
4850
fi
4951
if [[ $RESTORE == "true" ]]; then
5052
if [[ $TARGET_CLUSTER_TYPE == "diff" ]]; then
51-
login $RESTORE_CLU_SERVER $RESTORE_CLU_TOKEN
53+
login $RESTORE_CLU_SERVER $RESTORE_CLU_USERNAME $RESTORE_CLU_PASSWORD
5254
if [[ $BACKUP == "true" ]]; then
5355
#in full e2e BR scenarios where we are restoring to a different cluster
5456
#it takes a few minutes for the backup to be present on the new cluster once completed
@@ -61,7 +63,7 @@ function main() {
6163
fi
6264
restore_cpfs
6365
if [[ $TARGET_CLUSTER_TYPE == "diff" ]]; then
64-
login $BACKUP_CLU_SERVER $BACKUP_CLU_TOKEN
66+
login $BACKUP_CLU_SERVER $BACKUP_CLU_USERNAME $BACKUP_CLU_PASSWORD
6567
fi
6668
fi
6769
}
@@ -243,7 +245,7 @@ function prereq() {
243245

244246
#write env variables to output file
245247
if [[ $WRITE == "true" ]]; then
246-
write_specific_env_vars_to_file $OUTPUT_FILE "OC YQ OPERATOR_NS SERVICES_NS TETHERED_NS BACKUP RESTORE SETUP OADP_INSTALL OADP_RESOURCE_CREATION OADP_NS BACKUP_STORAGE_LOCATION_NAMESTORAGE_BUCKET_NAME S3_URL STORAGE_SECRET_ACCESS_KEY STORAGE_SECRET_ACCESS_KEY_ID IM_ENABLED ZEN_ENABLED NSS_ENABLED UMS_ENABLED MCSP_ENABLED CERT_MANAGER_NAMESPACE LICENSING_NAMESPACE LSR_NAMESPACE CPFS_VERSION ZENSERVICE_NAME ZEN_NAMESPACE ENABLE_CERT_MANAGER ENABLE_LICENSING ENABLE_LSR ENABLE_PRIVATE_CATALOG ENABLE_DEFAULT_CS ADDITIONAL_SOURCES CONTROL_NS BACKUP_CLU_SERVER BACKUP_CLU_TOKEN RESTORE_CLU_SERVER RESTORE_CLU_TOKEN TARGET_CLUSTER_TYPE BACKUP_NAME"
248+
write_specific_env_vars_to_file $OUTPUT_FILE "OC YQ OPERATOR_NS SERVICES_NS TETHERED_NS BACKUP RESTORE SETUP OADP_INSTALL OADP_RESOURCE_CREATION OADP_NS BACKUP_STORAGE_LOCATION_NAMESTORAGE_BUCKET_NAME S3_URL STORAGE_SECRET_ACCESS_KEY STORAGE_SECRET_ACCESS_KEY_ID IM_ENABLED ZEN_ENABLED NSS_ENABLED UMS_ENABLED MCSP_ENABLED CERT_MANAGER_NAMESPACE LICENSING_NAMESPACE LSR_NAMESPACE CPFS_VERSION ZENSERVICE_NAME ZEN_NAMESPACE ENABLE_CERT_MANAGER ENABLE_LICENSING ENABLE_LSR ENABLE_PRIVATE_CATALOG ENABLE_DEFAULT_CS ADDITIONAL_SOURCES CONTROL_NS BACKUP_CLU_SERVER BACKUP_CLU_USERNAME BACKUP_CLU_PASSWORD RESTORE_CLU_SERVER RESTORE_CLU_USERNAME RESTORE_CLU_PASSWORD TARGET_CLUSTER_TYPE BACKUP_NAME"
247249
fi
248250
}
249251

@@ -257,13 +259,13 @@ function check_cluster_credentials() {
257259
error "TARGET_CLUSTER_TYPE value not set. Make sure it is either set in the parameters file or as an env variable."
258260
else
259261
if [[ $TARGET_CLUSTER_TYPE == "diff" ]]; then
260-
if [[ $BACKUP_CLU_SERVER == "" ]] || [[ $BACKUP_CLU_TOKEN == "" ]] || [[ $RESTORE_CLU_SERVER == "" ]] || [[ $RESTORE_CLU_TOKEN == "" ]]; then
261-
error "If interacting with a different cluster (either restore or setup), all of BACKUP_CLU_SERVER, BACKUP_CLU_TOKEN, RESTORE_CLU_SERVER, and RESTORE_CLU_TOKEN must be defined either in the parameters file or as an env variable."
262+
if [[ $BACKUP_CLU_SERVER == "" ]] || [[ $BACKUP_CLU_USERNAME == "" ]] || [[ $BACKUP_CLU_PASSWORD == "" ]] || [[ $RESTORE_CLU_SERVER == "" ]] || [[ $BACKUP_CLU_USERNAME == "" ]] || [[ $RESTORE_CLU_PASSWORD == "" ]]; then
263+
error "If interacting with a different cluster (either restore or setup), all of BACKUP_CLU_SERVER BACKUP_CLU_USERNAME BACKUP_CLU_PASSWORD RESTORE_CLU_SERVER RESTORE_CLU_USERNAME and RESTORE_CLU_PASSWORD must be defined either in the parameters file or as an env variable."
262264
else
263265
info "Different cluster selected. Validating login credentials work..."
264-
${OC} login --token=$RESTORE_CLU_TOKEN --server=$RESTORE_CLU_SERVER --insecure-skip-tls-verify=true
266+
${OC} login -u $RESTORE_CLU_USERNAME -p $RESTORE_CLU_PASSWORD --server=$RESTORE_CLU_SERVER --insecure-skip-tls-verify=true
265267
info "Logging back into home cluster..."
266-
${OC} login --token=$BACKUP_CLU_TOKEN --server=$BACKUP_CLU_SERVER --insecure-skip-tls-verify=true
268+
${OC} login -u $BACKUP_CLU_USERNAME -p $BACKUP_CLU_PASSWORD --server=$BACKUP_CLU_SERVER --insecure-skip-tls-verify=true
267269
fi
268270
fi
269271
success "Backup and Restore cluster login credentials verified."
@@ -956,10 +958,11 @@ function wait_for_backup() {
956958

957959
function login() {
958960
server=$1
959-
token=$2
961+
username=$2
962+
password=$3
960963
title "Logging in to server $server"
961964
#oc login to spoke cluster
962-
${OC} login --token=$token --server=$server --insecure-skip-tls-verify=true
965+
${OC} login -u $username -p $password --server=$server --insecure-skip-tls-verify=true
963966
}
964967

965968

‎br-testing-automation/env-fusion.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@ CONTROL_NS="" # Pass the control namespace if it is needed to be backed up
4949

5050
#variables for just spoke setup
5151
#these values can be found by copying the login token and server values for an openshift cluster
52-
HUB_OC_TOKEN=
52+
HUB_USERNAME="kubeadmin"
53+
HUB_PASSWORD=
5354
HUB_SERVER=
54-
SPOKE_OC_TOKEN=
55+
SPOKE_USERNAME="kubeadmin"
56+
SPOKE_PASSWORD=
5557
SPOKE_SERVER=
5658

5759
# ==============================================================================

‎br-testing-automation/env-oadp.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ CONTROL_NS="" # Pass the control namespace if it is needed to be backed up
5656
# ==============================================================================
5757
# variables for auto-br script
5858
BACKUP_CLU_SERVER=""
59-
BACKUP_CLU_TOKEN=""
59+
BACKUP_CLU_USERNAME="kubeadmin"
60+
BACKUP_CLU_PASSWORD=""
6061
RESTORE_CLU_SERVER=""
61-
RESTORE_CLU_TOKEN=""
62+
RESTORE_CLU_USERNAME="kubeadmin"
63+
RESTORE_CLU_PASSWORD=""
6264
TARGET_CLUSTER_TYPE="same" # determines if restoring to the same cluster or to a different cluster. Values are "same" and "diff"
6365
BACKUP_NAME="" # always necessary for either backup or restore

‎br-testing-automation/fusion-backup-setup.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ function prereq() {
147147
error "Missing value for one or more of OPERATOR_NAMESPACE, SERVICES_NS, BACKUP_STORAGE_LOCATION_NAME, STORAGE_BUCKET_NAME, S3_URL, STORAGE_SECRET_ACCESS_KEY, STORAGE_SECRET_ACCESS_KEY_ID, CERT_MANAGER_NAMESPACE, LICENSING_NAMESPACE, LSR_NAMESPACE, CPFS_VERSION, ZENSERVICE_NAME. Please update env.properties file with correct parameters and rerun."
148148
fi
149149
elif [[ $RESTORE_SETUP == "true" ]]; then
150-
if [[ -z $HUB_OC_TOKEN ]] || [[ -z $HUB_SERVER ]] || [[ -z $SPOKE_OC_TOKEN ]] || [[ -z $SPOKE_SERVER ]]; then
151-
error "Missing value for one or more of HUB_OC_TOKEN, HUB_SERVER, SPOKE_OC_TOKEN, SPOKE_SERVER. Please update env.properties file with correct parameters and rerun."
150+
if [[ -z $HUB_USERNAME ]] || [[ -z $HUB_PASSWORD ]] || [[ -z $HUB_SERVER ]] || [[ -z $SPOKE_USERNAME ]] || [[ -z $SPOKE_PASSWORD ]] || [[ -z $SPOKE_SERVER ]]; then
151+
error "Missing value for one or more of HUB_USERNAME, HUB_PASSWORD, HUB_SERVER, SPOKE_USERNAME, SPOKE_PASSWORD, SPOKE_SERVER. Please update env.properties file with correct parameters and rerun."
152152
fi
153153
fi
154154
fi
@@ -221,16 +221,16 @@ function install_sf_br(){
221221
error="false"
222222
info "Connecting to spoke cluster $SPOKE_SERVER"
223223
#oc login to spoke cluster
224-
${OC} login --token=$SPOKE_OC_TOKEN --server=$SPOKE_SERVER --insecure-skip-tls-verify=true
224+
${OC} login -u $SPOKE_USERNAME -p $SPOKE_PASSWORD --server=$SPOKE_SERVER --insecure-skip-tls-verify=true
225225
validate_sc
226226
./cmd-line-install/install/install-isf-br.sh -s $catalog_image -n $SF_NAMESPACE || error="true"
227227
if [[ $error == "true" ]]; then
228-
${OC} login --token=$HUB_OC_TOKEN --server=$HUB_SERVER --insecure-skip-tls-verify=true
228+
${OC} login -u $HUB_USERNAME -p $HUB_PASSWORD --server=$HUB_SERVER --insecure-skip-tls-verify=true
229229
error "SF install script failed to install on spoke cluster. Logging back into hub cluster $HUB_SERVER."
230230
fi
231231
info "Connecting to hub cluster $HUB_SERVER"
232232
#oc login to the hub cluster
233-
${OC} login --token=$HUB_OC_TOKEN --server=$HUB_SERVER --insecure-skip-tls-verify=true
233+
${OC} login -u $HUB_USERNAME -p $HUB_PASSWORD --server=$HUB_SERVER --insecure-skip-tls-verify=true
234234
apiurl=$(oc whoami --show-server)
235235
cluster=$(echo $apiurl | cut -d":" -f2 | tr -d /)
236236
file=spokes_$cluster.yaml
@@ -240,12 +240,12 @@ function install_sf_br(){
240240

241241
info "Re-connecting to spoke cluster $SPOKE_SERVER"
242242
#oc login to spoke cluster
243-
${OC} login --token=$SPOKE_OC_TOKEN --server=$SPOKE_SERVER --insecure-skip-tls-verify=true
243+
${OC} login -u $SPOKE_USERNAME -p $SPOKE_PASSWORD --server=$SPOKE_SERVER --insecure-skip-tls-verify=true
244244
info "Applying spoke yaml..."
245245
#apply generated yaml file
246246
${OC} apply -f $work_dir/$file || error="true"
247247
if [[ $error == "true" ]]; then
248-
${OC} login --token=$HUB_OC_TOKEN --server=$HUB_SERVER --insecure-skip-tls-verify=true
248+
${OC} login -u $HUB_USERNAME -p $HUB_PASSWORD --server=$HUB_SERVER --insecure-skip-tls-verify=true
249249
error "Failed to apply spoke yaml on spoke cluster $SPOKE_SERVER. Logging back into hub cluster $HUB_SERVER."
250250
fi
251251
info "Waiting for BR Agent service to install on spoke cluster $SPOKE_SERVER..."
@@ -265,13 +265,13 @@ function install_sf_br(){
265265
fi
266266
done
267267
if [[ $(${OC} get fusionserviceinstance ibm-backup-restore-agent-service-instance -n $SF_NAMESPACE -o jsonpath='{.status.installStatus.status}') != "Completed" ]] && [[ $retries == 0 ]]; then
268-
${OC} login --token=$HUB_OC_TOKEN --server=$HUB_SERVER --insecure-skip-tls-verify=true
268+
${OC} login -u $HUB_USERNAME -p $HUB_PASSWORD --server=$HUB_SERVER --insecure-skip-tls-verify=true
269269
error "Timed out waiting for agent service install to come ready on spoke cluster $SPOKE_SERVER. Reconnecting to hub cluster $HUB_SERVER."
270270
fi
271271

272272
info "Re-connecting to hub cluster $HUB_SERVER"
273273
#oc login to the hub cluster
274-
${OC} login --token=$HUB_OC_TOKEN --server=$HUB_SERVER --insecure-skip-tls-verify=true
274+
${OC} login -u $HUB_USERNAME -p $HUB_PASSWORD --server=$HUB_SERVER --insecure-skip-tls-verify=true
275275
success "Spectrum Fusion and Backup and Restore Spoke Service installed."
276276
fi
277277

0 commit comments

Comments
 (0)