From 91e1422e486d0f2e1ae88b7629f5cf5aae37acd9 Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Thu, 5 Nov 2026 09:38:18 +0000 Subject: [PATCH 1/2] bump operator to fcc38a4 and build operator with all features, i.e. including OpenShift Signed-off-by: Jakob Naucke --- Containerfile | 5 +++-- operator | 2 +- tests/Cargo.lock | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index ccc6a4f..a951df4 100644 --- a/Containerfile +++ b/Containerfile @@ -64,11 +64,11 @@ RUN cd /build-tools/kopium && \ cargo build --release --locked --offline && \ cp target/release/kopium /build/bin/kopium-0.23.0 -RUN make crds-rs +RUN make crds-rs-all-features # In debug builds, pre-build dependencies to avoid full rebuild on source changes. RUN if [ "$build_type" = debug ]; then \ - cargo build -p operator -p compute-pcrs -p register-server -p attestation-key-register; \ + cargo build --all-features -p operator -p compute-pcrs -p register-server -p attestation-key-register; \ fi COPY operator/operator/src operator/src @@ -79,6 +79,7 @@ COPY operator/attestation-key-register/src attestation-key-register/src RUN release_flag="" && \ if [ "$build_type" = release ]; then release_flag="--release"; fi && \ cargo build \ + --all-features \ -p operator \ -p compute-pcrs \ -p register-server \ diff --git a/operator b/operator index 77341d5..fcc38a4 160000 --- a/operator +++ b/operator @@ -1 +1 @@ -Subproject commit 77341d5f26f2a18a32f36101eae1bf2449c86a10 +Subproject commit fcc38a4097d925e15c2d498fa1b568c5df0f4193 diff --git a/tests/Cargo.lock b/tests/Cargo.lock index 850aba0..3403312 100644 --- a/tests/Cargo.lock +++ b/tests/Cargo.lock @@ -2834,11 +2834,14 @@ version = "0.2.3" dependencies = [ "anyhow", "compute-pcrs-lib", + "hex", "k8s-openapi", "kube", "log", + "openssl", "serde", "serde_json", + "tokio", ] [[package]] @@ -2855,6 +2858,7 @@ dependencies = [ "env_logger", "fs_extra", "glob", + "hex", "http", "ignition-config", "k8s-openapi", From 565b04858bc0841c9d190aa3d738507b14a0f3d5 Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Wed, 23 Sep 2026 17:10:19 +0200 Subject: [PATCH 2/2] tests: Account for automatic ApprovedImage mgmt Signed-off-by: Jakob Naucke --- tests/Cargo.toml | 4 ++-- tests/Makefile | 2 +- tests/scale.rs | 26 ++++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/tests/Cargo.toml b/tests/Cargo.toml index dddb75c..4fe3923 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -31,8 +31,8 @@ k8s-openapi.workspace = true kube.workspace = true serde_json.workspace = true tokio = "1.53.1" -trusted-cluster-operator-lib = { path = "../operator/lib" } -trusted-cluster-operator-test-utils = { path = "../operator/test_utils", features = ["virtualization"] } +trusted-cluster-operator-lib = { path = "../operator/lib", features = ["openshift"] } +trusted-cluster-operator-test-utils = { path = "../operator/test_utils", features = ["openshift", "virtualization"] } [[test]] name = "scale" diff --git a/tests/Makefile b/tests/Makefile index fc5f2df..bee5a32 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -30,7 +30,7 @@ generate-downstream: $(CONTROLLER_GEN) $(OPENSHIFT_API_LOCAL) $(call controller-gen,./$(OPENSHIFT_API_LOCAL)/machine/v1beta1,*{machines$(comma)azure*specs}*) crds-rs-downstream: generate-downstream $(KOPIUM) $(CRD_RS_PATH) - cd $(MAKEFILE_DIR) && $(MAKE) crds-rs + cd $(MAKEFILE_DIR) && $(MAKE) generate-openshift && $(MAKE) crds-rs $(MAKE) $(shell find $(CRD_YAML_PATH) -path $(OPENSHIFT_API_LOCAL) -prune -o -type f -print \ | sed -E 's|$(CRD_YAML_PATH)/.*_(.*)\.yaml|$(CRD_RS_PATH)/\1.rs|') diff --git a/tests/scale.rs b/tests/scale.rs index 884b17b..3c09e64 100644 --- a/tests/scale.rs +++ b/tests/scale.rs @@ -13,7 +13,8 @@ use kube::{Api, core::Expression, runtime::wait::await_condition}; use serde_json::json; use std::{collections::BTreeMap, time::Duration}; use tokio::{process::Command, time::timeout}; -use trusted_cluster_operator_lib::endpoints::*; +use trusted_cluster_operator_lib::reference_values::*; +use trusted_cluster_operator_lib::{ApprovedImage, endpoints::*}; use trusted_cluster_operator_test_utils::virt::{NodeBackend, sh_exec}; use trusted_cluster_operator_test_utils::*; @@ -109,15 +110,22 @@ impl NodeBackend for OpenShiftNode { } } +fn get_approved_image(machineconfig_name: &str) -> Result { + let image_base = format!("{}-{}", machineconfig_name, get_env("APPROVED_IMAGE")?); + rfc1035(&image_base, OSIMAGE_RESOURCE_PREFIX) +} + fn create_mcp_object(machineset_name: &str) -> MachineConfigPool { let match_expressions = MachineConfigPoolMachineConfigSelectorMatchExpressions { key: MAPI_ROLE.to_string(), operator: "In".to_string(), values: Some(vec!["worker".to_string(), machineset_name.to_string()]), }; + let labels = BTreeMap::from([(MCP_APPROVED_IMAGE_LABEL.to_string(), String::new())]); MachineConfigPool { metadata: ObjectMeta { name: Some(machineset_name.to_string()), + labels: Some(labels), ..Default::default() }, spec: MachineConfigPoolSpec { @@ -300,7 +308,7 @@ impl ScaleContext { ..Default::default() }, spec: MachineConfigSpec { - os_image_url: Some(bootc_image), + os_image_url: Some(bootc_image.clone()), ..Default::default() }, }; @@ -309,6 +317,14 @@ impl ScaleContext { machineconfigs.create(&Default::default(), &mc).await?; create_mcp(&test_ctx, &machineset_name, &mc_name).await?; + let approved_image_name = get_approved_image(&mc_name)?; + let images: Api = Api::namespaced(client.clone(), test_ctx.namespace()); + let info = format!("Waiting for ApprovedImage {approved_image_name} to be Committed"); + test_ctx.info(&info); + let chk = approved_image_has_committed_condition; + let done = await_condition(images, &approved_image_name, chk); + timeout(scaled_duration(300), done).await.context(info)??; + let existing_secret_name = format!("{machineset_name}-user-data-managed"); let secrets: Api = Api::namespaced(client.clone(), MAPI_NS); wait_for_resource_created(&secrets, &existing_secret_name, scaled_timeout(120)).await?; @@ -375,12 +391,15 @@ impl ScaleContext { let client = self.test_ctx.client(); let machineset_name = &self.machineset_name; let secret_name = format!("{machineset_name}-user-data-managed-cocl"); + let image_name = get_approved_image(&self.mc_name)?; self.test_ctx.info("Cleaning up"); let machinesets: Api = Api::namespaced(client.clone(), MAPI_NS); let machineconfigs: Api = Api::all(client.clone()); let mcps: Api = Api::all(client.clone()); let secrets: Api = Api::namespaced(client.clone(), MAPI_NS); + let approvedimages: Api = + Api::namespaced(client.clone(), self.test_ctx.namespace()); let dp = Default::default(); machinesets.delete(machineset_name, &dp).await?; @@ -401,6 +420,9 @@ impl ScaleContext { wait_for_resource_deleted(&secrets, &secret_name, duration).await?; self.test_ctx .info(format!("Secret {secret_name} has been deleted")); + wait_for_resource_deleted(&approvedimages, &image_name, duration).await?; + self.test_ctx + .info(format!("ApprovedImage {image_name} has been deleted")); self.test_ctx.cleanup().await }