update openshift registry: handle missing disconnected operators

karmab · May 5, 2024 · 7909e11 · 7909e11
1 parent 3a80340
commit 7909e11
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/kvirt/cluster/openshift/disconnected/scripts/mirror-config.yaml.sample b/kvirt/cluster/openshift/disconnected/scripts/mirror-config.yaml.sample
@@ -4,20 +4,14 @@ storageConfig:
   registry:
     imageURL: {{ disconnected_url or '$LOCAL_REGISTRY' }}/openshift/release/metadata:latest
 mirror:
-  #platform:
-  #  channels:
-  #  - name: stable-4.10
-  #    minVersion: 4.10.24
-  #    maxVersion: 4.10.24
-  #  graph: true
 {% if extra_images is defined %}
   additionalImages:
 {% for image in extra_images %}
   - name: {{ image }}
 {% endfor %}
 {% endif %}
   operators: # Operators we want to mirror
-{% if disconnected_operators %}
+{% if disconnected_operators|default([]) %}
 {% if disconnected_operators_version %}
   - catalog: registry.redhat.io/redhat/redhat-operator-index:{{ disconnected_operators_version }}
 {% else %}
@@ -44,7 +38,7 @@ mirror:
 {% endif %}
 {% endfor %}
 {% endif %}
-{% if disconnected_certified_operators %}
+{% if disconnected_certified_operators|default([]) %}
 {% if disconnected_certified_operators_version %}
   - catalog: registry.redhat.io/redhat/certified-operator-index:{{ disconnected_certified_operators_version }}
 {% else %}
@@ -71,7 +65,7 @@ mirror:
 {% endif %}
 {% endfor %}
 {% endif %}
-{% if disconnected_community_operators %}
+{% if disconnected_community_operators|default([]) %}
 {% if disconnected_community_operators_version %}
   - catalog: registry.redhat.io/redhat/community-operator-index:{{ disconnected_community_operators_version }}
 {% else %}
@@ -98,7 +92,7 @@ mirror:
 {% endif %}
 {% endfor %}
 {% endif %}
-{% if disconnected_marketplace_operators %}
+{% if disconnected_marketplace_operators|default([]) %}
 {% if disconnected_marketplace_operators_version %}
   - catalog: registry.redhat.io/redhat/redhat-marketplace-index:{{ disconnected_marketplace_operators_version }}
 {% else %}
@@ -125,7 +119,7 @@ mirror:
 {% endif %}
 {% endfor %}
 {% endif %}
-{% if disconnected_extra_catalogs %}
+{% if disconnected_extra_catalogs|default([]) %}
 {% for catalog_image in disconnected_extra_catalogs %}
   - catalog: {{ catalog_image }}
 {% endfor %}