Skip to content

Commit 84bd826

Browse files
upodroidupodroid
committed
bump archeio to v0.6.0
1 parent b831a87 commit 84bd826

File tree

5 files changed

+127
-9
lines changed

5 files changed

+127
-9
lines changed

‎.github/PULL_REQUEST_TEMPLATE/pull_request_template.md‎

Whitespace-only changes.

‎infra/gcp/terraform/k8s-infra-oci-proxy-prod/README.md‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
## AWS ↔ GCP region pairing and mapping
2+
3+
This document contains the GCP regions that we serve image registries from including future regions.
4+
5+
At a high level:
6+
- A global GCP loadbalancer routes traffic to the closest Cloud Run service
7+
- Image Manifests are fetched from GCP
8+
- Traffic originating from GCP fetches image blobs from GCP Artifact Registry
9+
- Traffic originating from AWS fetches image blobs from S3 Buckets
10+
- Traffic originating from outside of GCP and AWS is fetched from S3 buckets
11+
- If a GCP region doesn't have an paired AWS region, the user fetches image blobs from AWS Cloudfront CDN.
12+
13+
| Metro / Country | AWS region | GCP region | Is the GCP region deployed? | Blobs served from GCP to non cloud users? | Active GCP Image Registry | Active S3 Bucket | Nearest Blob Location
14+
|---|---|---|---|---|---|---|---|
15+
| South Africa | `af-south-1` | `africa-south1` | 🔴 | No | No | Yes | Same Region | Same Region |
16+
| Taiwan | `ap-east-2` | `asia-east1` | 🟢 | No | Yes | Yes | Same Region |
17+
| Hong Kong (SAR) | `ap-east-1` | `asia-east2` | 🔴 | No | No | Yes | Same Region | Same Region |
18+
| Tokyo, Japan | `ap-northeast-1` | `asia-northeast1` | 🟢 | No | Yes | Yes | Same Region |
19+
| Osaka, Japan | `ap-northeast-3` | `asia-northeast2` | 🟢 | No | Yes | Yes | Same Region |
20+
| Seoul, South Korea | `ap-northeast-2` | `asia-northeast3` | 🔴 | No | No | Yes | Same Region |
21+
| Mumbai, India | `ap-south-1` | `asia-south1` | 🟢 | No | Yes | Yes | Same Region |
22+
| Hydrebad, India | — | `asia-south2` | 🔴 | No | No | — | AWS Cloudfront |
23+
| Singapore | `ap-southeast-1` | `asia-southeast1` | 🔴 | No | Yes | Yes | Same Region |
24+
| Jakarta, Indonesia | `ap-southeast-3` | `asia-southeast2` | 🔴 | No | Yes | Yes | Same Region |
25+
| Sydney, Australia | `ap-southeast-2` | `australia-southeast1`| 🟢 | No | Yes | Yes | Same Region |
26+
| Melbourne, Australia | `ap-southeast-4` | `australia-southeast2` | 🔴 | No | No | Yes | Same Region |
27+
| Warsaw, Poland | — | `europe-central2` | 🔴 | No | No | — | AWS Cloudfront |
28+
| Hamina, Finland | — | `europe-north1` | 🟢 | No | Yes | — | AWS Cloudfront |
29+
| Stockholm, Sweden | `eu-north-1` | `europe-north2` | 🔴 | No | No | Yes | Same Region |
30+
| Madrid, Spain | `eu-south-2` | `europe-southwest1` | 🟢 | No | Yes | Yes | Same Region |
31+
| St. Ghislain, Belgium | — | `europe-west1` | 🟢 | No | Yes | — | Europe |
32+
| London, UK | `eu-west-2` | `europe-west2` | 🟢 | No | Yes | Yes | Same Region |
33+
| Frankfurt, Germany | `eu-central-1` | `europe-west3` | 🟢 | No | Yes | Yes | Same Region |
34+
| Eemshaven, Netherlands | — | `europe-west4` | 🟢 | No | Yes | Yes | Europe |
35+
| Zürich, Switzerland | `eu-central-2` | `europe-west6` | 🔴 | No | No | Yes | Same Region |
36+
| Milan, Italy | `eu-south-1` | `europe-west8` | 🟢 | No | Yes | Yes | Same Region |
37+
| Paris, France | `eu-south-2` | `europe-west9` | 🟢 | No | Yes | Yes | Same Region |
38+
| Berlin, Germany | — | `europe-west10` | 🟢 | No | Yes | Yes | Same Country |
39+
| Turin, Italy | — | `europe-west12` | 🔴 | No | No | — | AWS Cloudfront |
40+
| Doha, Qatar | — | `me-central1` | 🔴 | No | No | — | AWS Cloudfront |
41+
| Dammam, Saudi Arabia | — | `me-central2` | 🔴 | No | No | — | AWS Cloudfront |
42+
| Tel Aviv, Israel | `il-central-1` | `me-west1` | 🔴 | No | No | Yes | Europe |
43+
| Montréal, Canada | `ca-central-1` | `northamerica-northeast1` | 🔴 | No | No | Yes | Same Region |
44+
| Toronto, Canada | — | `northamerica-northeast2` | 🔴 | No | No | — | AWS Cloudfront |
45+
| Querétaro, Mexico | `mx-central-1` | `northamerica-south1` | 🔴 | No | No | Yes | Same Region |
46+
| São Paulo, Brazil | `sa-east-1` | `southamerica-east1` | 🔴 | No | No | Yes | Same Region |
47+
| Santiago, Chile | — | `southamerica-west1` | 🟢 | No | Yes | No | AWS Cloudfront |
48+
| Council Bluffs (Iowa), USA | — | `us-central1` | 🟢 | No | Yes | Yes | `us-east-2` |
49+
| Moncks Corner (South Carolina), USA | — | `us-east1` | 🟢 | No | Yes | — | `us-east-1` |
50+
| Ashburn (N. Virginia), USA | `us-east-1` | `us-east4` | 🟢 | No | Yes | Yes | Same Region |
51+
| Columbus (Ohio), USA | `us-east-2` | `us-east5` | 🟢 | No | Yes | Yes | Same Region |
52+
| Dallas (Texas), USA | — | `us-south1` | 🟢 | No | Yes | — | `us-east-2` |
53+
| The Dalles (Oregon), USA | `us-west-2` | `us-west1` | 🟢 | No | Yes | Yes | Same Region |
54+
| California, USA | `us-west-1` | `us-west2` | 🟢 | No | Yes | Yes | Same Region |
55+
| Salt Lake City (Utah), USA | — | `us-west3` | 🔴 | No | No | — | AWS Cloudfront |
56+
| Las Vegas (Nevada), USA | — | `us-west4` | 🔴 | No | No | — | AWS Cloudfront |
57+
58+
59+
Priority Regions:
60+
- P1
61+
- `af-south-1`. 1st region in Africa
62+
- `me-central1`. 1st region in the Middle East
63+
- `asia-east2`. A paired region that will also serve AWS China traffic.
64+
- `northamerica-northeast1`. First paired region in Canada
65+
- P2
66+
- `europe-north2`. A paired region
67+
- `northamerica-south1` A paired region
68+
- `asia-southeast1`. A paired region
69+
- Backlog
70+
- Remaining US regions
71+
72+
Regions we should replace given promoter capacity:
73+
- `asia-northeast2`, another region of the same country is already active
74+
- `europe-west10`, another region of the same country is already active
75+
76+
As of 13th of December 2025, all the AWS regions that publicly available have been populated and configured in archeio.
77+
78+
```
79+
# aws ec2 describe-regions --all-regions --query "Regions[].RegionName" --output json | jq .[] | awk '{print $0","}' | sort --version-sort
80+
"af-south-1",
81+
"ap-east-1",
82+
"ap-east-2",
83+
"ap-northeast-1",
84+
"ap-northeast-2",
85+
"ap-northeast-3",
86+
"ap-southeast-1",
87+
"ap-southeast-2",
88+
"ap-southeast-3",
89+
"ap-southeast-4",
90+
"ap-southeast-5",
91+
"ap-southeast-6",
92+
"ap-southeast-7",
93+
"ap-south-1",
94+
"ap-south-2",
95+
"ca-central-1",
96+
"ca-west-1",
97+
"eu-central-1",
98+
"eu-central-2",
99+
"eu-north-1",
100+
"eu-south-1",
101+
"eu-south-2",
102+
"eu-west-1",
103+
"eu-west-2",
104+
"eu-west-3",
105+
"il-central-1",
106+
"me-central-1",
107+
"me-south-1",
108+
"mx-central-1",
109+
"sa-east-1",
110+
"us-east-1",
111+
"us-east-2",
112+
"us-west-1",
113+
"us-west-2",
114+
```
115+
116+
Helpful Guides:
117+
- https://cloudregionsmap.z6.web.core.windows.net/

