From 5996f528873d64fbea7ced97c980099662e49319 Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Fri, 17 May 2024 11:22:25 +0200 Subject: [PATCH] Use operator namespace for signing when it's available in target settings (#257) --- pubtools/_quay/iib_operations.py | 4 +++- tests/test_iib_operations.py | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pubtools/_quay/iib_operations.py b/pubtools/_quay/iib_operations.py index bb3e7a0d..6b7c82c4 100644 --- a/pubtools/_quay/iib_operations.py +++ b/pubtools/_quay/iib_operations.py @@ -101,7 +101,9 @@ def _index_image_to_sign_entries( if internal: dest_registries = ["quay.io"] iib_repo = ( - target_settings["quay_namespace"] + "/" + get_internal_container_repo_name(iib_repo) + target_settings.get("quay_operator_namespace", target_settings["quay_namespace"]) + + "/" + + get_internal_container_repo_name(iib_repo) ) dest_operator_quay_client = _get_operator_quay_client(target_settings) diff --git a/tests/test_iib_operations.py b/tests/test_iib_operations.py index d00156ca..657aa63e 100644 --- a/tests/test_iib_operations.py +++ b/tests/test_iib_operations.py @@ -626,10 +626,10 @@ def test_task_iib_add_bundles_operator_ns( config_file="test-config.yml", signing_key="some-key", reference=[ - "quay.io/some-namespace/operators----index-image:8", - "quay.io/some-namespace/operators----index-image:8-timestamp", - "quay.io/some-namespace/operators----index-image:8", - "quay.io/some-namespace/operators----index-image:8-timestamp", + "quay.io/operator-ns/operators----index-image:8", + "quay.io/operator-ns/operators----index-image:8-timestamp", + "quay.io/operator-ns/operators----index-image:8", + "quay.io/operator-ns/operators----index-image:8-timestamp", ], digest=[ "sha256:a1a1a1", @@ -1548,10 +1548,10 @@ def test_task_iib_build_from_scratch_operator_ns( config_file="test-config.yml", signing_key="some-key", reference=[ - "quay.io/some-namespace/operators----index-image:8", - "quay.io/some-namespace/operators----index-image:8-timestamp", - "quay.io/some-namespace/operators----index-image:8", - "quay.io/some-namespace/operators----index-image:8-timestamp", + "quay.io/operator-ns/operators----index-image:8", + "quay.io/operator-ns/operators----index-image:8-timestamp", + "quay.io/operator-ns/operators----index-image:8", + "quay.io/operator-ns/operators----index-image:8-timestamp", ], digest=[ "sha256:a1a1a1",