From 8481dc9c47cd7b098aa6b8e8f53aeae7940d50ae Mon Sep 17 00:00:00 2001 From: Julio Pasinatto Date: Sat, 11 Jan 2025 06:12:46 -0300 Subject: [PATCH] K8SPSMDB-1109: Fix demand-backup-fs in Azure (#1784) * K8SPSMDB-1109: Fix demand-backup-fs in Azure * Change conditional syntax --- e2e-tests/demand-backup-fs/run | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e-tests/demand-backup-fs/run b/e2e-tests/demand-backup-fs/run index 845a824b3..a571f1fbb 100755 --- a/e2e-tests/demand-backup-fs/run +++ b/e2e-tests/demand-backup-fs/run @@ -50,8 +50,8 @@ create_infra ${namespace} kubectl_bin delete ns storage || : -if [[ $EKS == 1 || -n ${OPENSHIFT} ]]; then - sc=$(kubectl_bin get storageclass | tail -1 | awk '{print $1}') +if [[ $GKE != 1 ]]; then + sc=$(kubectl_bin get storageclass | tail -1 | awk '{print $1}') kubectl_bin annotate storageclass ${sc} storageclass.kubernetes.io/is-default-class=true fi @@ -64,7 +64,7 @@ kubectl_bin apply \ -f "${conf_dir}/client.yml" log "creating PSMDB cluster ${cluster}" -if [[ $EKS == 1 || -n ${OPENSHIFT} ]]; then +if [[ $GKE != 1 ]]; then nfs_ip=$(kubectl_bin -n storage get svc nfs-service -o jsonpath={.spec.clusterIP}) sed "s/nfs-service.storage.svc.cluster.local/${nfs_ip}/g" ${test_dir}/conf/${cluster}.yaml \ | kubectl_bin apply -f - @@ -75,7 +75,7 @@ fi log 'wait for all 3 pods to start' wait_for_running ${cluster}-rs0 3 -if [[ $EKS -ne 1 && -z ${OPENSHIFT} ]]; then +if [[ $GKE == 1 ]]; then log 'checking if statefulset created with expected config' compare_kubectl statefulset/${cluster}-rs0 fi