onprem: patch deployment from ocp_release_image

karmab · Jan 5, 2024 · 5396fcb · 5396fcb
1 parent 60dca17
commit 5396fcb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/aicli_parameters.yml b/aicli_parameters.yml
@@ -13,6 +13,7 @@
 {% set workers = extra_workers + workers %}
 {% endif %}
 base_dns_domain: {{ domain }}
+manifests: manifests
 version: {{ tag }}
 api_vip: {{ api_ip }}
 ingress_vip: {{ ingress_ip }}

diff --git a/registries.conf.sample b/registries.conf.sample
@@ -1,6 +1,14 @@
 unqualified-search-registries = ["registry.access.redhat.com", "docker.io"]
 short-name-mode = ""
 
+[[registry]]
+  prefix = ""
+  location = "quay.io/edge-infrastructure"
+
+  [[registry.mirror]]
+    location = "$REGISTRY/edge-infrastructure"
+    pull-from-mirror = "all"
+
 [[registry]]
   prefix = ""
   location = "quay.io/openshift-release-dev/ocp-release"

diff --git a/scripts/03_disconnected_mirror.sh b/scripts/03_disconnected_mirror.sh
@@ -44,9 +44,13 @@ echo -e "ocp_release_image: $REGISTRY_NAME:$REGISTRY_PORT/openshift/release-imag
 # echo -e "pull_secret: /root/disconnected_pull.json" >> /root/aicli_parameters.yml
 # fi
 
+mkdir /root/containers
+export REGISTRY=$REGISTRY_NAME:$REGISTRY_PORT
+envsubst < /root/registries.conf.sample > /root/containers/registries.conf
+
 cp /root/machineconfigs/99-operatorhub.yaml /root/manifests
 
-{% for image in disconnected_extra_images + ['quay.io/edge-infrastructure/assisted-installer-agent:latest', 'quay.io/edge-infrastructure/assisted-installer:latest'] %}
+{% for image in disconnected_extra_images + ['quay.io/edge-infrastructure/assisted-installer-agent:latest', 'quay.io/edge-infrastructure/assisted-installer:latest', 'quay.io/edge-infrastructure/assisted-installer-controller:latest'] %}
 echo "Syncing image {{ image }}"
 /root/bin/sync_image.sh {{ image }}
 {% endfor %}