Merge branch 'main' into tf-efs-v4-31

awslabs · May 8, 2023 · 12bc2cf · 12bc2cf
2 parents c0e82f7 + 7b8ac17
commit 12bc2cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tests/e2e/tests/test_sanity_portforward.py b/tests/e2e/tests/test_sanity_portforward.py
@@ -12,7 +12,7 @@
 import pytest
 import boto3
 
-from e2e.utils.utils import get_s3_client
+from e2e.utils.utils import get_s3_client, kubectl_wait_pods
 
 from e2e.utils.constants import DEFAULT_USER_NAMESPACE
 from e2e.utils.utils import load_yaml_file, wait_for, rand_name, write_yaml_file, WaitForCircuitBreakerError
@@ -215,6 +215,9 @@ def test_ack_crds(
         cmd = f"kubectl -n kubeflow-user-example-com exec -it {notebook_name}-0 -- /bin/bash -c".split()
         cmd.append(sub_cmd)
 
+        # kubectl wait --for=condition=ready pod -l 'app in ({notebook_name})' --timeout=240s -n {DEFAULT_USER_NAMESPACE}
+        kubectl_wait_pods(notebook_name, DEFAULT_USER_NAMESPACE)
+
         output = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode()
         print(output)
         # The second condition is now required in case the kfp test runs before this one.

diff --git a/website/content/en/docs/deployment/rds-s3/guide.md b/website/content/en/docs/deployment/rds-s3/guide.md
@@ -123,7 +123,7 @@ export PIPELINE_S3_CREDENTIAL_OPTION=static
 PYTHONPATH=.. python utils/rds-s3/auto-rds-s3-setup.py --region $CLUSTER_REGION --cluster $CLUSTER_NAME --bucket $S3_BUCKET --db_instance_name $DB_INSTANCE_NAME  --rds_secret_name $RDS_SECRET_NAME --db_subnet_group_name $DB_SUBNET_GROUP_NAME --pipeline_s3_credential_option $PIPELINE_S3_CREDENTIAL_OPTION
 {{< /tab >}}
    {{< tab header="IAM User" lang="toml" >}}
-PYTHONPATH=.. python utils/rds-s3/auto-rds-s3-setup.py --region $CLUSTER_REGION --cluster $CLUSTER_NAME --bucket $S3_BUCKET -s3_aws_access_key_id $MINIO_AWS_ACCESS_KEY_ID --s3_aws_secret_access_key $MINIO_AWS_SECRET_ACCESS_KEY --db_instance_name $DB_INSTANCE_NAME --s3_secret_name $S3_SECRET_NAME  --rds_secret_name $RDS_SECRET_NAME --db_subnet_group_name $DB_SUBNET_GROUP_NAME --pipeline_s3_credential_option $PIPELINE_S3_CREDENTIAL_OPTION
+PYTHONPATH=.. python utils/rds-s3/auto-rds-s3-setup.py --region $CLUSTER_REGION --cluster $CLUSTER_NAME --bucket $S3_BUCKET --s3_aws_access_key_id $MINIO_AWS_ACCESS_KEY_ID --s3_aws_secret_access_key $MINIO_AWS_SECRET_ACCESS_KEY --db_instance_name $DB_INSTANCE_NAME --s3_secret_name $S3_SECRET_NAME  --rds_secret_name $RDS_SECRET_NAME --db_subnet_group_name $DB_SUBNET_GROUP_NAME --pipeline_s3_credential_option $PIPELINE_S3_CREDENTIAL_OPTION
 {{< /tab >}}
    {{< /tabpane >}}