Skip to content

Commit 7669205

Browse files
committed
Use gvisor-tap-vsock-gvforwarder package instead image
Signed-off-by: Praveen Kumar <kumarpraveen.nitdgp@gmail.com>
1 parent 9196793 commit 7669205

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

createdisk.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ INSTALL_DIR=${1:-crc-tmp-install-data}
1616
OPENSHIFT_VERSION=$(${JQ} -r .clusterInfo.openshiftVersion $INSTALL_DIR/crc-bundle-info.json)
1717
BASE_DOMAIN=$(${JQ} -r .clusterInfo.baseDomain $INSTALL_DIR/crc-bundle-info.json)
1818
BUNDLE_TYPE=$(${JQ} -r .type $INSTALL_DIR/crc-bundle-info.json)
19-
ADDITIONAL_PACKAGES="cloud-init"
19+
ADDITIONAL_PACKAGES="cloud-init gvisor-tap-vsock-gvforwarder"
2020

2121
case ${BUNDLE_TYPE} in
2222
microshift)
@@ -104,9 +104,6 @@ EOF
104104

105105
# Add gvisor-tap-vsock service
106106
${SSH} core@${VM_IP} 'sudo bash -x -s' <<EOF
107-
podman create --name=gvisor-tap-vsock quay.io/crcont/gvisor-tap-vsock:latest
108-
podman cp gvisor-tap-vsock:/vm /usr/local/bin/gvforwarder
109-
podman rm gvisor-tap-vsock
110107
tee /etc/systemd/system/gv-user-network@.service <<TEE
111108
[Unit]
112109
Description=gvisor-tap-vsock Network Traffic Forwarder
@@ -118,7 +115,7 @@ After=sys-devices-virtual-net-%i.device
118115
Restart=on-failure
119116
Environment="GV_VSOCK_PORT=1024"
120117
EnvironmentFile=-/etc/sysconfig/gv-user-network
121-
ExecStart=/usr/local/bin/gvforwarder -preexisting -iface %i -url vsock://2:"${GV_VSOCK_PORT}"/connect
118+
ExecStart=/usr/libexec/podman/gvforwarder -preexisting -iface %i -url vsock://2:"${GV_VSOCK_PORT}"/connect
122119
123120
[Install]
124121
WantedBy=multi-user.target

0 commit comments

Comments
 (0)