From a3a38ee2a23d876efabe9be00548bf807d9af267 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Thu, 23 Mar 2023 15:28:27 -0700
Subject: [PATCH] Handle credential repository not being defined in container
roles
This attribute is optional.
Change-Id: I0875b25d07f5fde0f6c3a3b62c0dac93770ffc49
---
roles/promote-container-image/tasks/main.yaml | 1 +
roles/upload-container-image/tasks/main.yaml | 1 +
2 files changed, 2 insertions(+)
diff --git a/roles/promote-container-image/tasks/main.yaml b/roles/promote-container-image/tasks/main.yaml
index 8bd84f584..e2a42c2d0 100644
--- a/roles/promote-container-image/tasks/main.yaml
+++ b/roles/promote-container-image/tasks/main.yaml
@@ -10,6 +10,7 @@
- name: Verify repository permission
when: |
+ container_registry_credentials[zj_image.registry].repository is defined and
not zj_image.repository | regex_search(container_registry_credentials[zj_image.registry].repository)
loop: "{{ container_images }}"
loop_control:
diff --git a/roles/upload-container-image/tasks/main.yaml b/roles/upload-container-image/tasks/main.yaml
index a2cfa25ec..063097588 100644
--- a/roles/upload-container-image/tasks/main.yaml
+++ b/roles/upload-container-image/tasks/main.yaml
@@ -10,6 +10,7 @@
- name: Verify repository permission
when: |
+ container_registry_credentials[zj_image.registry].repository is defined and
not zj_image.repository | regex_search(container_registry_credentials[zj_image.registry].repository)
loop: "{{ container_images }}"
loop_control: