diff --git a/content/admin/data-residency/network-details-for-ghecom.md b/content/admin/data-residency/network-details-for-ghecom.md index fa87b67f8ef3..c850517c7831 100644 --- a/content/admin/data-residency/network-details-for-ghecom.md +++ b/content/admin/data-residency/network-details-for-ghecom.md @@ -36,39 +36,34 @@ To access your enterprise on {% data variables.enterprise.data_residency_site %} These are {% data variables.product.company_short %}'s IP address ranges for enterprises hosted in the EU. -#### Ranges for egress traffic - -* 108.143.221.96/28 -* 20.61.46.32/28 -* 20.224.62.160/28 -* 51.12.252.16/28 -* 74.241.131.48/28 -* 20.240.211.176/28 - -#### Ranges for ingress traffic - -* 108.143.197.176/28 -* 20.123.213.96/28 -* 20.224.46.144/28 -* 20.240.194.240/28 -* 20.240.220.192/28 -* 20.240.211.208/28 +| Ranges for egress traffic | Ranges for ingress traffic | +|--------------------------|---------------------------| +| 108.143.221.96/28 | 108.143.197.176/28 | +| 20.61.46.32/28 | 20.123.213.96/28 | +| 20.224.62.160/28 | 20.224.46.144/28 | +| 51.12.252.16/28 | 20.240.194.240/28 | +| 74.241.131.48/28 | 20.240.220.192/28 | +| 20.240.211.176/28 | 20.240.211.208/28 | ### Australia These are {% data variables.product.company_short %}'s IP address ranges for enterprises hosted in Australia. -#### Ranges for egress traffic +| Ranges for egress traffic | Ranges for ingress traffic | +|--------------------------|---------------------------| +| 20.5.34.240/28 | 4.237.73.192/28 | +| 20.5.146.128/28 | 20.5.226.112/28 | +| 68.218.155.16/28 | 20.248.163.176/28 | -* 20.5.34.240/28 -* 20.5.146.128/28 -* 68.218.155.16/28 +### US -#### Ranges for ingress traffic +These are {% data variables.product.company_short %}'s IP address ranges for enterprises hosted in the US. -* 4.237.73.192/28 -* 20.5.226.112/28 -* 20.248.163.176/28 +| Ranges for egress traffic | Ranges for ingress traffic | +|--------------------------|---------------------------| +| 20.221.76.128/28 | 74.249.180.192/28 | +| 135.233.115.208/28 | 48.214.149.96/28 | +| 20.118.27.192/28 | 172.202.123.176/28 | ## Supported regions for Azure private networking @@ -90,6 +85,14 @@ If you use Azure private networking for {% data variables.product.company_short | arm64 | `australiaeast`, `australiacentral` | | GPU | N/A | +### Supported regions in the US + +| Runner type | Supported regions | +| ----------- | ----------------- | +| x64 | `centralus`, `eastus2`, `westus3` | +| arm64 | `centralus`, `eastus2`, `westus3` | +| GPU | `centralus`, `eastus2`, `westus3` | + ## IP ranges for {% data variables.product.prodname_importer_proper_name %} If you're running a migration to your enterprise with {% data variables.product.prodname_importer_proper_name %}, you may need to add certain ranges to an IP allow list. See [AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/managing-access-for-a-migration-between-github-products#configuring-ip-allow-lists-for-migrations). @@ -134,3 +137,10 @@ You must allow: * 20.5.34.240/28 * 20.5.146.128/28 * 68.218.155.16/28 + +### Required in the US + +* 130.213.245.128/28 +* 20.171.204.144/28 +* 20.171.204.176/28 +* 4.150.167.192/28 diff --git a/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md b/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md index 500867685d0d..ee281f84be65 100644 --- a/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md +++ b/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md @@ -20,7 +20,7 @@ To set up a trial, you must be signed in to a personal account. If you don't hav Set up a trial of {% data variables.product.prodname_ghe_cloud %} {% octicon "link-external" height:16 %} ->[!IMPORTANT] Your trial enterprise will be hosted in the USA. If you require {% data variables.enterprise.data_residency_short %} outside the USA, contact {% data variables.contact.contact_sales_data_residency %}. +>[!IMPORTANT] Your trial enterprise will be hosted in the US. If you require {% data variables.enterprise.data_residency_short %} in a specific region, contact {% data variables.contact.contact_sales_data_residency %}. {% data reusables.enterprise.enterprise-types %} diff --git a/data/reusables/actions/azure-vnet-supported-regions.md b/data/reusables/actions/azure-vnet-supported-regions.md index d8bd16929c70..82afe2664ec3 100644 --- a/data/reusables/actions/azure-vnet-supported-regions.md +++ b/data/reusables/actions/azure-vnet-supported-regions.md @@ -8,6 +8,7 @@ The following regions are supported on {% data variables.product.prodname_dotcom
  • AustraliaEast
  • BrazilSouth
  • CanadaCentral
    • +
  • CanadaEast
  • CentralUs
  • EastAsia
  • EastUs
    • diff --git a/data/reusables/data-residency/when-you-adopt-data-residency.md b/data/reusables/data-residency/when-you-adopt-data-residency.md index 4a577a273a1e..72ca1d801f9c 100644 --- a/data/reusables/data-residency/when-you-adopt-data-residency.md +++ b/data/reusables/data-residency/when-you-adopt-data-residency.md @@ -1,8 +1,9 @@ -When you adopt {% data variables.enterprise.data_residency %}, you can choose where your company's code and data are stored. Your enterprise will be hosted on a dedicated subdomain of {% data variables.enterprise.data_residency_site %}. +When you adopt {% data variables.enterprise.data_residency %}, you can choose where your company's code and data are stored. Your enterprise will be hosted on a dedicated subdomain of {% data variables.enterprise.data_residency_site %}. Data residency makes it easy to separate open source and enterprise work, and helps you meet specific data residency compliance requirements. The available regions are: -* The EU +* EU * Australia +* US In the future, {% data variables.product.github %} plans to offer {% data variables.enterprise.data_residency_short %} in more regions. diff --git a/data/variables/product.yml b/data/variables/product.yml index 1fa15998219f..3edbd67a4956 100644 --- a/data/variables/product.yml +++ b/data/variables/product.yml @@ -202,8 +202,8 @@ prodname_code_security: '{% ifversion ghas-products %}Code Security{% else %}Adv prodname_secret_protection: '{% ifversion ghas-products %}Secret Protection{% else %}Advanced Security{% endif %}' prodname_cs_or_sp: '{% ifversion ghas-products %}Secret Protection or Code Security{% else %}Advanced Security{% endif %}' prodname_cs_and_sp: '{% ifversion ghas-products %}Secret Protection and Code Security{% else %}Advanced Security{% endif %}' -UI_advanced_security: '{% ifversion ghas-products %}{% data variables.product.prodname_AS %}{% elsif code-security-wording-only %}Code security{% else %}Code security and analysis{% endif %}' -UI_advanced_security_ent: '{% ifversion ghas-products %}{% data variables.product.prodname_AS %}{% elsif code-security-wording-only-enterprise %}Code security{% else %}Code security and analysis{% endif %}' +UI_advanced_security: '{% ifversion ghas-products %}{% data variables.product.prodname_AS %}{% elsif ghes > 3.15 %}Code security{% else %}Code security and analysis{% endif %}' +UI_advanced_security_ent: '{% ifversion ghas-products %}{% data variables.product.prodname_AS %}{% elsif ghes > 3.14 %}Code security{% else %}Code security and analysis{% endif %}' UI_code_security_scanning: '{% ifversion ghas-products %}Code Security{% else %}Code scanning{% endif %}' UI_secret_protection_scanning: '{% ifversion ghas-products %}Secret Protection{% else %}Secret scanning{% endif %}'