Merge branch 'main' into standard-upgrades

cockroachdb · Jan 16, 2025 · 7262f9c · 7262f9c
2 parents 28008da + 9b758fa
commit 7262f9c
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 99 deletions.
diff --git a/src/current/cockroachcloud/connect-to-an-advanced-cluster.md b/src/current/cockroachcloud/connect-to-an-advanced-cluster.md
@@ -48,10 +48,6 @@ Private connectivity can be configured only after a cluster is created.
 
 #### GCP Private Service Connect
 
-{{site.data.alerts.callout_info}}
-{% include_cached feature-phases/preview.md %}
-{{site.data.alerts.end}}
-
 1. Navigate to your cluster's **Networking > Private endpoint** tab.
 1. Click **Add a private endpoint**. Copy the value provided for **Target service**. Do not close this browser window.
 1. In a new browser window, log in to Google Cloud Console, go to **Private Service Connect** section, and create a new endpoint in the same VPC as your application. For details, refer to [Create an endpoint](https://cloud.google.com/vpc/docs/configure-private-service-connect-services#create-endpoint) in the Google Cloud documentation.
@@ -99,10 +95,6 @@ To establish an AWS PrivateLink connection, refer to [Managing AWS PrivateLink f
 
 #### Azure Private Link
 
-{{site.data.alerts.callout_success}}
-{% include_cached feature-phases/preview.md %}
-{{site.data.alerts.end}}
-
 1. Navigate to your cluster's **Networking > Private endpoint** tab.
 1. Click **Add a private endpoint**. Copy the value provided for **Alias**. Do not close this browser window.
 1. In a new browser window, log in to Azure Console and create a new private endpoint for your cluster.

diff --git a/src/current/cockroachcloud/connect-to-your-cluster.md b/src/current/cockroachcloud/connect-to-your-cluster.md
@@ -73,10 +73,6 @@ Self-service VPC peering setup is not supported for CockroachDB {{ site.data.pro
 
 #### GCP Private Service Connect
 
-{{site.data.alerts.callout_info}}
-{% include_cached feature-phases/preview.md %}
-{{site.data.alerts.end}}
-
 1. Navigate to your cluster's **Networking > Private endpoint** tab.
 1. Click **Add a private endpoint**. Copy the value provided for **Target service**. Do not close this browser window.
 1. In a new browser window, log in to Google Cloud Console, go to **Private Service Connect** section, and create a new endpoint in the same VPC as your application. For details, refer to [Create an endpoint](https://cloud.google.com/vpc/docs/configure-private-service-connect-services#create-endpoint) in the Google Cloud documentation.
@@ -104,10 +100,6 @@ To establish an AWS PrivateLink connection, refer to [Managing AWS PrivateLink f
 
 #### Azure Private Link
 
-{{site.data.alerts.callout_success}}
-{% include_cached feature-phases/preview.md %}
-{{site.data.alerts.end}}
-
 1. Navigate to your cluster's **Networking > Private endpoint** tab.
 1. Click **Add a private endpoint**. Copy the value provided for **Alias**. Do not close this browser window.
 1. In a new browser window, log in to Azure Console and create a new private endpoint for your cluster.

diff --git a/src/current/cockroachcloud/network-authorization.md b/src/current/cockroachcloud/network-authorization.md
@@ -16,7 +16,7 @@ You can authorize network access to your cluster by:
 - [Adding an authorized range of public IP addresses](#ip-allowlisting).
 - Setting up private connectivity so that inbound connections to your cluster from your cloud tenant are made over the cloud provider's private network rather than over the public internet, for enhanced network security and reduced network latency. Available for CockroachDB {{ site.data.products.advanced }} and CockroachDB {{ site.data.products.standard }}. If you use IP allowlisting rules together with private connectivity, private networks do not need to be added to that allowlist.
 
-    - <a id="gcp-private-service-connect"></a><a id="gcp-vpc-peering"></a><a id="vpc-peering"></a>CockroachDB {{ site.data.products.advanced }} or {{ site.data.products.standard }} clusters deployed on GCP can connect privately using GCP Private Service Connect (PSC) (Preview) or GCP VPC peering. PSC allows you to connect your cluster directly to a VPC within your Google Cloud project, while VPC Peering allows you to peer your cluster's VPC in CockroachDB {{ site.data.products.cloud }} to a VPC within your Google Cloud project.
+    - <a id="gcp-private-service-connect"></a><a id="gcp-vpc-peering"></a><a id="vpc-peering"></a>CockroachDB {{ site.data.products.advanced }} or {{ site.data.products.standard }} clusters deployed on GCP can connect privately using GCP Private Service Connect (PSC) or GCP VPC peering. PSC allows you to connect your cluster directly to a VPC within your Google Cloud project, while VPC Peering allows you to peer your cluster's VPC in CockroachDB {{ site.data.products.cloud }} to a VPC within your Google Cloud project.
     - <a id="aws-privatelink"></a>CockroachDB {{ site.data.products.advanced }} or {{ site.data.products.standard }} clusters deployed on AWS can connect privately using AWS PrivateLink, which allows you to connect your cluster to a VPC within your AWS account.
     - <a id="azure-private-link"></a>CockroachDB {{ site.data.products.advanced }} clusters deployed on Azure can connect privately using Azure Private Link, which allows you to connect your cluster to a virtual network within your Azure tenant.
 

diff --git a/src/current/cockroachcloud/security-overview.md b/src/current/cockroachcloud/security-overview.md
@@ -152,7 +152,7 @@ The following table summarizes the CockroachDB {{ site.data.products.cloud }} se
       <td>&nbsp;</td>
       <td>✓</td>
       <td>✓</td>
-      <td><a href="{% link cockroachcloud/network-authorization.md %}#gcp-private-service-connect">Private Service Connect (PSC) (Preview)</a> for GCP clusters</td>
+      <td><a href="{% link cockroachcloud/network-authorization.md %}#gcp-private-service-connect">Private Service Connect (PSC) for GCP clusters</td>
     </tr>
     <tr>
       <td>&nbsp;</td>