diff --git a/build-patched-kao-kcmo-images.sh b/build-patched-kao-kcmo-images.sh index 1f242713..096b84d1 100755 --- a/build-patched-kao-kcmo-images.sh +++ b/build-patched-kao-kcmo-images.sh @@ -20,7 +20,6 @@ export LANG=C.UTF-8 rm -fr crc-cluster-kube-apiserver-operator rm -fr crc-cluster-kube-controller-manager-operator -rm -fr crc-dnsmasq rm -fr crc-routes-controller readonly OCP_VERSION=4.14 @@ -167,5 +166,4 @@ fi base_image=$(grep "^FROM openshift/ose-base" crc-cluster-kube-apiserver-operator/Dockerfile | sed 's/^FROM //') -update_base_image crc-dnsmasq "${base_image}" update_base_image crc-routes-controller "${base_image}" diff --git a/createdisk.sh b/createdisk.sh index 5b78d9aa..1c470d57 100755 --- a/createdisk.sh +++ b/createdisk.sh @@ -99,17 +99,14 @@ fi prepare_qemu_guest_agent ${VM_IP} image_tag="latest" -if podman manifest inspect quay.io/crcont/dnsmasq:${OPENSHIFT_VERSION} >/dev/null 2>&1; then +if podman manifest inspect quay.io/crcont/routes-controller:${OPENSHIFT_VERSION} >/dev/null 2>&1; then image_tag=${OPENSHIFT_VERSION} fi -# Add gvisor-tap-vsock and crc-dnsmasq services +# Add gvisor-tap-vsock service ${SSH} core@${VM_IP} 'sudo bash -x -s' < /etc/systemd/system/gvisor-tap-vsock.service - touch /var/srv/dnsmasq.conf - podman create --ip 10.88.0.8 --name crc-dnsmasq -v /var/srv/dnsmasq.conf:/etc/dnsmasq.conf -p 53:53/udp --privileged quay.io/crcont/dnsmasq:${image_tag} - podman generate systemd --restart-policy=no crc-dnsmasq > /etc/systemd/system/crc-dnsmasq.service systemctl daemon-reload systemctl enable gvisor-tap-vsock.service EOF