switch to ImageDigestSources

karmab · Jan 19, 2024 · aa8f673 · aa8f673
1 parent c855560
commit aa8f673
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ailib/__init__.py b/ailib/__init__.py
@@ -285,7 +285,7 @@ def set_default_values(self, overrides, existing=False, quiet=False):
                                         "source": "quay.io/openshift-release-dev/ocp-release"},
                                        {'mirrors': [f"{url}/openshift/release", f"{url}/openshift/release-images"],
                                         "source": "quay.io/openshift-release-dev/ocp-v4.0-art-dev"}]
-            installconfig = {'imageContentSources': disconnected_registries}
+            installconfig = {'ImageDigestSources': disconnected_registries}
             info(f"Trying to gather registry ca cert from {url}")
             cacmd = f"openssl s_client -showcerts -connect {url} </dev/null 2>/dev/null|"
             cacmd += "openssl x509 -outform PEM"
@@ -409,10 +409,10 @@ def set_disconnected_ignition_config_override(self, infra_env_id=None, overrides
                                                               _preload_content=False)
                 ignition_version = json.loads(ori.read().decode("utf-8"))['ignition']['version']
             if 'installconfig' in overrides and isinstance(overrides['installconfig'], dict)\
-                    and 'imageContentSources' in overrides['installconfig']:
-                info("Using imageContentSources from installconfig")
+                    and 'ImageDigestSources' in overrides['installconfig']:
+                info("Using ImageDigestSources from installconfig")
                 registries = 'unqualified-search-registries = ["registry.access.redhat.com", "docker.io"]\n'
-                for registry in overrides['installconfig']['imageContentSources']:
+                for registry in overrides['installconfig']['ImageDigestSources']:
                     source = registry.get('source')
                     for target in registry.get('mirrors', []):
                         new_registry = """[[registry]]

diff --git a/samples/disconnected.yml b/samples/disconnected.yml
@@ -39,7 +39,7 @@ installconfig:
        Ig5BBu37RdjCR7JGSF/2QisMmyKoTnyD9P+lFKTgGfsbbxrp7XdeLYY7xaFRzkuZ
        gAedh+jkW6mjkMIu5RUU
        -----END CERTIFICATE-----
-   imageContentSources:
+   imageDigestSources:
    - mirrors:
      - testk-disconnecter.ipv6only:5000/ocp4
      source: quay.io/openshift-release-dev/ocp-v4.0-art-dev