Skip to content

Commit 945162e

Browse files
committed
hack registry to fix catalogsource
1 parent 762ad5e commit 945162e

File tree

3 files changed

+38
-0
lines changed

3 files changed

+38
-0
lines changed

buildchain/static-container-registry/static-container-registry.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ def create_config(
118118
types {{ }} default_type "application/json";
119119
return 200 '{payload:s}';
120120
}}
121+
location = /v2/{name:s}/tags/list {{
122+
types {{ }} default_type "application/json";
123+
return 200 '{payload:s}';
124+
}}
121125
""".format(
122126
name=name,
123127
name_prefix=name_prefix.lstrip("/"),
@@ -145,6 +149,13 @@ def create_config(
145149
try_files manifest.json =404;
146150
error_page 404 @404_tag;
147151
}}
152+
location = "/v2/{name:s}/manifests/{tag:s}" {{
153+
alias {server_root:s}/{name:s}/{tag:s}/;
154+
types {{ }} default_type "application/vnd.docker.distribution.manifest.v2+json";
155+
add_header 'Docker-Content-Digest' 'sha256:{digest:s}';
156+
try_files manifest.json =404;
157+
error_page 404 @404_tag;
158+
}}
148159
""".format(
149160
name=name,
150161
tag=tag,
@@ -162,6 +173,13 @@ def create_config(
162173
try_files manifest.json =404;
163174
error_page 404 @404_tag;
164175
}}
176+
location = "/v2/{name:s}/manifests/sha256:{digest:s}" {{
177+
alias {server_root:s}/{name:s}/{tag:s}/;
178+
types {{ }} default_type "application/vnd.docker.distribution.manifest.v2+json";
179+
add_header 'Docker-Content-Digest' 'sha256:{digest:s}';
180+
try_files manifest.json =404;
181+
error_page 404 @404_tag;
182+
}}
165183
""".format(
166184
name=name,
167185
tag=tag,
@@ -184,6 +202,10 @@ def create_config(
184202
alias {server_root:s}/{name:s}/;
185203
try_files {paths:s} =404;
186204
}}
205+
location ~ "/v2/{name:s}/blobs/sha256:([a-f0-9]{{64}})" {{
206+
alias {server_root:s}/{name:s}/;
207+
try_files {paths:s} =404;
208+
}}
187209
""".format(
188210
name_prefix=name_prefix.lstrip("/"),
189211
server_root=server_root,

salt/metalk8s/addons/olm/catalog/deployed/cluster-catalog.sls

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!jinja | metalk8s_kubernetes
2+
{%- from "metalk8s/repo/macro.sls" import build_image_name with context %}
23
4+
---
35
apiVersion: olm.operatorframework.io/v1
46
kind: ClusterCatalog
57
metadata:
@@ -10,3 +12,14 @@ spec:
1012
image:
1113
ref: quay.io/operatorhubio/catalog:latest
1214
pollIntervalMinutes: 10
15+
---
16+
apiVersion: olm.operatorframework.io/v1
17+
kind: ClusterCatalog
18+
metadata:
19+
name: metalk8s-catalog-source
20+
spec:
21+
source:
22+
type: Image
23+
image:
24+
ref: {{ build_image_name("metalk8s-catalog-source") }}
25+
pollIntervalMinutes: 10

salt/metalk8s/container-engine/containerd/installed.sls

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ Configure registry IP in containerd conf:
112112
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{ repo.registry_endpoint }}"]
113113
endpoint = [{{ registry_eps | join(",") }}]
114114
115+
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."registry.metalk8s.lan"]
116+
endpoint = [{{ registry_eps | join(",") }}]
117+
115118
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
116119
runtime_type = "io.containerd.runc.v2"
117120
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]

0 commit comments

Comments
 (0)