Skip to content

Commit 298ad3c

Browse files
committed
fix: namespace GHCR images under scality/zenko/ to avoid permission conflicts
The pre-existing ghcr.io/scality/mongodb-sharded package was linked to the old scality/mongodb-sharded repository, causing 403 Forbidden on push from Zenko CI. Move all images under the Zenko repo namespace: - ghcr.io/scality/zenko/mongodb-sharded - ghcr.io/scality/zenko/mongodb-exporter - ghcr.io/scality/zenko/os-shell Also update upstream vendoring references from the defunct scality/mongodb-sharded repo to bitnami/containers.
1 parent 69b9cc7 commit 298ad3c

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

.github/workflows/build-mongodb-images.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@ jobs:
3636
include:
3737
- name: mongodb-sharded-8.0
3838
context: solution-base/images/mongodb-sharded/8.0/debian-12
39-
image: scality/mongodb-sharded
39+
image: scality/zenko/mongodb-sharded
4040
semver_tag: "8.0.13"
4141
minor_tag: "8.0"
4242
- name: mongodb-sharded-8.2
4343
context: solution-base/images/mongodb-sharded/8.2/debian-12
44-
image: scality/mongodb-sharded
44+
image: scality/zenko/mongodb-sharded
4545
semver_tag: "8.2.6"
4646
minor_tag: "8.2"
4747
- name: mongodb-exporter
4848
context: solution-base/images/mongodb-sharded/mongodb-exporter/0/debian-12
49-
image: scality/mongodb-exporter
49+
image: scality/zenko/mongodb-exporter
5050
semver_tag: "0.49.0"
5151
minor_tag: ""
5252
- name: os-shell
5353
context: solution-base/images/mongodb-sharded/os-shell/12/debian-12
54-
image: scality/os-shell
54+
image: scality/zenko/os-shell
5555
semver_tag: "12"
5656
minor_tag: ""
5757
steps:

solution-base/deps.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# yq eval 'sortKeys(.)' -i deps.yaml
44
mongodb-sharded:
55
sourceRegistry: ghcr.io
6-
image: scality/mongodb-sharded
6+
image: scality/zenko/mongodb-sharded
77
tag: "8.0.13"
88
mongodb-sharded-exporter:
99
sourceRegistry: ghcr.io
10-
image: scality/mongodb-exporter
10+
image: scality/zenko/mongodb-exporter
1111
tag: "0.49.0"
1212
mongodb-shell:
1313
sourceRegistry: ghcr.io
14-
image: scality/os-shell
14+
image: scality/zenko/os-shell
1515
tag: "12"

solution-base/images/mongodb-sharded/README.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ while we transition to the official MongoDB images.
77

88
| Image | Directory | Registry | Tags |
99
|-------|-----------|----------|------|
10-
| mongodb-sharded 8.0 | `8.0/debian-12/` | `ghcr.io/scality/mongodb-sharded` | `8.0.13`, `8.0` |
11-
| mongodb-sharded 8.2 | `8.2/debian-12/` | `ghcr.io/scality/mongodb-sharded` | `8.2.6`, `8.2` |
12-
| mongodb-exporter | `mongodb-exporter/0/debian-12/` | `ghcr.io/scality/mongodb-exporter` | `0.49.0` |
13-
| os-shell | `os-shell/12/debian-12/` | `ghcr.io/scality/os-shell` | `12` |
10+
| mongodb-sharded 8.0 | `8.0/debian-12/` | `ghcr.io/scality/zenko/mongodb-sharded` | `8.0.13`, `8.0` |
11+
| mongodb-sharded 8.2 | `8.2/debian-12/` | `ghcr.io/scality/zenko/mongodb-sharded` | `8.2.6`, `8.2` |
12+
| mongodb-exporter | `mongodb-exporter/0/debian-12/` | `ghcr.io/scality/zenko/mongodb-exporter` | `0.49.0` |
13+
| os-shell | `os-shell/12/debian-12/` | `ghcr.io/scality/zenko/os-shell` | `12` |
1414

1515
## Directory Structure
1616

@@ -42,20 +42,20 @@ solution-base/images/mongodb-sharded/
4242
## Vendored Scripts
4343

4444
The `prebuildfs/` and `rootfs/` directories are vendored from
45-
`https://github.com/scality/mongodb-sharded` and committed to Git.
45+
`https://github.com/bitnami/containers` and committed to Git.
4646
The Dockerfiles depend on them (`COPY prebuildfs /`, `COPY rootfs /`).
4747

4848
To re-vendor after upstream changes:
4949

5050
```bash
51-
git clone --depth 1 https://github.com/scality/mongodb-sharded.git /tmp/mongodb-sharded
51+
git clone --depth 1 https://github.com/bitnami/containers.git /tmp/bitnami-containers
5252

53-
# Copy for each image (example for 8.0):
54-
cp -r /tmp/mongodb-sharded/8.0/debian-12/prebuildfs solution-base/images/mongodb-sharded/8.0/debian-12/
55-
cp -r /tmp/mongodb-sharded/8.0/debian-12/rootfs solution-base/images/mongodb-sharded/8.0/debian-12/
56-
# Repeat for 8.2, mongodb-exporter, os-shell as needed
53+
# Copy for each image (example for 8.2):
54+
cp -r /tmp/bitnami-containers/bitnami/mongodb-sharded/8.2/debian-12/prebuildfs solution-base/images/mongodb-sharded/8.2/debian-12/
55+
cp -r /tmp/bitnami-containers/bitnami/mongodb-sharded/8.2/debian-12/rootfs solution-base/images/mongodb-sharded/8.2/debian-12/
56+
# Repeat for other images as needed
5757

58-
rm -rf /tmp/mongodb-sharded
58+
rm -rf /tmp/bitnami-containers
5959
git diff # review changes
6060
```
6161

