Skip to content

Commit 6695191

Browse files
alphaprinzzregvart
andauthored
[Backport into 5.18] bucket notifications - connect mount should be unique (#1514) (#1515)
* bucket notifications - connect mount should be unique (#1514) Signed-off-by: Amit Prinz Setter <alphaprinz@gmail.com> * Also install setuptools Without setuptools, running operator-courier fails with: ``` Traceback (most recent call last): File "/Users/zregvart/work/croz/noobaa/noobaa-operator/build/_output/venv/bin/operator-courier", line 5, in <module> from operatorcourier.cli import main File "/Users/zregvart/work/croz/noobaa/noobaa-operator/build/_output/venv/lib/python3.13/site-packages/operatorcourier/cli.py", line 2, in <module> import pkg_resources ModuleNotFoundError: No module named 'pkg_resources' make: *** [gen-olm] Error 1 ``` Signed-off-by: Zoran Regvart <zoran@regvart.com> --------- Signed-off-by: Amit Prinz Setter <alphaprinz@gmail.com> Signed-off-by: Zoran Regvart <zoran@regvart.com> Co-authored-by: Zoran Regvart <zoran@regvart.com>
1 parent 946b8c5 commit 6695191

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ gen-olm: gen
149149
. $(VENV)/bin/activate && \
150150
pip3 install --upgrade pip && \
151151
pip3 install operator-courier==2.1.11 && \
152+
pip3 install setuptools && \
152153
operator-courier --verbose verify --ui_validate_io $(OLM)
153154
docker build -t $(CATALOG_IMAGE) -f build/catalog-source.Dockerfile .
154155
@echo "✅ gen-olm"

pkg/system/phase2_creating.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ func (r *Reconciler) SetDesiredCoreApp() error {
568568
for _, notifSecret := range r.NooBaa.Spec.BucketNotifications.Connections {
569569
secretVolumeMounts := []corev1.VolumeMount{{
570570
Name: notifSecret.Name,
571-
MountPath: "/etc/notif_connect/",
571+
MountPath: "/etc/notif_connect/" + notifSecret.Name,
572572
ReadOnly: true,
573573
}}
574574
util.MergeVolumeMountList(&c.VolumeMounts, &secretVolumeMounts)

0 commit comments

Comments
 (0)