chore(system-tests-k8s): containerDisk poc

rs/tests/driver/src/driver/bootstrap.rs

@@ -17,8 +17,6 @@ use crate::driver::{
     },
     test_setup::InfraProvider,
 };
-use crate::k8s::datavolume::DataVolumeContentType;
-use crate::k8s::images::*;
 use crate::k8s::tnet::{TNet, TNode};
 use crate::util::block_on;
 use anyhow::{bail, Result};
@@ -286,25 +284,24 @@ pub fn setup_and_start_vms(
             let conf_img_path = PathBuf::from(&node.node_path).join(CONF_IMG_FNAME);
             match InfraProvider::read_attribute(&t_env) {
                 InfraProvider::K8s => {
-                    let url = format!(
-                        "{}/{}",
-                        tnet_node.config_url.clone().expect("missing config_url"),
-                        CONF_IMG_FNAME
+                    let command = format!(
+                        "set -xe; \
+                        mkdir -p /var/sysimage/tnet; \
+                        ctr=$(sudo buildah --root /var/sysimage/tnet from scratch); \
+                        sudo buildah --root /var/sysimage/tnet copy --chown=107:107 $ctr {0} /disk/; \
+                        sudo buildah --root /var/sysimage/tnet commit $ctr harbor-core.harbor.svc.cluster.local/tnet/config:{1}; \
+                        sudo buildah --root /var/sysimage/tnet push --tls-verify=false --creds 'robot$tnet+tnet:TestingPOC1' harbor-core.harbor.svc.cluster.local/tnet/config:{1}",
+                        conf_img_path.display(), tnet_node.name.clone().unwrap()
                     );
-                    info!(
-                        t_env.logger(),
-                        "Uploading image {} to {}",
-                        conf_img_path.clone().display().to_string(),
-                        url.clone()
-                    );
-                    block_on(upload_image(conf_img_path.as_path(), &url))
-                        .expect("Failed to upload config image");
-                    block_on(tnet_node.deploy_config_image(
-                        CONF_IMG_FNAME,
-                        "config",
-                        DataVolumeContentType::Kubevirt,
-                    ))
-                    .expect("deploying config image failed");
+                    let output = Command::new("bash")
+                        .arg("-c")
+                        .arg(command)
+                        .output()
+                        .expect("Failed to execute command");
+                    if !output.status.success() {
+                        let stderr = String::from_utf8_lossy(&output.stderr);
+                        bail!("Error building and pushing config container config image: {}", stderr);
+                    }
                     block_on(tnet_node.start()).expect("starting vm failed");
                 }
                 InfraProvider::Farm => {

rs/tests/driver/src/k8s/virtualmachine.rs

@@ -31,6 +31,7 @@ spec:
       domain:
         cpu:
           cores: {cpus}
+          model: host-passthrough
         firmware:
           bootloader:
             efi:
@@ -47,23 +48,6 @@ spec:
           - name: default
             binding:
               name: passt
-            ports:
-            - port: 22
-            - port: 8100
-            - port: 8101
-            - port: 8102
-            - port: 8103
-            - port: 8104
-            - port: 8105
-            - port: 8106
-            - port: 8107
-            - port: 8108
-            - port: 8109
-            - port: 8110
-            - port: 8111
-            - port: 8332
-            - port: 18444
-            - port: 20443
         resources:
           overcommitGuestOverhead: true
           requests:
@@ -133,6 +117,7 @@ spec:
       domain:
         cpu:
           cores: {cpus}
+          model: host-passthrough
         firmware:
           bootloader:
             efi:
@@ -150,23 +135,6 @@ spec:
           - name: default
             binding:
               name: passt
-            ports:
-              - port: 22
-              - port: 80
-              - port: 443
-              - port: 2497
-              - port: 4100
-                protocol: UDP
-              - port: 4444
-              - port: 7070
-              - port: 8080
-              - port: 8332
-              - port: 9090
-              - port: 9091
-              - port: 9100
-              - port: 18444
-              - port: 19100
-              - port: 19531
         resources:
           overcommitGuestOverhead: true
           requests:
@@ -180,8 +148,8 @@ spec:
         - dataVolume:
             name: "{name}-guestos"
           name: disk0
-        - dataVolume:
-            name: "{name}-config"
+        - containerDisk:
+            image: "harbor.ln1-idx1.dfinity.network/tnet/config:{name}"
           name: disk1
 "#;
 

rs/tests/system_tests.bzl

@@ -276,6 +276,12 @@ def system_test(
     if uses_boundary_guestos:
         icos_images["ENV_DEPS__BOUNDARY_GUESTOS_DISK_IMG_TAR_ZST_CAS_URL"] = "//ic-os/boundary-guestos/envs/dev:disk-img.tar.zst"
 
+    # set "local" tag for k8s system tests due to rootful container image builds
+    is_k8s = select({
+        "//rs/tests:k8s": True,
+        "//conditions:default": False,
+    })
+
     run_system_test(
         name = name,
         src = test_driver_target,
@@ -284,7 +290,7 @@ def system_test(
         env = env,
         icos_images = icos_images,
         env_inherit = env_inherit,
-        tags = tags + ["requires-network", "system_test"] +
+        tags = tags + ["requires-network", "system_test"] + (["local"] if is_k8s else []) +
                (["manual"] if "experimental_system_test_colocation" in tags else []),
         target_compatible_with = ["@platforms//os:linux"],
         timeout = test_timeout,