Merge pull request #123 from Jakob-Naucke/extend-integration-tests

integration-tests: Verify LUKS key & parallelize

Author: Jakob-Naucke

.github/workflows/lint.yml

@@ -48,7 +48,7 @@ jobs:
       - name: "cargo fmt (check)"
         run: cargo fmt -- --check -l
       - name: "cargo clippy (warnings)"
-        run: cargo clippy --all-targets -- -D warnings
+        run: cargo clippy --all-targets --all-features -- -D warnings
       - name: "gofmt (check)"
         run: if [ -n "$(gofmt -l .)" ]; then exit 1; fi
       - name: "go vet"

Cargo.lock

@@ -172,7 +172,7 @@ test-release: crds-rs
 
 integration-tests: generate trusted-cluster-gen crds-rs
 	RUST_LOG=info cargo test --test trusted_execution_cluster --test attestation \
-		--features virtualization -- --no-capture  --test-threads=1
+		--features virtualization -- --no-capture  --test-threads=3
 
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)

Makefile

@@ -12,6 +12,7 @@ path = [
   "docs/pics/*",
   "docs/design/*",
   "docs/dev/*",
+  "lib/src/vendor_kopium/*",
   "tests/README.md",
   "examples/vm-coreos-ign.yaml",
   "scripts/install-kubevirt.sh"

REUSE.toml

@@ -6,9 +6,13 @@ pub mod conditions;
 pub mod reference_values;
 
 mod kopium;
+#[allow(clippy::all)]
+mod vendor_kopium;
 pub use kopium::approvedimages::*;
 pub use kopium::machines::*;
 pub use kopium::trustedexecutionclusters::*;
+pub use vendor_kopium::virtualmachineinstances;
+pub use vendor_kopium::virtualmachines;
 
 use conditions::*;
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::{Condition, Time};

lib/src/lib.rs

@@ -0,0 +1,8 @@
+// SPDX-FileCopyrightText: Jakob Naucke <[email protected]>
+//
+// SPDX-License-Identifier: MIT
+
+// CRDs that we vendor because they are only distributed via OLM
+
+pub mod virtualmachineinstances;
+pub mod virtualmachines;

lib/src/vendor_kopium.rs

@@ -13,6 +13,7 @@ virtualization = []
 
 [dependencies]
 anyhow.workspace = true
+clevis-pin-trustee-lib.workspace = true
 trusted-cluster-operator-lib = { path = "../lib" }
 compute-pcrs-lib.workspace = true
 env_logger.workspace = true

lib/src/vendor_kopium/virtualmachineinstances.rs

@@ -45,7 +45,7 @@ macro_rules! test_info {
 }
 
 macro_rules! kube_apply {
-    ($file:expr, $test_name:expr, $log:literal $(, $kustomize:literal)?) => {
+    ($file:expr, $test_name:expr, $log:literal $(, kustomize = $kustomize:literal)? $(, fssa = $fssa:literal)?) => {
         test_info!($test_name, $log);
         #[allow(unused_mut)]
         let mut opt = "-f";
@@ -54,8 +54,15 @@ macro_rules! kube_apply {
                 opt = "-k";
             }
         )?
+        #[allow(unused_mut)]
+        let mut args = vec!["apply", opt, $file];
+        $(
+            if $fssa {
+                args.extend_from_slice(&["--server-side", "--force-conflicts"])
+            }
+        )?
         let apply_output = Command::new("kubectl")
-            .args(["apply", opt, $file])
+            .args(args)
             .output()
             .await?;
         if !apply_output.status.success() {
@@ -336,7 +343,12 @@ impl TestContext {
                 "TrustedExecutionCluster CRD already exists, skipping CRD creation"
             );
         } else {
-            kube_apply!(crd_temp_dir_str, &self.test_name, "Applying CRDs");
+            kube_apply!(
+                crd_temp_dir_str,
+                &self.test_name,
+                "Applying CRDs",
+                fssa = true
+            );
         }
 
         test_info!(&self.test_name, "Preparing RBAC manifests");
@@ -400,7 +412,12 @@ resources:
         let temp_kustomization_path = rbac_temp_dir.join("kustomization.yaml");
         std::fs::write(&temp_kustomization_path, kustomization_content)?;
 
-        kube_apply!(rbac_temp_dir_str, &self.test_name, "Applying RBAC", true);
+        kube_apply!(
+            rbac_temp_dir_str,
+            &self.test_name,
+            "Applying RBAC",
+            kustomize = true
+        );
 
         let manifests_path = Path::new(&self.manifests_dir);
         let operator_manifest_path = manifests_path.join("operator.yaml");