@@ -64,22 +64,22 @@ git diff # review changes
6464
```bash
6565
# MongoDB 8.0
6666
docker build \
67-
-t ghcr.io/scality/mongodb-sharded:8.0.13 \
67+
-t ghcr.io/scality/zenko/mongodb-sharded:8.0.13 \
6868
solution-base/images/mongodb-sharded/8.0/debian-12
6969

7070
# MongoDB 8.2
7171
docker build \
72-
-t ghcr.io/scality/mongodb-sharded:8.2.6 \
72+
-t ghcr.io/scality/zenko/mongodb-sharded:8.2.6 \
7373
solution-base/images/mongodb-sharded/8.2/debian-12
7474

7575
# MongoDB Exporter
7676
docker build \
77-
-t ghcr.io/scality/mongodb-exporter:0.49.0 \
77+
-t ghcr.io/scality/zenko/mongodb-exporter:0.49.0 \
7878
solution-base/images/mongodb-sharded/mongodb-exporter/0/debian-12
7979

8080
# OS Shell
8181
docker build \
82-
-t ghcr.io/scality/os-shell:12 \
82+
-t ghcr.io/scality/zenko/os-shell:12 \
8383
solution-base/images/mongodb-sharded/os-shell/12/debian-12
8484
```
8585

@@ -89,7 +89,7 @@ For multi-arch builds (amd64 + arm64):
8989
docker buildx build \
9090
--platform linux/amd64,linux/arm64 \
9191
--push \
92-
-t ghcr.io/scality/mongodb-sharded:8.0.13 \
92+
-t ghcr.io/scality/zenko/mongodb-sharded:8.0.13 \
9393
solution-base/images/mongodb-sharded/8.0/debian-12
9494
```
9595

@@ -100,7 +100,7 @@ builds and pushes multi-arch images automatically.
100100

101101
- **Trigger**: Push to paths under `solution-base/images/mongodb-sharded/**`,
102102
or manual `workflow_dispatch`.
103-
- **Registry**: `ghcr.io/scality/`
103+
- **Registry**: `ghcr.io/scality/zenko/`
104104
- **Base image**: `minideb:bookworm` is pinned by digest — update it manually
105105
when needed by changing the `FROM` line in each Dockerfile.
106106

@@ -119,17 +119,17 @@ builds and pushes multi-arch images automatically.
119119
```yaml
120120
mongodb-sharded:
121121
sourceRegistry: ghcr.io
122-
image: scality/mongodb-sharded
122+
image: scality/zenko/mongodb-sharded
123123
tag: "8.0.14"
124124
```
125125
4. Run CI or wait for push trigger.
126126
5. Validate with Zenko e2e/CTST.
127127
128128
### Vendoring upstream script changes
129129
130-
1. Check changes at `https://github.com/scality/mongodb-sharded/commits/main/`.
131-
2. Clone the upstream repo and copy the updated `prebuildfs/` / `rootfs/`
132-
directories (see "Vendored Scripts" section above).
130+
1. Check changes at `https://github.com/bitnami/containers/tree/main/bitnami/mongodb-sharded`.
131+
2. Compare upstream changes against our vendored scripts and copy relevant
132+
updated `prebuildfs/` / `rootfs/` files.
133133
3. Review `git diff` for relevant changes.
134134
4. Commit, push, test.
135135

solution-base/mongodb/how_to_upgrade.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ Image sources live under `solution-base/images/mongodb-sharded/`.
2727
```yaml
2828
mongodb-sharded:
2929
sourceRegistry: ghcr.io
30-
image: scality/mongodb-sharded
30+
image: scality/zenko/mongodb-sharded
3131
tag: "<NEW_VERSION>"
3232
```
3333
5. Validate with Zenko e2e/CTST before merging.
3434
3535
### Re-vendoring upstream Bitnami scripts
3636
37-
When `scality/mongodb-sharded` upstream changes need to be pulled in,
38-
clone the repo and copy the updated `prebuildfs/` / `rootfs/` directories
37+
When upstream Bitnami script changes need to be pulled in,
38+
compare `bitnami/containers` and copy the updated `prebuildfs/` / `rootfs/` directories
3939
into the corresponding image directories. See
4040
`solution-base/images/mongodb-sharded/README.md` for the detailed steps.
4141

@@ -78,7 +78,7 @@ our use case.
7878

7979
9. When bumping the Helm chart, also check whether the image Dockerfile or
8080
Bitnami scripts changed for that chart version. If so, re-vendor the scripts
81-
from `scality/mongodb-sharded` and rebuild the images before deploying the
81+
from `bitnami/containers` and rebuild the images before deploying the
8282
new chart (see `solution-base/images/mongodb-sharded/README.md`).
8383

8484
10. Passing CI tests is not enough, you must also perform an upgrade check with

0 commit comments

Comments
 (0)