feat: allow prefix to image names
This is in order to support proxy/caching without
needing to maintain separate inventory override of
each and every image.
Closes-Bug: CLOUDOPS-761
Change-Id: I7585377939ac7e6757f1cdbcfcdffae02bab2715
diff --git a/build/pin-images.py b/build/pin-images.py
index b5e1ada..30700c3 100755
--- a/build/pin-images.py
+++ b/build/pin-images.py
@@ -22,7 +22,7 @@
if token:
headers["Authorization"] = f"Bearer {token}"
else:
- r = requests.get(url, timeout=5, verify=False)
+ r = requests.get(url, timeout=5)
auth_header = r.headers.get("Www-Authenticate")
if auth_header:
realm = auth_header.split(",")[0].split("=")[1].strip('"')
@@ -31,7 +31,6 @@
realm,
timeout=5,
params={"scope": f"repository:{image_ref.path()}:pull"},
- verify=False,
)
r.raise_for_status()
@@ -44,7 +43,6 @@
f"https://{image_ref.domain()}/v2/{image_ref.path()}/manifests/{image_ref['tag']}",
timeout=5,
headers=headers,
- verify=False,
)
r.raise_for_status()
return r.headers["Docker-Content-Digest"]
@@ -55,7 +53,6 @@
f"https://{image_ref.domain()}/v2/{image_ref.path()}/manifests/{image_ref['tag']}",
timeout=5,
headers=headers,
- verify=False,
)
r.raise_for_status()
return r.headers["Docker-Content-Digest"]
@@ -159,15 +156,19 @@
if image in SKIP_IMAGE_LIST:
continue
- image_src = data["_atmosphere_images"][image].replace(
- "{{ atmosphere_release }}", data["atmosphere_release"]
+ image_src = (
+ data["_atmosphere_images"][image]
+ .replace("{{ atmosphere_release }}", data["atmosphere_release"])
+ .replace("{{ atmosphere_image_prefix }}", "")
)
pinned_image = get_pinned_image(image_src).replace(
"harbor.atmosphere.dev", "registry.atmosphere.dev"
)
LOG.info("Pinning image %s from %s to %s", image, image_src, pinned_image)
- data["_atmosphere_images"][image] = pinned_image
+ data["_atmosphere_images"][image] = "{{ atmosphere_image_prefix }}%s" % (
+ pinned_image,
+ )
yaml.dump(data, args.dst)