diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index a89ff5e880..328cc6b147 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -93,7 +93,6 @@ body: - "Azure" - "GCP" - "AWS" - - "Digital Ocean" - "kind" validations: required: false diff --git a/.github/workflows/test-provider.yaml b/.github/workflows/test-provider.yaml index fef1254495..b56eae90b9 100644 --- a/.github/workflows/test-provider.yaml +++ b/.github/workflows/test-provider.yaml @@ -49,7 +49,6 @@ jobs: provider: - aws - azure - - do - gcp - local - existing @@ -88,7 +87,6 @@ jobs: kv/data/repository/nebari-dev/nebari/azure/nebari-dev-ci/github-nebari-dev-repo-ci client_id | ARM_CLIENT_ID; kv/data/repository/nebari-dev/nebari/azure/nebari-dev-ci/github-nebari-dev-repo-ci tenant_id | ARM_TENANT_ID; kv/data/repository/nebari-dev/nebari/azure/nebari-dev-ci/github-nebari-dev-repo-ci subscription_id | ARM_SUBSCRIPTION_ID; - kv/data/repository/nebari-dev/nebari/shared_secrets DIGITALOCEAN_TOKEN | DIGITALOCEAN_TOKEN; kv/data/repository/nebari-dev/nebari/shared_secrets SPACES_ACCESS_KEY_ID | SPACES_ACCESS_KEY_ID; kv/data/repository/nebari-dev/nebari/shared_secrets SPACES_SECRET_ACCESS_KEY | SPACES_SECRET_ACCESS_KEY; diff --git a/README.md b/README.md index 5dcce91258..197c2013cc 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ Hence, it is not necessary to know any of the technologies mentioned above to ha ### Cloud Providers ☁️ -Nebari offers out-of-the-box support for the major public cloud providers: [Digital Ocean](https://www.digitalocean.com/), +Nebari offers out-of-the-box support for the major public cloud providers: Amazon [AWS](https://aws.amazon.com/), [GCP](https://cloud.google.com/ "Google Cloud Provider"), and Microsoft [Azure](https://azure.microsoft.com/en-us/). ![High-level illustration of Nebari architecture](https://raw.githubusercontent.com/nebari-dev/nebari-docs/main/docs/static/img/welcome/nebari_overview_sequence.png) diff --git a/tests/tests_integration/test_all_clouds.py b/tests/tests_integration/test_all_clouds.py index 8a163fb7b6..6a9bf87dd4 100644 --- a/tests/tests_integration/test_all_clouds.py +++ b/tests/tests_integration/test_all_clouds.py @@ -2,7 +2,6 @@ def test_service_status(deploy): - """Tests if deployment on DigitalOcean succeeds""" service_urls = deploy["stages/07-kubernetes-services"]["service_urls"]["value"] assert ( requests.get(service_urls["jupyterhub"]["health_url"], verify=False).status_code diff --git a/tests/tests_unit/cli_validate/do.happy.yaml b/tests/tests_unit/cli_validate/do.happy.yaml index 4ca0b2e62f..0ec2a7b528 100644 --- a/tests/tests_unit/cli_validate/do.happy.yaml +++ b/tests/tests_unit/cli_validate/do.happy.yaml @@ -23,6 +23,3 @@ theme: certificate: type: lets-encrypt acme_email: test@example.com -digital_ocean: - kubernetes_version: '1.20.2-do.0' - region: nyc3 diff --git a/tests/tests_unit/conftest.py b/tests/tests_unit/conftest.py index ce60e44799..7744bb28a9 100644 --- a/tests/tests_unit/conftest.py +++ b/tests/tests_unit/conftest.py @@ -7,7 +7,6 @@ from _nebari.constants import ( AWS_DEFAULT_REGION, AZURE_DEFAULT_REGION, - DO_DEFAULT_REGION, GCP_DEFAULT_REGION, ) from _nebari.initialize import render_config @@ -63,22 +62,6 @@ def _mock_return_value(return_value): "1.20", ], "_nebari.provider.cloud.azure_cloud.check_credentials": None, - # Digital Ocean - "_nebari.provider.cloud.digital_ocean.kubernetes_versions": [ - "1.19.2-do.3", - "1.20.2-do.0", - "1.21.5-do.0", - ], - "_nebari.provider.cloud.digital_ocean.check_credentials": None, - "_nebari.provider.cloud.digital_ocean.regions": [ - {"name": "New York 3", "slug": "nyc3"}, - ], - "_nebari.provider.cloud.digital_ocean.instances": [ - {"name": "s-2vcpu-4gb", "slug": "s-2vcpu-4gb"}, - {"name": "g-2vcpu-8gb", "slug": "g-2vcpu-8gb"}, - {"name": "g-8vcpu-32gb", "slug": "g-8vcpu-32gb"}, - {"name": "g-4vcpu-16gb", "slug": "g-4vcpu-16gb"}, - ], # Google Cloud "_nebari.provider.cloud.google_cloud.kubernetes_versions": [ "1.18", @@ -101,15 +84,6 @@ def _mock_return_value(return_value): @pytest.fixture( params=[ # project, namespace, domain, cloud_provider, region, ci_provider, auth_provider - ( - "pytestdo", - "dev", - "do.nebari.dev", - schema.ProviderEnum.do, - DO_DEFAULT_REGION, - CiEnum.github_actions, - AuthenticationEnum.password, - ), ( "pytestaws", "dev", diff --git a/tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-do-310-customauth.yaml b/tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-aws-310-customauth.yaml similarity index 87% rename from tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-do-310-customauth.yaml rename to tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-aws-310-customauth.yaml index 50a2b89af4..f68e36a002 100644 --- a/tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-do-310-customauth.yaml +++ b/tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-aws-310-customauth.yaml @@ -1,6 +1,6 @@ -project_name: do-pytest -provider: do -domain: do.nebari.dev +project_name: aws-pytest +provider: aws +domain: aws.nebari.dev certificate: type: self-signed security: @@ -48,22 +48,31 @@ theme: terraform_state: type: remote namespace: dev -digital_ocean: - region: nyc3 - kubernetes_version: 1.21.5-do.0 +amazon_web_services: + kubernetes_version: '1.20' + region: us-east-1 node_groups: general: - instance: s-2vcpu-4gb + instance: m5.2xlarge min_nodes: 1 max_nodes: 1 + gpu: false + single_subnet: false + permissions_boundary: user: - instance: g-2vcpu-8gb - min_nodes: 1 + instance: m5.xlarge + min_nodes: 0 max_nodes: 5 + gpu: false + single_subnet: false + permissions_boundary: worker: - instance: g-2vcpu-8gb - min_nodes: 1 + instance: m5.xlarge + min_nodes: 0 max_nodes: 5 + gpu: false + single_subnet: false + permissions_boundary: profiles: jupyterlab: - display_name: Small Instance diff --git a/tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-do-310.yaml b/tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-aws-310.yaml similarity index 86% rename from tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-do-310.yaml rename to tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-aws-310.yaml index a3a06da6a2..69eca528a1 100644 --- a/tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-do-310.yaml +++ b/tests/tests_unit/qhub-config-yaml-files-for-upgrade/qhub-config-aws-310.yaml @@ -1,6 +1,6 @@ -project_name: do-pytest -provider: do -domain: do.nebari.dev +project_name: aws-pytest +provider: aws +domain: aws.nebari.dev certificate: type: self-signed security: @@ -45,22 +45,31 @@ theme: terraform_state: type: remote namespace: dev -digital_ocean: - region: nyc3 - kubernetes_version: 1.21.5-do.0 +amazon_web_services: + kubernetes_version: '1.20' + region: us-east-1 node_groups: general: - instance: s-2vcpu-4gb + instance: m5.2xlarge min_nodes: 1 max_nodes: 1 + gpu: false + single_subnet: false + permissions_boundary: user: - instance: g-2vcpu-8gb - min_nodes: 1 + instance: m5.xlarge + min_nodes: 0 max_nodes: 5 + gpu: false + single_subnet: false + permissions_boundary: worker: - instance: g-2vcpu-8gb - min_nodes: 1 + instance: m5.xlarge + min_nodes: 0 max_nodes: 5 + gpu: false + single_subnet: false + permissions_boundary: profiles: jupyterlab: - display_name: Small Instance diff --git a/tests/tests_unit/test_cli_init.py b/tests/tests_unit/test_cli_init.py index 9afab5ddc5..03b22557ae 100644 --- a/tests/tests_unit/test_cli_init.py +++ b/tests/tests_unit/test_cli_init.py @@ -17,13 +17,11 @@ "aws": ["1.20"], "azure": ["1.20"], "gcp": ["1.20"], - "do": ["1.21.5-do.0"], } MOCK_CLOUD_REGIONS = { "aws": ["us-east-1"], "azure": [AZURE_DEFAULT_REGION], "gcp": ["us-central1"], - "do": ["nyc3"], } @@ -70,7 +68,7 @@ def generate_test_data_test_cli_init_happy_path(): """ test_data = [] - for provider in ["local", "aws", "azure", "gcp", "do", "existing"]: + for provider in ["local", "aws", "azure", "gcp", "existing"]: for region in get_cloud_regions(provider): for project_name in ["testproject"]: for domain_name in [f"{project_name}.example.com"]: @@ -265,9 +263,6 @@ def get_provider_section_header(provider: str): return "google_cloud_platform" if provider == "azure": return "azure" - if provider == "do": - return "digital_ocean" - return "" @@ -278,8 +273,6 @@ def get_cloud_regions(provider: str): return MOCK_CLOUD_REGIONS["gcp"] if provider == "azure": return MOCK_CLOUD_REGIONS["azure"] - if provider == "do": - return MOCK_CLOUD_REGIONS["do"] return "" @@ -291,7 +284,4 @@ def get_kubernetes_versions(provider: str): return MOCK_KUBERNETES_VERSIONS["gcp"] if provider == "azure": return MOCK_KUBERNETES_VERSIONS["azure"] - if provider == "do": - return MOCK_KUBERNETES_VERSIONS["do"] - return "" diff --git a/tests/tests_unit/test_cli_validate.py b/tests/tests_unit/test_cli_validate.py index faf2efa8a1..b12d3cfea0 100644 --- a/tests/tests_unit/test_cli_validate.py +++ b/tests/tests_unit/test_cli_validate.py @@ -221,7 +221,6 @@ def test_cli_validate_error_from_env( } }, ), - ("do", {"digital_ocean": {"kubernetes_version": "1.20", "region": "nyc3"}}), pytest.param( "local", {"security": {"authentication": {"type": "Auth0"}}}, @@ -248,7 +247,6 @@ def test_cli_validate_error_missing_cloud_env( "ARM_TENANT_ID", "ARM_CLIENT_ID", "ARM_CLIENT_SECRET", - "DIGITALOCEAN_TOKEN", "SPACES_ACCESS_KEY_ID", "SPACES_SECRET_ACCESS_KEY", "AUTH0_CLIENT_ID", diff --git a/tests/tests_unit/test_schema.py b/tests/tests_unit/test_schema.py index fa6a0c747c..b88a32eec7 100644 --- a/tests/tests_unit/test_schema.py +++ b/tests/tests_unit/test_schema.py @@ -102,11 +102,6 @@ def test_provider_validation(config_schema, provider, exception): "kubernetes_version": "1.18", }, ), - ( - "do", - "digital_ocean", - {"region": "nyc3", "kubernetes_version": "1.19.2-do.3"}, - ), ( "azure", "azure", diff --git a/tests/tests_unit/test_upgrade.py b/tests/tests_unit/test_upgrade.py index f6e3f80348..fd70f367f7 100644 --- a/tests/tests_unit/test_upgrade.py +++ b/tests/tests_unit/test_upgrade.py @@ -25,17 +25,17 @@ def qhub_users_import_json(): "old_qhub_config_path_str,attempt_fixes,expect_upgrade_error", [ ( - "./qhub-config-yaml-files-for-upgrade/qhub-config-do-310.yaml", + "./qhub-config-yaml-files-for-upgrade/qhub-config-aws-310.yaml", False, False, ), ( - "./qhub-config-yaml-files-for-upgrade/qhub-config-do-310-customauth.yaml", + "./qhub-config-yaml-files-for-upgrade/qhub-config-aws-310-customauth.yaml", False, True, ), ( - "./qhub-config-yaml-files-for-upgrade/qhub-config-do-310-customauth.yaml", + "./qhub-config-yaml-files-for-upgrade/qhub-config-aws-310-customauth.yaml", True, False, ),