Default to AWS when possible #147
Conversation
…n list from CIDR data
k8s-ci-robot
added
do-not-merge/work-in-progress
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: BenTheElder The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
approved
BenTheElder
force-pushed
the
gcptoo
branch
2 times, most recently
from
af4b051 to
acdd4eb
Compare
BenTheElder
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
| @@ -45,6 +45,7 @@ func main() { | |||
| UpstreamRegistryPath: getEnv("UPSTREAM_REGISTRY_PATH", "k8s-artifacts-prod/images"), | |||
| InfoURL: "https://github.com/kubernetes/registry.k8s.io", | |||
| PrivacyURL: "https://www.linuxfoundation.org/privacy-policy/", | |||
| DefaultAWSBaseURL: getEnv("DEFAULT_AWS_BASE_URL", "https://prod-registry-k8s-io-us-east-1.s3.dualstack.us-east-1.amazonaws.com"), | |||
There was a problem hiding this comment.
notable change: we have this env / default URL now xref kubernetes/k8s.io#4739
| awsRegion, ipIsKnown := regionMapper.GetIP(clientIP) | ||
| if !ipIsKnown { | ||
| // no region match, redirect to main upstream registry | ||
| // if client is coming from GCP, stay in GCP |
There was a problem hiding this comment.
notable redirect logic change here
|
The rest of the diff is renaming things to be multi-cloud instead of AWS specific, and then refactoring the generator to support GCP data. I also pulled the downloaded data out to unmodified files instead of inlining them as go strings, it's slightly more code but I think cleaner and if anyone vendors this package they can keep only the go files with processed data not the raw strings. |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
gcr.io/k8s-staging-infra-tools/archeio:v20230208-v0.0.4-40-g59e0fac@sha256:43904e32c58803bed1dbf6457e1b5abdd1409c976bb951f5bb32cf3b37772b2f is live |
|
tagged v0.1.0 (spoke to arnaud) |
|
gcr.io/k8s-staging-infra-tools/archeio:v20230208-v0.1.0@sha256:43904e32c58803bed1dbf6457e1b5abdd1409c976bb951f5bb32cf3b37772b2f after manual rerun trigger, not sure why tag push didn't trigger. https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/post-oci-proxy-push-images/1623444771215249408 |
Implements #143
TODO: Configure default s3 backend per cloud run region in the production config via env before we ship this. Possibly use cloudfront for that purpose instead in the future.
EDIT: see kubernetes/k8s.io#4739
This is a messy change, a lot of things needed renaming / refactoring.
The pre-parsed generator is still a bit gross, but fairly well tested and covers GCP + AWS now.