‎infra/gcp/terraform/k8s-infra-oci-proxy-prod/main.tf‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ locals {
2222
module "oci-proxy" {
2323
source = "../modules/oci-proxy"
2424
// ***** production vs staging variables inputs *****
25-
//
26-
// explicitly using default digest here vs staging which overrides it
27-
digest = null
25+
// v0.6.0
26+
digest = "sha256:1f004a487c09c76ebf14d1dc01434aa17e31e39def56451ec5727160fdcd0017"
2827
domain = "registry.k8s.io"
2928
project_id = local.project_id
3029
service_account_name = "oci-proxy-prod"

‎infra/gcp/terraform/modules/oci-proxy/main.tf‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ locals {
2121
environment_variables = [
2222
{
2323
name = "DEFAULT_AWS_BASE_URL",
24-
// AWS Cloudfront
25-
value = "https://d39mqg4b1dx9z1.cloudfront.net",
24+
// AWS ap-east-2 is Taiwan
25+
value = "https://prod-registry-k8s-io-ap-east-2.s3.dualstack.ap-east-2.amazonaws.com",
2626
},
2727
{
2828
name = "UPSTREAM_REGISTRY_ENDPOINT",
@@ -111,8 +111,8 @@ locals {
111111
environment_variables = [
112112
{
113113
name = "DEFAULT_AWS_BASE_URL",
114-
// AWS eu-central-1 is Frankfurt
115-
value = "https://prod-registry-k8s-io-eu-central-1.s3.dualstack.eu-central-1.amazonaws.com",
114+
// AWS Cloudfront
115+
value = "https://d39mqg4b1dx9z1.cloudfront.net",
116116
},
117117
{
118118
name = "UPSTREAM_REGISTRY_ENDPOINT",
@@ -183,8 +183,9 @@ locals {
183183
environment_variables = [
184184
{
185185
name = "DEFAULT_AWS_BASE_URL",
186-
// AWS eu-west-1 is Ireland
187-
value = "https://prod-registry-k8s-io-eu-west-1.s3.dualstack.eu-west-1.amazonaws.com",
186+
// AWS eu-west-2 is London
187+
// https://github.com/kubernetes/registry.k8s.io/blob/main/cmd/archeio/internal/app/buckets.go#L111
188+
value = "https://767373bbdcb8270361b96548387bf2a9ad0d48758c35-eu-west-2.s3.dualstack.eu-west-2.amazonaws.com",
188189
},
189190
{
190191
name = "UPSTREAM_REGISTRY_ENDPOINT",

‎registry.k8s.io/images/k8s-staging-infra-tools/images.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"sha256:a8e39369650944a3bc7f7ce5bc6f28dbc79b4eb856e54d3968e84f0485a29019": ["v0.3.1"]
1313
"sha256:7a4d062fed0dd80d216f94803e7c6bfb06022ae76aa0960602878d964fa9fdd2": ["v0.4.0"]
1414
"sha256:d91229530a784c0569adf7192978f64c9371e906ed726cc3061aa98c2706bdce": ["v0.5.0"]
15+
"sha256:1f004a487c09c76ebf14d1dc01434aa17e31e39def56451ec5727160fdcd0017": ["v0.6.0"]
1516
- name: octodns
1617
dmap:
1718
"sha256:838d6134142eea4ce926c0bfe2f2bd2bbd7580e42e42aea39259575951273c44": ["v20200501-36789b1"]

0 commit comments

Comments
 (0)