Skip to content

Commit c65120d

Browse files
docs-botdocs-bot
authored
Merge pull request #38237 from github/repo-sync
Repo sync
2 parents e325d49 + 7ebdcad commit c65120d

File tree

5 files changed

+42
-30
lines changed

5 files changed

+42
-30
lines changed

‎content/admin/data-residency/network-details-for-ghecom.md

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,34 @@ To access your enterprise on {% data variables.enterprise.data_residency_site %}
3636

3737
These are {% data variables.product.company_short %}'s IP address ranges for enterprises hosted in the EU.
3838

39-
#### Ranges for egress traffic
40-
41-
* 108.143.221.96/28
42-
* 20.61.46.32/28
43-
* 20.224.62.160/28
44-
* 51.12.252.16/28
45-
* 74.241.131.48/28
46-
* 20.240.211.176/28
47-
48-
#### Ranges for ingress traffic
49-
50-
* 108.143.197.176/28
51-
* 20.123.213.96/28
52-
* 20.224.46.144/28
53-
* 20.240.194.240/28
54-
* 20.240.220.192/28
55-
* 20.240.211.208/28
39+
| Ranges for egress traffic | Ranges for ingress traffic |
40+
|--------------------------|---------------------------|
41+
| 108.143.221.96/28 | 108.143.197.176/28 |
42+
| 20.61.46.32/28 | 20.123.213.96/28 |
43+
| 20.224.62.160/28 | 20.224.46.144/28 |
44+
| 51.12.252.16/28 | 20.240.194.240/28 |
45+
| 74.241.131.48/28 | 20.240.220.192/28 |
46+
| 20.240.211.176/28 | 20.240.211.208/28 |
5647

5748
### Australia
5849

5950
These are {% data variables.product.company_short %}'s IP address ranges for enterprises hosted in Australia.
6051

61-
#### Ranges for egress traffic
52+
| Ranges for egress traffic | Ranges for ingress traffic |
53+
|--------------------------|---------------------------|
54+
| 20.5.34.240/28 | 4.237.73.192/28 |
55+
| 20.5.146.128/28 | 20.5.226.112/28 |
56+
| 68.218.155.16/28 | 20.248.163.176/28 |
6257

63-
* 20.5.34.240/28
64-
* 20.5.146.128/28
65-
* 68.218.155.16/28
58+
### US
6659

67-
#### Ranges for ingress traffic
60+
These are {% data variables.product.company_short %}'s IP address ranges for enterprises hosted in the US.
6861

69-
* 4.237.73.192/28
70-
* 20.5.226.112/28
71-
* 20.248.163.176/28
62+
| Ranges for egress traffic | Ranges for ingress traffic |
63+
|--------------------------|---------------------------|
64+
| 20.221.76.128/28 | 74.249.180.192/28 |
65+
| 135.233.115.208/28 | 48.214.149.96/28 |
66+
| 20.118.27.192/28 | 172.202.123.176/28 |
7267

7368
## Supported regions for Azure private networking
7469

@@ -90,6 +85,14 @@ If you use Azure private networking for {% data variables.product.company_short
9085
| arm64 | `australiaeast`, `australiacentral` |
9186
| GPU | N/A |
9287

88+
### Supported regions in the US
89+
90+
| Runner type | Supported regions |
91+
| ----------- | ----------------- |
92+
| x64 | `centralus`, `eastus2`, `westus3` |
93+
| arm64 | `centralus`, `eastus2`, `westus3` |
94+
| GPU | `centralus`, `eastus2`, `westus3` |
95+
9396
## IP ranges for {% data variables.product.prodname_importer_proper_name %}
9497

9598
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:
134137
* 20.5.34.240/28
135138
* 20.5.146.128/28
136139
* 68.218.155.16/28
140+
141+
### Required in the US
142+
143+
* 130.213.245.128/28
144+
* 20.171.204.144/28
145+
* 20.171.204.176/28
146+
* 4.150.167.192/28

‎content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To set up a trial, you must be signed in to a personal account. If you don't hav
2020

2121
<a href="https://github.com/account/enterprises/new?ref_cta=GHEC+trial&ref_loc=setting+up+a+trial+of+github+enterprise+cloud&ref_page=docs" target="_blank" class="btn btn-primary mt-3 mr-3 no-underline"><span>Set up a trial of {% data variables.product.prodname_ghe_cloud %}</span> {% octicon "link-external" height:16 %}</a>
2222

23-
>[!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 %}.
23+
>[!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 %}.
2424
2525
{% data reusables.enterprise.enterprise-types %}
2626

‎data/reusables/actions/azure-vnet-supported-regions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ The following regions are supported on {% data variables.product.prodname_dotcom
88
<li><code>AustraliaEast</code></li>
99
<li><code>BrazilSouth</code></li>
1010
<li><code>CanadaCentral</code></li>
11+
<li><code>CanadaEast</code></li>
1112
<li><code>CentralUs</code></li>
1213
<li><code>EastAsia</code></li>
1314
<li><code>EastUs</code></li>

‎data/reusables/data-residency/when-you-adopt-data-residency.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
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 %}.
1+
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.
22

33
The available regions are:
44

5-
* The EU
5+
* EU
66
* Australia
7+
* US
78

89
In the future, {% data variables.product.github %} plans to offer {% data variables.enterprise.data_residency_short %} in more regions.

‎data/variables/product.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ prodname_code_security: '{% ifversion ghas-products %}Code Security{% else %}Adv
202202
prodname_secret_protection: '{% ifversion ghas-products %}Secret Protection{% else %}Advanced Security{% endif %}'
203203
prodname_cs_or_sp: '{% ifversion ghas-products %}Secret Protection or Code Security{% else %}Advanced Security{% endif %}'
204204
prodname_cs_and_sp: '{% ifversion ghas-products %}Secret Protection and Code Security{% else %}Advanced Security{% endif %}'
205-
UI_advanced_security: '{% ifversion ghas-products %}{% data variables.product.prodname_AS %}{% elsif code-security-wording-only %}Code security{% else %}Code security and analysis{% endif %}'
206-
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 %}'
205+
UI_advanced_security: '{% ifversion ghas-products %}{% data variables.product.prodname_AS %}{% elsif ghes > 3.15 %}Code security{% else %}Code security and analysis{% endif %}'
206+
UI_advanced_security_ent: '{% ifversion ghas-products %}{% data variables.product.prodname_AS %}{% elsif ghes > 3.14 %}Code security{% else %}Code security and analysis{% endif %}'
207207
UI_code_security_scanning: '{% ifversion ghas-products %}Code Security{% else %}Code scanning{% endif %}'
208208
UI_secret_protection_scanning: '{% ifversion ghas-products %}Secret Protection{% else %}Secret scanning{% endif %}'
209209

0 commit comments

Comments
 (0)