diff --git a/docs/platform/howto/manage-org-vpc-peering-aws.md b/docs/platform/howto/manage-org-vpc-peering-aws.md index 3e99e6d4..c85afece 100644 --- a/docs/platform/howto/manage-org-vpc-peering-aws.md +++ b/docs/platform/howto/manage-org-vpc-peering-aws.md @@ -1,5 +1,5 @@ --- -title: Set up an organization VPC peering with AWS +title: Manage an organization VPC peering with AWS sidebar_label: AWS peering --- diff --git a/docs/platform/howto/manage-org-vpc-peering-azure.md b/docs/platform/howto/manage-org-vpc-peering-azure.md index 6ad8dea4..94caaefd 100644 --- a/docs/platform/howto/manage-org-vpc-peering-azure.md +++ b/docs/platform/howto/manage-org-vpc-peering-azure.md @@ -1,5 +1,5 @@ --- -title: Set up an organization VPC peering with Microsoft Azure +title: Manage an organization VPC peering with Microsoft Azure sidebar_label: Azure peering --- diff --git a/docs/platform/howto/manage-organization-vpc.md b/docs/platform/howto/manage-organization-vpc.md index 45265f47..8191ccce 100644 --- a/docs/platform/howto/manage-organization-vpc.md +++ b/docs/platform/howto/manage-organization-vpc.md @@ -248,11 +248,9 @@ Replace the following placeholders with meaningful data: ## Delete an organization VPC :::important - -- Before deleting an organization VPC, move all services out of this VPC. -- Once an organization VPC is deleted, the cloud-provider side of the peering connections - becomes `inactive` or `deleted`. - +Remove all services from your VCP before you delete it. To remove the services from the VCP, +either migrate them out of the VCP or delete them. Deleting the VPC terminates its peering +connections, if any. ::: Delete an organization VPC using a tool of your choice: diff --git a/docs/platform/howto/manage-project-vpc.md b/docs/platform/howto/manage-project-vpc.md index c06fe3a2..2b945f3a 100644 --- a/docs/platform/howto/manage-project-vpc.md +++ b/docs/platform/howto/manage-project-vpc.md @@ -251,11 +251,9 @@ Replace the following placeholders with meaningful data: ## Delete a project VPC :::important - -- Before you delete a project VPC, move all services out of this VPC. -- Once a project VPC is deleted, the cloud-provider side of the peering connections -becomes `inactive` or `deleted`. - +Remove all services from your VCP before you delete it. To remove the services from the VCP, +either migrate them out of the VCP or delete them. Deleting the VPC terminates its peering +connections, if any. ::: Delete a project VPC using a tool of your choice: diff --git a/docs/platform/howto/vnet-peering-azure.md b/docs/platform/howto/vnet-peering-azure.md index ee3182f5..02f41dc1 100644 --- a/docs/platform/howto/vnet-peering-azure.md +++ b/docs/platform/howto/vnet-peering-azure.md @@ -1,5 +1,5 @@ --- -title: Set up a project VPC peering with Microsoft Azure +title: Manage a project VPC peering with Microsoft Azure sidebar_label: Azure peering --- diff --git a/docs/platform/howto/vpc-peering-aws.md b/docs/platform/howto/vpc-peering-aws.md index c473f4dd..889316f3 100644 --- a/docs/platform/howto/vpc-peering-aws.md +++ b/docs/platform/howto/vpc-peering-aws.md @@ -1,5 +1,5 @@ --- -title: Set up a project VPC peering with AWS +title: Manage a project VPC peering with AWS sidebar_label: AWS peering --- diff --git a/docs/platform/howto/vpc-peering-gcp.md b/docs/platform/howto/vpc-peering-gcp.md index 85b961f6..b387018d 100644 --- a/docs/platform/howto/vpc-peering-gcp.md +++ b/docs/platform/howto/vpc-peering-gcp.md @@ -1,5 +1,5 @@ --- -title: Set up a project VPC peering with Google Cloud +title: Manage a project VPC peering with Google Cloud sidebar_label: Google Cloud peering --- diff --git a/docs/platform/howto/vpc-peering-upcloud.md b/docs/platform/howto/vpc-peering-upcloud.md index 486c00b3..e215ea74 100644 --- a/docs/platform/howto/vpc-peering-upcloud.md +++ b/docs/platform/howto/vpc-peering-upcloud.md @@ -1,5 +1,5 @@ --- -title: Set up a project VPC peering with UpCloud +title: Manage a project VPC peering with UpCloud sidebar_label: UpCloud peering --- diff --git a/static/includes/vpc/delete-org-peering.md b/static/includes/vpc/delete-org-peering.md index 4faddd7a..c5ea78b0 100644 --- a/static/includes/vpc/delete-org-peering.md +++ b/static/includes/vpc/delete-org-peering.md @@ -3,11 +3,9 @@ import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; :::important - -- Before deleting an organization VPC, move all services out of this VPC. -- Once an organization VPC is deleted, the cloud-provider side of the peering connections - becomes `inactive` or `deleted`. - +Once you delete your VPC peering on the Aiven Platform, the cloud-provider side of the +peering connection becomes `inactive` or `deleted`, and the traffic between the disconnected +VPCs is terminated. ::: Delete an organization VPC peering using a tool of your choice: @@ -18,19 +16,22 @@ Delete an organization VPC peering using a tool of your choice: 1. Log in to the [Aiven Console](https://console.aiven.io/), and click **Admin** in the top navigation bar. 1. Click in the sidebar. -1. On the **Organization VPCs** page, find a VPC to be deleted and click - > . -1. In the **Confirmation** window, click **Delete VPC**. +1. On the **Organization VPCs** page, select an organization VPC. +1. On the **Organization VPC details** page, go to the **VPC peering connection** section, + find the peering to be deleted, and click > + . +1. In the **Confirmation** window, click **Delete VPC peering**. -Run the `avn organization vpc delete` command: +Run the `avn organization vpc peering-connection delete` command: ```bash -avn organization vpc delete \ - --organization-id ORGANIZATION_ID \ - --project-vpc-id ORGANIZATION_VPC_ID +avn organization vpc peering-connection delete \ + --organization-id ORGANIZATION_ID \ + --vpc-id ORGANIZATION_VPC_ID \ + --peering-connection-id ORGANIZATION_VPC_PEERING_ID ``` Replace the following: @@ -38,28 +39,33 @@ Replace the following: - `ORGANIZATION_ID` with the ID of your Aiven organization, for example, `org1a2b3c4d5e6` - `ORGANIZATION_VPC_ID` with the ID of your Aiven organization VPC, for example, `12345678-1a2b-3c4d-5f6g-1a2b3c4d5e6f` +- `ORGANIZATION_VPC_PEERING_ID` with the ID of your peering connection, for example + `1a2b3c4d-1234-a1b2-c3d4-1a2b3c4d5e6f` -Make an API call to the `OrganizationVpcDelete` endpoint: +Make an API call to the `OrganizationVpcPeeringConnectionDelete` endpoint: ```bash curl --request DELETE \ - --url https://api.aiven.io/v1/organization/ORGANIZATION_ID/vpcs/VPC_ID \ - --header 'Authorization: Bearer BEARER_TOKEN' \ + --url https://api.aiven.io/v1/organization/ORGANIZATION_ID/vpcs/ORGANIZATION_VPC_ID/peering-connections/peer-accounts/PEER_CLOUD_ACCOUNT/peer-vpcs/PEER_VPC \ + --header 'Authorization: Bearer BEARER_TOKEN' ``` Replace the following placeholders with meaningful data: -- `ORGANIZATION_ID` -- `VPC_ID` +- `ORGANIZATION_ID`: Aiven organization ID +- `ORGANIZATION_VPC_ID`: Aiven organization VPC ID +- `PEER_CLOUD_ACCOUNT`: your cloud provider account ID or name +- `PEER_VPC`: your cloud provider VPC ID or name - `BEARER_TOKEN` -To delete your -[aiven_organization_vpc](https://registry.terraform.io/providers/aiven/aiven/latest/docs/resources/project_vpc) -resource, run `terraform destroy`. +To delete your Aiven organization VPC peering connection resource, run `terraform destroy`. +See the +[Aiven Provider for Terraform documentation](https://registry.terraform.io/providers/aiven/aiven/latest/docs) +for details. diff --git a/static/includes/vpc/delete-pj-peering.md b/static/includes/vpc/delete-pj-peering.md index b8e5ba88..17e335fe 100644 --- a/static/includes/vpc/delete-pj-peering.md +++ b/static/includes/vpc/delete-pj-peering.md @@ -3,42 +3,50 @@ import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; :::important - -- Before you delete a project VPC, move all services out of this VPC. -- Once a project VPC is deleted, the cloud-provider side of the peering connections -becomes `inactive` or `deleted`. - +Once you delete your VPC peering on the Aiven Platform, the cloud-provider side of the +peering connection becomes `inactive` or `deleted`, and the traffic between the disconnected +VPCs is terminated. ::: -Delete a project VPC using a tool of your choice: +Delete a project VPC peering using a tool of your choice: -1. Log in to [Aiven Console](https://console.aiven.io/), and go to your project. +1. Log in to the [Aiven Console](https://console.aiven.io/), and go to your project page. 1. Click in the sidebar. -1. On the **Virtual private clouds** page, find a VPC to be deleted and click - > . -1. In the **Confirmation** window, click **Delete VPC**. +1. On the **Virtual private clouds** page, select a project VPC. +1. On the **VPC details** page, go to the **VPC peering connection** section, + find the peering to be deleted, and click > + . +1. In the **Confirmation** window, click **Delete VPC peering**. -Run the [avn vpc delete](/docs/tools/cli/vpc#avn-vpc-delete) command: +Run the +[avn vpc peering-connection delete](/docs/tools/cli/vpc#avn-vpc-peering-connection-delete) +command: ```bash -avn vpc delete \ - --project-vpc-id PROJECT_VPC_ID +avn vpc peering-connection delete \ + --project-vpc-id PROJECT_VPC_ID \ + --peer-cloud-account PEER_CLOUD_ACCOUNT \ + --peer-vpc PEER_VPC_ID ``` -Replace `PROJECT_VPC_ID` with the ID of your Aiven project VPC, for example, -`12345678-1a2b-3c4d-5f6g-1a2b3c4d5e6f`. +Replace the following with meaningful values: + +- `PROJECT_VPC_ID`, for example `12345678-1a2b-3c4d-5f6g-1a2b3c4d5e6f` +- `PEER_CLOUD_ACCOUNT`, for example `012345678901` +- `PEER_VPC_ID`, for example `vpc-abcdef01234567890` Make an API call to the -[VpcDelete](https://api.aiven.io/doc/#tag/Project/operation/VpcDelete) endpoint: +[VpcPeeringConnectionDelete](https://api.aiven.io/doc/#tag/Project/operation/VpcPeeringConnectionDelete) +endpoint: ```bash curl --request DELETE \ @@ -46,16 +54,25 @@ curl --request DELETE \ --header 'Authorization: Bearer BEARER_TOKEN' \ ``` +```bash +curl --request DELETE \ + --url https://api.aiven.io/v1/project/PROJECT_ID/vpcs/PROJECT_VPC_ID/peering-connections/peer-accounts/PEER_CLOUD_ACCOUNT/peer-vpcs/PEER_VPC \ + --header 'Authorization: Bearer BEARER_TOKEN' +``` + Replace the following placeholders with meaningful data: -- `PROJECT_ID` (Aiven project name) -- `PROJECT_VPC_ID` (Aiven project VPC ID) +- `PROJECT_ID`: Aiven project name +- `PROJECT_VPC_ID`: Aiven project VPC ID +- `PEER_CLOUD_ACCOUNT`: your cloud provider account ID or name +- `PEER_VPC`: your cloud provider VPC ID or name - `BEARER_TOKEN` -To delete your -[aiven_project_vpc](https://registry.terraform.io/providers/aiven/aiven/latest/docs/resources/project_vpc) -resource, run `terraform destroy`. +To delete your Aiven project VPC peering connection resource, run `terraform destroy`. +See the +[Aiven Provider for Terraform documentation](https://registry.terraform.io/providers/aiven/aiven/latest/docs) +for details.