Skip to content

rvs: Fix race of ApprovedImage adoption with TEC object deletion #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iroykaufman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

rvs: Fix race of ApprovedImage adoption with TEC object deletion #302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions operator/src/reference_values.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,23 @@ async fn image_reconcile(
.await
.map_err(|e| -> ControllerError { e.into() })?;

let uid_owns = |uid: &String| {
let refs = image.metadata.owner_references.as_ref();
refs.map(|os| os.iter().any(|o| o.uid == *uid))
};
let cluster_owns = |cluster: &TrustedExecutionCluster| {
let uid = cluster.metadata.uid.as_ref();
uid.and_then(uid_owns).unwrap_or(false)
};

if let Some(ref cluster) = cluster
&& !cluster_owns(cluster)
{
adopt_approved_image(kube_client.clone(), &name, cluster)
Comment thread
alicefr marked this conversation as resolved.
.await
.map_err(|e| -> ControllerError { e.into() })?;
}

let images: Api<ApprovedImage> = Api::default_namespaced(kube_client.clone());
finalizer(&images, APPROVED_IMAGE_FINALIZER, image, |ev| async {
match ev {
Expand Down Expand Up @@ -277,19 +294,6 @@ async fn image_add_reconcile(
info!("TrustedExecutionCluster is being deleted, deferring image processing for {name}");
return Ok(Action::requeue(Duration::from_secs(5)));
}
let uid_owns = |uid: &String| {
let refs = image.metadata.owner_references.as_ref();
refs.map(|os| os.iter().any(|o| o.uid == *uid))
};
let cluster_owns = |cluster: &TrustedExecutionCluster| {
let uid = cluster.metadata.uid.as_ref();
uid.and_then(uid_owns).unwrap_or(false)
};
// Adopt the image by adding TEC as owner reference if not already owned
if !cluster_owns(&cluster) {
adopt_approved_image(client.clone(), name, &cluster).await?;
}

let (action, reason) = match handle_new_image(client.clone(), image).await {
Ok(reason) => (Action::await_change(), reason),
Err(e) => {
Expand Down
Loading